diff --git a/examples/logfile_download/logfile_download.cpp b/examples/logfile_download/logfile_download.cpp
index 90b4adc68..f093f1113 100644
--- a/examples/logfile_download/logfile_download.cpp
+++ b/examples/logfile_download/logfile_download.cpp
@@ -10,6 +10,7 @@
 #include <future>
 #include <iostream>
 #include <iomanip>
+#include <string>
 #include <cstring>
 #include <thread>
 
@@ -42,7 +43,7 @@ int main(int argc, char** argv)
     bool remove_log_files = false;
 
     for (int i = 2; i < argc; ++i) {
-        if (argv[i] == "--rm") {
+        if (std::string(argv[i]) == "--rm") {
             remove_log_files = true;
         }
     }
diff --git a/src/mavsdk/core/call_every_handler.cpp b/src/mavsdk/core/call_every_handler.cpp
index fce675d74..c92756876 100644
--- a/src/mavsdk/core/call_every_handler.cpp
+++ b/src/mavsdk/core/call_every_handler.cpp
@@ -1,5 +1,6 @@
 #include "call_every_handler.h"
 
+#include <algorithm>
 #include <utility>
 
 namespace mavsdk {
diff --git a/src/mavsdk/core/callback_list_impl.h b/src/mavsdk/core/callback_list_impl.h
index 1bfe04ba4..ba66e78c7 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..b421501d2 100644
--- a/src/mavsdk/core/timeout_handler.cpp
+++ b/src/mavsdk/core/timeout_handler.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include "timeout_handler.h"
 
 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..a11fd8acf 100644
--- a/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
+++ b/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
@@ -1,5 +1,6 @@
 #include "telemetry_server_impl.h"
 #include "unused.h"
+#include <algorithm>
 #include <array>
 
 namespace mavsdk {