diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index d53b3b33109..5b270e719fb 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -63,4 +63,4 @@ jobs:
       - name: Run Clang Tidy
         working-directory: cpp
         run: |
-          run-clang-tidy-19 -j$(nproc) -quiet src/Ice/ || true
+          run-clang-tidy-19 -j$(nproc) -quiet src/Ice/
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index e32d42e7cd1..62577edef98 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -10,6 +10,8 @@
 #include "TraceLevels.h"
 #include "TraceUtil.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 62deca6b003..875ccdb9a99 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -18,6 +18,7 @@
 #include "TraceLevels.h"
 #include "Transceiver.h"
 
+#include <algorithm>
 #include <chrono>
 #include <iterator>
 
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index c359cdac313..05f0f5ad299 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -22,6 +22,7 @@
 
 #include "DisableWarnings.h"
 
+#include <algorithm>
 #include <iomanip>
 #include <stdexcept>
 
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 28bee5bad0a..3ef2e2a3621 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -11,6 +11,7 @@
 #include "LoggerI.h"
 #include "PluginManagerI.h"
 
+#include <algorithm>
 #include <mutex>
 #include <stdexcept>
 
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 18244f4d3f8..6c2539732b3 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -7,6 +7,8 @@
 #include "Ice/UUID.h"
 #include "ObjectAdapterI.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 3e4bebc89be..14c6a26443e 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -35,6 +35,7 @@
 #    include <sys/time.h>
 #endif
 
+#include <algorithm>
 #include <iterator>
 #include <stdexcept>
 
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index c46e17a587c..17147a41a94 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -7,6 +7,7 @@
 #include "Ice/OutputStream.h"
 #include "Ice/SlicedData.h"
 
+#include <algorithm>
 #include <deque>
 
 using namespace std;
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 177642c1d8a..f703ab3e3bf 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -11,6 +11,8 @@
 #include "WSAcceptor.h"
 #include "WSConnector.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;