diff --git a/olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp b/olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp
index 849d9608b..0537c27c9 100644
--- a/olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp
+++ b/olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <algorithm>
 #include <cstring>
 #include <locale>
 #include <memory>
diff --git a/olp-cpp-sdk-dataservice-read/src/ApiClientLookup.cpp b/olp-cpp-sdk-dataservice-read/src/ApiClientLookup.cpp
index ccac45587..37347d837 100644
--- a/olp-cpp-sdk-dataservice-read/src/ApiClientLookup.cpp
+++ b/olp-cpp-sdk-dataservice-read/src/ApiClientLookup.cpp
@@ -19,6 +19,7 @@
 
 #include "ApiClientLookup.h"
 
+#include <algorithm>
 #include <map>
 #include <utility>
 
diff --git a/olp-cpp-sdk-dataservice-read/src/StreamLayerClientImpl.cpp b/olp-cpp-sdk-dataservice-read/src/StreamLayerClientImpl.cpp
index cfc650440..22d320214 100644
--- a/olp-cpp-sdk-dataservice-read/src/StreamLayerClientImpl.cpp
+++ b/olp-cpp-sdk-dataservice-read/src/StreamLayerClientImpl.cpp
@@ -19,6 +19,7 @@
 
 #include "StreamLayerClientImpl.h"
 
+#include <algorithm>
 #include <iterator>
 #include <set>
 
diff --git a/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.cpp b/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.cpp
index 807849ce8..546d9fd9c 100644
--- a/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.cpp
+++ b/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.cpp
@@ -34,6 +34,8 @@
 #include "repositories/PartitionsRepository.h"
 #include "repositories/PrefetchTilesRepository.h"
 
+#include <algorithm>
+
 // Needed to avoid endless warnings from GetVersion/WithVersion
 #include <olp/core/porting/warning_disable.h>
 PORTING_PUSH_WARNINGS()
diff --git a/olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.cpp b/olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.cpp
index a2ba4a0bf..ca80869f1 100644
--- a/olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.cpp
+++ b/olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.cpp
@@ -37,6 +37,8 @@
 #include "repositories/PartitionsRepository.h"
 #include "repositories/PrefetchTilesRepository.h"
 
+#include <algorithm>
+
 namespace olp {
 namespace dataservice {
 namespace read {
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.cpp b/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.cpp
index 552c96970..df510ba78 100644
--- a/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.cpp
+++ b/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.cpp
@@ -19,6 +19,7 @@
 
 #include "StreamApi.h"
 
+#include <algorithm>
 #include <map>
 
 #include <olp/core/client/CancellationContext.h>