diff --git a/include/storage/serialization.hpp b/include/storage/serialization.hpp
index d83abfd9a..60532d691 100644
--- a/include/storage/serialization.hpp
+++ b/include/storage/serialization.hpp
@@ -10,8 +10,8 @@
 #include "storage/tar.hpp"
 
 #include <boost/assert.hpp>
-#include <boost/function_output_iterator.hpp>
 #include <boost/iterator/function_input_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 #include <cmath>
 #include <cstdint>
diff --git a/include/storage/shared_data_index.hpp b/include/storage/shared_data_index.hpp
index 41ae6dabb..8cafc572f 100644
--- a/include/storage/shared_data_index.hpp
+++ b/include/storage/shared_data_index.hpp
@@ -3,7 +3,7 @@
 
 #include "storage/shared_datatype.hpp"
 
-#include <boost/function_output_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 #include <type_traits>
 #include <unordered_map>
diff --git a/include/util/indexed_data.hpp b/include/util/indexed_data.hpp
index a09425b33..a0d97e443 100644
--- a/include/util/indexed_data.hpp
+++ b/include/util/indexed_data.hpp
@@ -7,7 +7,7 @@
 #include "util/vector_view.hpp"
 
 #include <boost/assert.hpp>
-#include <boost/function_output_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 #include <array>
 #include <iterator>
diff --git a/src/engine/routing_algorithms/alternative_path_mld.cpp b/src/engine/routing_algorithms/alternative_path_mld.cpp
index 2f063eb72..bc520eb78 100644
--- a/src/engine/routing_algorithms/alternative_path_mld.cpp
+++ b/src/engine/routing_algorithms/alternative_path_mld.cpp
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include <boost/function_output_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 namespace osrm
 {
diff --git a/src/extractor/location_dependent_data.cpp b/src/extractor/location_dependent_data.cpp
index 60186c2d6..828364e08 100644
--- a/src/extractor/location_dependent_data.cpp
+++ b/src/extractor/location_dependent_data.cpp
@@ -8,8 +8,8 @@
 #include <rapidjson/istreamwrapper.h>
 
 #include <boost/filesystem.hpp>
-#include <boost/function_output_iterator.hpp>
 #include <boost/geometry/algorithms/equals.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 #include <fstream>
 #include <string>
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index ea4f21dbf..7431bbca5 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -11,7 +11,7 @@
 #include "util/typedefs.hpp"
 
 #include <boost/filesystem.hpp>
-#include <boost/function_output_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 #include <tbb/parallel_sort.h>
 
diff --git a/unit_tests/storage/tar.cpp b/unit_tests/storage/tar.cpp
index 955aa0f2a..c15a1ea4f 100644
--- a/unit_tests/storage/tar.cpp
+++ b/unit_tests/storage/tar.cpp
@@ -3,8 +3,8 @@
 #include "../common/range_tools.hpp"
 #include "../common/temporary_file.hpp"
 
-#include <boost/function_output_iterator.hpp>
 #include <boost/iterator/function_input_iterator.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_SUITE(tar)