diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp
index 49e81f22b..0b1e5f382 100644
--- a/include/engine/api/json_factory.hpp
+++ b/include/engine/api/json_factory.hpp
@@ -14,8 +14,9 @@
 
 #include <boost/optional.hpp>
 
-#include <string>
 #include <algorithm>
+#include <iterator>
+#include <string>
 #include <vector>
 
 namespace osrm
diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
index 479d59646..f2b7a730d 100644
--- a/include/engine/api/route_api.hpp
+++ b/include/engine/api/route_api.hpp
@@ -19,6 +19,7 @@
 #include "util/coordinate.hpp"
 #include "util/integer_range.hpp"
 
+#include <iterator>
 #include <vector>
 
 namespace osrm
diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp
index ce84b0baa..1655ce357 100644
--- a/include/engine/api/table_api.hpp
+++ b/include/engine/api/table_api.hpp
@@ -19,6 +19,8 @@
 
 #include <boost/range/algorithm/transform.hpp>
 
+#include <iterator>
+
 namespace osrm
 {
 namespace engine
diff --git a/include/engine/datafacade/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp
index dbb14bbd4..bd365653c 100644
--- a/include/engine/datafacade/shared_datafacade.hpp
+++ b/include/engine/datafacade/shared_datafacade.hpp
@@ -21,6 +21,7 @@
 #include <cstddef>
 
 #include <algorithm>
+#include <iterator>
 #include <limits>
 #include <memory>
 #include <string>
diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp
index bd00f0c5d..e030ff815 100644
--- a/include/engine/plugins/plugin_base.hpp
+++ b/include/engine/plugins/plugin_base.hpp
@@ -12,6 +12,7 @@
 #include "util/integer_range.hpp"
 
 #include <algorithm>
+#include <iterator>
 #include <string>
 #include <vector>
 
diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
index a289ec63f..0e07d933e 100644
--- a/src/extractor/extractor_callbacks.cpp
+++ b/src/extractor/extractor_callbacks.cpp
@@ -14,6 +14,7 @@
 
 #include "osrm/coordinate.hpp"
 
+#include <iterator>
 #include <limits>
 #include <string>
 #include <vector>
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index e7725fb40..0fa31e638 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -7,6 +7,7 @@
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 
+#include <iterator>
 #include <string>
 #include <vector>
 
diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp
index 093384bc1..7b258f1cc 100644
--- a/src/server/request_handler.cpp
+++ b/src/server/request_handler.cpp
@@ -21,6 +21,7 @@
 #include <ctime>
 
 #include <algorithm>
+#include <iterator>
 #include <iostream>
 #include <string>
 
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index 862ca3c7d..67fd122ff 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -30,6 +30,7 @@
 #include <cstdint>
 
 #include <fstream>
+#include <iterator>
 #include <new>
 #include <string>