diff --git a/src/integration_tests/camera_capture_info.cpp b/src/integration_tests/camera_capture_info.cpp
index f72d2ebf3..137135fbd 100644
--- a/src/integration_tests/camera_capture_info.cpp
+++ b/src/integration_tests/camera_capture_info.cpp
@@ -1,5 +1,6 @@
 #include "integration_test_helper.h"
 #include "mavsdk.h"
+#include <algorithm>
 #include <iostream>
 #include <functional>
 #include <atomic>
diff --git a/src/integration_tests/integration_test_helper.h b/src/integration_tests/integration_test_helper.h
index d2863abe1..2751510b6 100644
--- a/src/integration_tests/integration_test_helper.h
+++ b/src/integration_tests/integration_test_helper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <chrono>
 #include <functional>
 #include <thread>
diff --git a/src/mavsdk/core/call_every_handler.cpp b/src/mavsdk/core/call_every_handler.cpp
index fce675d74..d6f908c0a 100644
--- a/src/mavsdk/core/call_every_handler.cpp
+++ b/src/mavsdk/core/call_every_handler.cpp
@@ -1,6 +1,7 @@
 #include "call_every_handler.h"
 
 #include <utility>
+#include <algorithm>
 
 namespace mavsdk {
 
diff --git a/src/mavsdk/core/callback_list_impl.h b/src/mavsdk/core/callback_list_impl.h
index 7bd8c16c4..15f312454 100644
--- a/src/mavsdk/core/callback_list_impl.h
+++ b/src/mavsdk/core/callback_list_impl.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <cstdint>
 #include <functional>
 #include <atomic>
diff --git a/src/mavsdk/core/mavlink_request_message_handler.cpp b/src/mavsdk/core/mavlink_request_message_handler.cpp
index 89a976a1f..a9382e189 100644
--- a/src/mavsdk/core/mavlink_request_message_handler.cpp
+++ b/src/mavsdk/core/mavlink_request_message_handler.cpp
@@ -3,6 +3,7 @@
 #include "server_component_impl.h"
 #include "mavlink_command_receiver.h"
 #include "log.h"
+#include <algorithm>
 
 namespace mavsdk {
 
diff --git a/src/mavsdk/core/timeout_handler.cpp b/src/mavsdk/core/timeout_handler.cpp
index 17870d680..6065b31ab 100644
--- a/src/mavsdk/core/timeout_handler.cpp
+++ b/src/mavsdk/core/timeout_handler.cpp
@@ -1,4 +1,5 @@
 #include "timeout_handler.h"
+#include <algorithm>
 
 namespace mavsdk {
 
diff --git a/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp b/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
index 132c2467d..1f59dc710 100644
--- a/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
+++ b/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
@@ -1,6 +1,7 @@
 #include "telemetry_server_impl.h"
 #include "unused.h"
 #include <array>
+#include <algorithm>
 
 namespace mavsdk {