diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
index fb1830ce3..08431a2cf 100644
--- a/include/engine/api/route_api.hpp
+++ b/include/engine/api/route_api.hpp
@@ -27,6 +27,7 @@
 #include "util/integer_range.hpp"
 #include "util/json_util.hpp"
 
+#include <bitset>
 #include <iterator>
 #include <map>
 #include <vector>
diff --git a/include/engine/base64.hpp b/include/engine/base64.hpp
index edce62b15..8af51b739 100644
--- a/include/engine/base64.hpp
+++ b/include/engine/base64.hpp
@@ -3,16 +3,13 @@
 
 #include <iterator>
 #include <string>
-#include <type_traits>
 
 #include <climits>
 #include <cstddef>
 
-#include <boost/algorithm/string/trim.hpp>
 #include <boost/archive/iterators/base64_from_binary.hpp>
 #include <boost/archive/iterators/binary_from_base64.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
-#include <boost/range/algorithm/copy.hpp>
 
 namespace osrm
 {
diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp
index 82e7760c6..87d434b5a 100644
--- a/include/engine/polyline_compressor.hpp
+++ b/include/engine/polyline_compressor.hpp
@@ -3,7 +3,6 @@
 
 #include "util/coordinate.hpp"
 
-#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index e39abeecf..56aec7392 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -25,10 +25,7 @@
 #include "storage/io.hpp"
 #include "traffic_signals.hpp"
 
-#include <algorithm>
-#include <cstddef>
 #include <cstdint>
-#include <iosfwd>
 #include <string>
 #include <unordered_set>
 #include <vector>
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index 8ac57cf1a..655d888c1 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -7,7 +7,6 @@
 #include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
-#include <variant>
 
 namespace osrm::extractor
 {
diff --git a/include/extractor/maneuver_override.hpp b/include/extractor/maneuver_override.hpp
index 78eb31021..1688dcb1a 100644
--- a/include/extractor/maneuver_override.hpp
+++ b/include/extractor/maneuver_override.hpp
@@ -11,8 +11,6 @@
 #include "util/std_hash.hpp"
 #include "util/vector_view.hpp"
 
-#include <variant>
-
 #include <algorithm>
 
 namespace osrm::extractor
diff --git a/include/extractor/node_based_graph_factory.hpp b/include/extractor/node_based_graph_factory.hpp
index 8fad25c55..79b4b45cd 100644
--- a/include/extractor/node_based_graph_factory.hpp
+++ b/include/extractor/node_based_graph_factory.hpp
@@ -12,7 +12,6 @@
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 
-#include <filesystem>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp
index 89d438183..3b6725016 100644
--- a/include/extractor/raster_source.hpp
+++ b/include/extractor/raster_source.hpp
@@ -14,7 +14,6 @@
 #include <storage/io.hpp>
 
 #include <filesystem>
-#include <iterator>
 #include <string>
 #include <unordered_map>
 
diff --git a/include/extractor/road_classification.hpp b/include/extractor/road_classification.hpp
index fad836557..679e1d1f6 100644
--- a/include/extractor/road_classification.hpp
+++ b/include/extractor/road_classification.hpp
@@ -2,7 +2,7 @@
 #define OSRM_EXTRACTOR_CLASSIFICATION_DATA_HPP_
 
 #include "extractor/intersection/constants.hpp"
-#include <algorithm>
+
 #include <boost/assert.hpp>
 #include <cmath>
 #include <cstdint>
diff --git a/include/extractor/segment_data_container.hpp b/include/extractor/segment_data_container.hpp
index 3ec640898..0a22f9279 100644
--- a/include/extractor/segment_data_container.hpp
+++ b/include/extractor/segment_data_container.hpp
@@ -11,7 +11,6 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/iterator_range.hpp>
 
-#include <filesystem>
 #include <string>
 
 namespace osrm::extractor
diff --git a/include/extractor/turn_path.hpp b/include/extractor/turn_path.hpp
index 5747f620c..4bd751ed4 100644
--- a/include/extractor/turn_path.hpp
+++ b/include/extractor/turn_path.hpp
@@ -4,6 +4,7 @@
 #include "util/typedefs.hpp"
 
 #include <algorithm>
+#include <tuple>
 #include <variant>
 #include <vector>
 
diff --git a/include/extractor/turn_path_compressor.hpp b/include/extractor/turn_path_compressor.hpp
index 928b91af5..4a6bbea89 100644
--- a/include/extractor/turn_path_compressor.hpp
+++ b/include/extractor/turn_path_compressor.hpp
@@ -3,6 +3,7 @@
 
 #include "util/typedefs.hpp"
 
+#include <unordered_map>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/include/updater/source.hpp b/include/updater/source.hpp
index 852b21216..6a5b56dcb 100644
--- a/include/updater/source.hpp
+++ b/include/updater/source.hpp
@@ -4,6 +4,7 @@
 #include "util/typedefs.hpp"
 
 #include <optional>
+#include <tuple>
 #include <vector>
 
 namespace osrm::updater
diff --git a/include/util/coordinate.hpp b/include/util/coordinate.hpp
index 7f68caac5..df8843ecc 100644
--- a/include/util/coordinate.hpp
+++ b/include/util/coordinate.hpp
@@ -32,9 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <cstddef>
 #include <cstdint>
-#include <iosfwd> //for std::ostream
 #include <type_traits>
 
 namespace osrm
diff --git a/include/util/for_each_indexed.hpp b/include/util/for_each_indexed.hpp
index 725c0980b..a5daa3541 100644
--- a/include/util/for_each_indexed.hpp
+++ b/include/util/for_each_indexed.hpp
@@ -2,7 +2,6 @@
 #define FOR_EACH_INDEXED_HPP
 
 #include <iterator>
-#include <numeric>
 
 namespace osrm::util
 {
diff --git a/include/util/for_each_pair.hpp b/include/util/for_each_pair.hpp
index b1fb5b1bb..8b47b0147 100644
--- a/include/util/for_each_pair.hpp
+++ b/include/util/for_each_pair.hpp
@@ -2,7 +2,6 @@
 #define FOR_EACH_PAIR_HPP
 
 #include <iterator>
-#include <numeric>
 #include <utility>
 
 namespace osrm::util
diff --git a/include/util/json_deep_compare.hpp b/include/util/json_deep_compare.hpp
index 0a72e3010..6c7ddd86a 100644
--- a/include/util/json_deep_compare.hpp
+++ b/include/util/json_deep_compare.hpp
@@ -6,7 +6,6 @@
 
 #include <boost/assert.hpp>
 
-#include <algorithm>
 #include <set>
 
 namespace osrm::util::json
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index bdc3dcae0..2a6b9a90f 100644
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@@ -8,7 +8,6 @@
 
 #include "osrm/json_container.hpp"
 
-#include <algorithm>
 #include <iterator>
 #include <ostream>
 #include <string>
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index a17ea7799..e362e584b 100644
--- a/src/engine/api/json_factory.cpp
+++ b/src/engine/api/json_factory.cpp
@@ -14,6 +14,7 @@
 #include <optional>
 
 #include <algorithm>
+#include <bitset>
 #include <iterator>
 #include <string>
 #include <utility>
diff --git a/src/extractor/restriction_graph.cpp b/src/extractor/restriction_graph.cpp
index 6b931f78c..71b668c11 100644
--- a/src/extractor/restriction_graph.cpp
+++ b/src/extractor/restriction_graph.cpp
@@ -7,6 +7,8 @@
 
 #include <boost/range/algorithm/copy.hpp>
 
+#include <numeric>
+
 namespace osrm::extractor
 {