diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7ff9af7ee6..fddc909d92c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
       - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
       - FIXED: Segfault in `UnresolvedManeuverOverride::Turns()` on Australia extracts [#7112](https://github.com/Project-OSRM/osrm-backend/pull/7112)
       - CHANGED: Replaced PL:trunk with PL:expressway to match the latest changes in Polish tagging [#7079](https://github.com/Project-OSRM/osrm-backend/pull/7079)
+      - FIXED: Remove unused C++ headers [#7105](https://github.com/Project-OSRM/osrm-backend/pull/7105)
     - Profiles:
       - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
       - ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)
diff --git a/include/contractor/contractor_config.hpp b/include/contractor/contractor_config.hpp
index 30889e21825..d431ec5617e 100644
--- a/include/contractor/contractor_config.hpp
+++ b/include/contractor/contractor_config.hpp
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "updater/updater_config.hpp"
 
 #include <filesystem>
-#include <string>
 
 namespace osrm::contractor
 {
diff --git a/include/contractor/graph_contractor.hpp b/include/contractor/graph_contractor.hpp
index 8592d75b17c..0cf490c61ab 100644
--- a/include/contractor/graph_contractor.hpp
+++ b/include/contractor/graph_contractor.hpp
@@ -5,7 +5,6 @@
 
 #include "util/filtered_graph.hpp"
 
-#include <tuple>
 #include <vector>
 
 namespace osrm::contractor
diff --git a/include/customizer/customizer_config.hpp b/include/customizer/customizer_config.hpp
index 11f786c468a..8068d5c47dc 100644
--- a/include/customizer/customizer_config.hpp
+++ b/include/customizer/customizer_config.hpp
@@ -1,9 +1,7 @@
 #ifndef OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
 #define OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
 
-#include <array>
 #include <filesystem>
-#include <string>
 
 #include "storage/io_config.hpp"
 #include "updater/updater_config.hpp"
diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
index fb1830ce361..08431a2cf5d 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/api/trip_parameters.hpp b/include/engine/api/trip_parameters.hpp
index cc3f4d938a2..8d28e880f12 100644
--- a/include/engine/api/trip_parameters.hpp
+++ b/include/engine/api/trip_parameters.hpp
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/api/route_parameters.hpp"
 
 #include <optional>
-#include <vector>
 
 namespace osrm::engine::api
 {
diff --git a/include/engine/base64.hpp b/include/engine/base64.hpp
index d0a90c02b8e..8af51b73973 100644
--- a/include/engine/base64.hpp
+++ b/include/engine/base64.hpp
@@ -3,13 +3,10 @@
 
 #include <iterator>
 #include <string>
-#include <type_traits>
-#include <vector>
 
 #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>
diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
index 07e74c001af..ca380ecefea 100644
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
-#include <limits>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index 3087aa70693..b42584b3b4f 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -36,7 +36,6 @@
 #include <ranges>
 #include <string>
 #include <string_view>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::datafacade
diff --git a/include/engine/datafacade/mmap_memory_allocator.hpp b/include/engine/datafacade/mmap_memory_allocator.hpp
index 3acb5caa4d6..6d7a99a16ae 100644
--- a/include/engine/datafacade/mmap_memory_allocator.hpp
+++ b/include/engine/datafacade/mmap_memory_allocator.hpp
@@ -9,7 +9,6 @@
 
 #include <boost/iostreams/device/mapped_file.hpp>
 
-#include <memory>
 #include <string>
 
 namespace osrm::engine::datafacade
diff --git a/include/engine/datafacade_factory.hpp b/include/engine/datafacade_factory.hpp
index d255b394dcf..10a7e35cc47 100644
--- a/include/engine/datafacade_factory.hpp
+++ b/include/engine/datafacade_factory.hpp
@@ -12,7 +12,6 @@
 
 #include "storage/shared_datatype.hpp"
 
-#include <array>
 #include <memory>
 #include <unordered_map>
 
diff --git a/include/engine/engine.hpp b/include/engine/engine.hpp
index 3e479e5cd7d..9c21aa04d35 100644
--- a/include/engine/engine.hpp
+++ b/include/engine/engine.hpp
@@ -21,7 +21,6 @@
 #include "util/json_container.hpp"
 
 #include <memory>
-#include <string>
 
 namespace osrm::engine
 {
diff --git a/include/engine/engine_config.hpp b/include/engine/engine_config.hpp
index e46f2c5e2ba..7467a014d87 100644
--- a/include/engine/engine_config.hpp
+++ b/include/engine/engine_config.hpp
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm/datasets.hpp"
 
 #include <filesystem>
-#include <set>
 #include <string>
 
 namespace osrm::engine
diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp
index 7e269ec1bb5..db71c4bdf13 100644
--- a/include/engine/geospatial_query.hpp
+++ b/include/engine/geospatial_query.hpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <cmath>
 #include <iterator>
-#include <memory>
 #include <vector>
 
 namespace osrm::engine
diff --git a/include/engine/guidance/assemble_geometry.hpp b/include/engine/guidance/assemble_geometry.hpp
index ad246c7119b..8783a8b8beb 100644
--- a/include/engine/guidance/assemble_geometry.hpp
+++ b/include/engine/guidance/assemble_geometry.hpp
@@ -13,7 +13,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::guidance
diff --git a/include/engine/guidance/assemble_leg.hpp b/include/engine/guidance/assemble_leg.hpp
index 1906ae50f70..2ff532e7a6c 100644
--- a/include/engine/guidance/assemble_leg.hpp
+++ b/include/engine/guidance/assemble_leg.hpp
@@ -20,7 +20,6 @@
 #include <array>
 #include <numeric>
 #include <string>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::guidance
diff --git a/include/engine/guidance/step_maneuver.hpp b/include/engine/guidance/step_maneuver.hpp
index 91131be3dc3..9a8d6754bbb 100644
--- a/include/engine/guidance/step_maneuver.hpp
+++ b/include/engine/guidance/step_maneuver.hpp
@@ -5,8 +5,6 @@
 #include "util/coordinate.hpp"
 
 #include <cstdint>
-#include <string>
-#include <vector>
 
 namespace osrm::engine::guidance
 {
diff --git a/include/engine/map_matching/bayes_classifier.hpp b/include/engine/map_matching/bayes_classifier.hpp
index 7d89e3d645e..96cb86523bf 100644
--- a/include/engine/map_matching/bayes_classifier.hpp
+++ b/include/engine/map_matching/bayes_classifier.hpp
@@ -4,7 +4,6 @@
 #include <cmath>
 
 #include <utility>
-#include <vector>
 
 #include <numbers>
 
diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp
index bfad1b7787d..4df5a7e576a 100644
--- a/include/engine/plugins/match.hpp
+++ b/include/engine/plugins/match.hpp
@@ -7,8 +7,6 @@
 
 #include "util/json_util.hpp"
 
-#include <vector>
-
 namespace osrm::engine::plugins
 {
 
diff --git a/include/engine/plugins/tile.hpp b/include/engine/plugins/tile.hpp
index c5a85f6155c..223f6d1e309 100644
--- a/include/engine/plugins/tile.hpp
+++ b/include/engine/plugins/tile.hpp
@@ -5,9 +5,6 @@
 #include "engine/plugins/plugin_base.hpp"
 #include "engine/routing_algorithms.hpp"
 
-#include <utility>
-#include <vector>
-
 /*
  * This plugin generates Mapbox Vector tiles that show the internal
  * routing geometry and speed values on all road segments.
diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp
index a08eaeed0d7..6a5a54d6725 100644
--- a/include/engine/plugins/trip.hpp
+++ b/include/engine/plugins/trip.hpp
@@ -8,14 +8,9 @@
 
 #include "util/json_container.hpp"
 
-#include <boost/assert.hpp>
-
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
-#include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::plugins
diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp
index 56040a58fe9..2d1d61c9481 100644
--- a/include/engine/plugins/viaroute.hpp
+++ b/include/engine/plugins/viaroute.hpp
@@ -11,9 +11,6 @@
 #include <cstdlib>
 
 #include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
 
 namespace osrm::engine::plugins
 {
diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp
index af58b04223d..87d434b5aba 100644
--- a/include/engine/polyline_compressor.hpp
+++ b/include/engine/polyline_compressor.hpp
@@ -3,8 +3,6 @@
 
 #include "util/coordinate.hpp"
 
-#include <algorithm>
-#include <boost/assert.hpp>
 #include <string>
 #include <vector>
 
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index d4dcdac5867..20821e6c97a 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -16,15 +16,11 @@
 #include <boost/assert.hpp>
 
 #include <cstddef>
-#include <cstdint>
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
-#include <memory>
 #include <numeric>
 #include <stack>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::routing_algorithms
diff --git a/include/engine/trip/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp
index a55e41ee5d4..ab7f4ceb417 100644
--- a/include/engine/trip/trip_brute_force.hpp
+++ b/include/engine/trip/trip_brute_force.hpp
@@ -10,9 +10,7 @@
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
-#include <limits>
 #include <numeric>
-#include <string>
 #include <vector>
 
 namespace osrm::engine::trip
diff --git a/include/engine/trip/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp
index 46ace93e3b5..a912585f5c2 100644
--- a/include/engine/trip/trip_farthest_insertion.hpp
+++ b/include/engine/trip/trip_farthest_insertion.hpp
@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <limits>
-#include <string>
 #include <vector>
 
 namespace osrm::engine::trip
diff --git a/include/engine/trip/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp
index 6f798270fb0..099b72dfbd9 100644
--- a/include/engine/trip/trip_nearest_neighbour.hpp
+++ b/include/engine/trip/trip_nearest_neighbour.hpp
@@ -9,8 +9,6 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include <limits>
-#include <string>
 #include <vector>
 
 namespace osrm::engine::trip
diff --git a/include/extractor/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp
index 2bc3cd15715..176be1b7513 100644
--- a/include/extractor/compressed_edge_container.hpp
+++ b/include/extractor/compressed_edge_container.hpp
@@ -7,7 +7,6 @@
 
 #include <unordered_map>
 
-#include <string>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index 9c66c35ca08..56aec7392c7 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -25,14 +25,8 @@
 #include "storage/io.hpp"
 #include "traffic_signals.hpp"
 
-#include <algorithm>
-#include <cstddef>
 #include <cstdint>
-#include <iosfwd>
-#include <memory>
-#include <queue>
 #include <string>
-#include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/extractor/extraction_turn.hpp b/include/extractor/extraction_turn.hpp
index f1bb16a0f2d..4dafd823cb9 100644
--- a/include/extractor/extraction_turn.hpp
+++ b/include/extractor/extraction_turn.hpp
@@ -6,7 +6,6 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <cstdint>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/include/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp
index 5f6fe960021..2f24bd0420b 100644
--- a/include/extractor/extraction_way.hpp
+++ b/include/extractor/extraction_way.hpp
@@ -7,7 +7,6 @@
 #include "util/typedefs.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::extractor
 {
diff --git a/include/extractor/extractor_config.hpp b/include/extractor/extractor_config.hpp
index 15df396dc13..5e733ed2011 100644
--- a/include/extractor/extractor_config.hpp
+++ b/include/extractor/extractor_config.hpp
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "storage/io_config.hpp"
 
-#include <array>
 #include <filesystem>
 #include <string>
 
diff --git a/include/extractor/files.hpp b/include/extractor/files.hpp
index 2c90d3a046d..600f028d556 100644
--- a/include/extractor/files.hpp
+++ b/include/extractor/files.hpp
@@ -16,8 +16,6 @@
 #include "util/range_table.hpp"
 #include "util/serialization.hpp"
 
-#include <boost/assert.hpp>
-
 namespace osrm::extractor::files
 {
 
diff --git a/include/extractor/graph_compressor.hpp b/include/extractor/graph_compressor.hpp
index 960bd64ff22..0e9a1070570 100644
--- a/include/extractor/graph_compressor.hpp
+++ b/include/extractor/graph_compressor.hpp
@@ -7,7 +7,6 @@
 #include "traffic_signals.hpp"
 #include "util/node_based_graph.hpp"
 
-#include <memory>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index c9e072d60da..655d888c132 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -7,8 +7,6 @@
 #include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
-#include <utility>
-#include <variant>
 
 namespace osrm::extractor
 {
diff --git a/include/extractor/intersection/intersection_edge.hpp b/include/extractor/intersection/intersection_edge.hpp
index 9121e1b0eda..7cb95fac739 100644
--- a/include/extractor/intersection/intersection_edge.hpp
+++ b/include/extractor/intersection/intersection_edge.hpp
@@ -3,6 +3,7 @@
 
 #include "util/typedefs.hpp"
 
+#include <tuple>
 #include <vector>
 
 namespace osrm::extractor::intersection
diff --git a/include/extractor/intersection/intersection_view.hpp b/include/extractor/intersection/intersection_view.hpp
index c1517c65f73..4eb60585602 100644
--- a/include/extractor/intersection/intersection_view.hpp
+++ b/include/extractor/intersection/intersection_view.hpp
@@ -15,9 +15,7 @@
 #include <boost/range/algorithm/min_element.hpp>
 
 #include <algorithm>
-#include <functional>
 #include <limits>
-#include <string>
 #include <type_traits>
 #include <vector>
 
diff --git a/include/extractor/intersection/mergable_road_detector.hpp b/include/extractor/intersection/mergable_road_detector.hpp
index 4871ad8292e..1f02afb5675 100644
--- a/include/extractor/intersection/mergable_road_detector.hpp
+++ b/include/extractor/intersection/mergable_road_detector.hpp
@@ -14,9 +14,6 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
 
-#include <cstdint>
-#include <functional>
-#include <limits>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/extractor/maneuver_override.hpp b/include/extractor/maneuver_override.hpp
index 78eb31021b3..1688dcb1a48 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/maneuver_override_relation_parser.hpp b/include/extractor/maneuver_override_relation_parser.hpp
index c6084ad70ec..168e37a1073 100644
--- a/include/extractor/maneuver_override_relation_parser.hpp
+++ b/include/extractor/maneuver_override_relation_parser.hpp
@@ -4,8 +4,6 @@
 #include "maneuver_override.hpp"
 
 #include <optional>
-#include <string>
-#include <vector>
 
 namespace osmium
 {
diff --git a/include/extractor/node_based_graph_factory.hpp b/include/extractor/node_based_graph_factory.hpp
index e3a5072857c..79b4b45cd34 100644
--- a/include/extractor/node_based_graph_factory.hpp
+++ b/include/extractor/node_based_graph_factory.hpp
@@ -12,9 +12,6 @@
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 
-#include <filesystem>
-#include <memory>
-#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/extractor/node_restriction_map.hpp b/include/extractor/node_restriction_map.hpp
index 258e7e2de3a..4c812b2ca54 100644
--- a/include/extractor/node_restriction_map.hpp
+++ b/include/extractor/node_restriction_map.hpp
@@ -5,10 +5,6 @@
 #include "restriction_graph.hpp"
 #include "util/typedefs.hpp"
 
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
 namespace osrm::extractor
 {
 
diff --git a/include/extractor/nodes_of_way.hpp b/include/extractor/nodes_of_way.hpp
index 774d3fb7759..2853068d946 100644
--- a/include/extractor/nodes_of_way.hpp
+++ b/include/extractor/nodes_of_way.hpp
@@ -3,8 +3,6 @@
 
 #include "util/typedefs.hpp"
 
-#include <limits>
-#include <string>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp
index 89d4381834e..3b6725016be 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/restriction.hpp b/include/extractor/restriction.hpp
index cfd3e17594e..40843d5c758 100644
--- a/include/extractor/restriction.hpp
+++ b/include/extractor/restriction.hpp
@@ -5,7 +5,6 @@
 #include "util/coordinate.hpp"
 #include "util/opening_hours.hpp"
 #include "util/typedefs.hpp"
-#include <limits>
 
 namespace osrm::extractor
 {
diff --git a/include/extractor/restriction_graph.hpp b/include/extractor/restriction_graph.hpp
index 51f660eeb34..b9d5123fb85 100644
--- a/include/extractor/restriction_graph.hpp
+++ b/include/extractor/restriction_graph.hpp
@@ -1,8 +1,6 @@
 #ifndef OSRM_EXTRACTOR_RESTRICTION_GRAPH_HPP_
 #define OSRM_EXTRACTOR_RESTRICTION_GRAPH_HPP_
 
-#include <boost/assert.hpp>
-
 #include "util/node_based_graph.hpp"
 #include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
diff --git a/include/extractor/road_classification.hpp b/include/extractor/road_classification.hpp
index fad836557e9..679e1d1f6ca 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 141e961bad5..d012e5b9f61 100644
--- a/include/extractor/segment_data_container.hpp
+++ b/include/extractor/segment_data_container.hpp
@@ -7,11 +7,9 @@
 
 #include "storage/shared_memory_ownership.hpp"
 #include "storage/tar_fwd.hpp"
-#include <filesystem>
+
 #include <ranges>
 #include <string>
-#include <unordered_map>
-#include <vector>
 
 namespace osrm::extractor
 {
diff --git a/include/extractor/serialization.hpp b/include/extractor/serialization.hpp
index 98ebc7713ce..51f9a34f9c0 100644
--- a/include/extractor/serialization.hpp
+++ b/include/extractor/serialization.hpp
@@ -15,8 +15,6 @@
 #include "storage/io.hpp"
 #include "storage/serialization.hpp"
 
-#include <boost/assert.hpp>
-
 namespace osrm::extractor::serialization
 {
 
diff --git a/include/extractor/turn_lane_types.hpp b/include/extractor/turn_lane_types.hpp
index 88a124f54be..bfe5bed7f15 100644
--- a/include/extractor/turn_lane_types.hpp
+++ b/include/extractor/turn_lane_types.hpp
@@ -6,7 +6,6 @@
 #include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
 
-#include <bitset>
 #include <cstddef>
 #include <cstdint>
 #include <numeric> //partial_sum
diff --git a/include/extractor/turn_path.hpp b/include/extractor/turn_path.hpp
index 5747f620cfe..4bd751ed454 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/way_restriction_map.hpp b/include/extractor/way_restriction_map.hpp
index 8c8cca4a511..3b4b2cc6cba 100644
--- a/include/extractor/way_restriction_map.hpp
+++ b/include/extractor/way_restriction_map.hpp
@@ -7,8 +7,6 @@
 #include "util/typedefs.hpp"
 
 // to access the turn restrictions
-#include <unordered_map>
-#include <utility>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/include/guidance/files.hpp b/include/guidance/files.hpp
index e72a9f62284..8ca0bcbd002 100644
--- a/include/guidance/files.hpp
+++ b/include/guidance/files.hpp
@@ -8,8 +8,6 @@
 #include "util/range_table.hpp"
 #include "util/serialization.hpp"
 
-#include <boost/assert.hpp>
-
 #include <cstdint>
 #include <filesystem>
 #include <type_traits>
diff --git a/include/guidance/intersection_handler.hpp b/include/guidance/intersection_handler.hpp
index 5a7068e40a9..2f657ee05ed 100644
--- a/include/guidance/intersection_handler.hpp
+++ b/include/guidance/intersection_handler.hpp
@@ -16,7 +16,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <optional>
-#include <utility>
 #include <vector>
 
 namespace osrm::guidance
diff --git a/include/guidance/serialization.hpp b/include/guidance/serialization.hpp
index 98e3032226e..45b4a19f11b 100644
--- a/include/guidance/serialization.hpp
+++ b/include/guidance/serialization.hpp
@@ -6,8 +6,6 @@
 #include "storage/serialization.hpp"
 #include "storage/tar.hpp"
 
-#include <boost/assert.hpp>
-
 namespace osrm::guidance::serialization
 {
 
diff --git a/include/guidance/turn_analysis.hpp b/include/guidance/turn_analysis.hpp
index d17ea0c03d3..56a3e5804bc 100644
--- a/include/guidance/turn_analysis.hpp
+++ b/include/guidance/turn_analysis.hpp
@@ -19,13 +19,7 @@
 
 #include "util/node_based_graph.hpp"
 
-#include <cstdint>
-
-#include <memory>
-#include <string>
-#include <tuple>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 namespace osrm::guidance
diff --git a/include/guidance/turn_handler.hpp b/include/guidance/turn_handler.hpp
index 88b9daae04c..5d4348cab4a 100644
--- a/include/guidance/turn_handler.hpp
+++ b/include/guidance/turn_handler.hpp
@@ -12,7 +12,6 @@
 
 #include <cstddef>
 #include <optional>
-#include <utility>
 #include <vector>
 
 namespace osrm::guidance
diff --git a/include/guidance/turn_lane_handler.hpp b/include/guidance/turn_lane_handler.hpp
index 9994867a3eb..b7c9e1a042b 100644
--- a/include/guidance/turn_lane_handler.hpp
+++ b/include/guidance/turn_lane_handler.hpp
@@ -16,8 +16,6 @@
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
-#include <map>
-#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/include/nodejs/json_v8_renderer.hpp b/include/nodejs/json_v8_renderer.hpp
index a6b424da693..75c6871981c 100644
--- a/include/nodejs/json_v8_renderer.hpp
+++ b/include/nodejs/json_v8_renderer.hpp
@@ -4,8 +4,6 @@
 #include "osrm/json_container.hpp"
 #include <napi.h>
 
-#include <functional>
-
 namespace node_osrm
 {
 
diff --git a/include/nodejs/node_osrm_support.hpp b/include/nodejs/node_osrm_support.hpp
index f428308e50c..328a9985460 100644
--- a/include/nodejs/node_osrm_support.hpp
+++ b/include/nodejs/node_osrm_support.hpp
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <variant>
diff --git a/include/osrm/error_codes.hpp b/include/osrm/error_codes.hpp
index 476b9830958..55043159585 100644
--- a/include/osrm/error_codes.hpp
+++ b/include/osrm/error_codes.hpp
@@ -1,8 +1,6 @@
 #ifndef OSRM_ERRORCODES_HPP
 #define OSRM_ERRORCODES_HPP
 
-#include <string>
-
 namespace osrm
 {
 
diff --git a/include/partitioner/bisection_graph_view.hpp b/include/partitioner/bisection_graph_view.hpp
index a9201732019..ff547fca35b 100644
--- a/include/partitioner/bisection_graph_view.hpp
+++ b/include/partitioner/bisection_graph_view.hpp
@@ -8,7 +8,6 @@
 #include <ranges>
 
 #include <cstddef>
-#include <cstdint>
 
 namespace osrm::partitioner
 {
diff --git a/include/partitioner/dinic_max_flow.hpp b/include/partitioner/dinic_max_flow.hpp
index 5f742ac78d8..abe889f5b0f 100644
--- a/include/partitioner/dinic_max_flow.hpp
+++ b/include/partitioner/dinic_max_flow.hpp
@@ -4,10 +4,8 @@
 #include "partitioner/bisection_graph_view.hpp"
 
 #include <cstdint>
-#include <functional>
 #include <set>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 namespace osrm::partitioner
diff --git a/include/partitioner/edge_based_graph.hpp b/include/partitioner/edge_based_graph.hpp
index 0b09aea17aa..0d2af246d0f 100644
--- a/include/partitioner/edge_based_graph.hpp
+++ b/include/partitioner/edge_based_graph.hpp
@@ -11,8 +11,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <memory>
-#include <vector>
 
 namespace osrm::partitioner
 {
diff --git a/include/partitioner/edge_based_graph_reader.hpp b/include/partitioner/edge_based_graph_reader.hpp
index 99f111435a6..0a928a03362 100644
--- a/include/partitioner/edge_based_graph_reader.hpp
+++ b/include/partitioner/edge_based_graph_reader.hpp
@@ -18,7 +18,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <memory>
 #include <vector>
 
 namespace osrm::partitioner
diff --git a/include/partitioner/partition_graph.hpp b/include/partitioner/partition_graph.hpp
index bbabd1b967b..61b798a3744 100644
--- a/include/partitioner/partition_graph.hpp
+++ b/include/partitioner/partition_graph.hpp
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
 #include <iterator>
 #include <vector>
 
diff --git a/include/partitioner/partitioner_config.hpp b/include/partitioner/partitioner_config.hpp
index 3bffdd515bc..326b6e6b80b 100644
--- a/include/partitioner/partitioner_config.hpp
+++ b/include/partitioner/partitioner_config.hpp
@@ -1,9 +1,7 @@
 #ifndef OSRM_PARTITIONER_CONFIG_HPP
 #define OSRM_PARTITIONER_CONFIG_HPP
 
-#include <array>
 #include <filesystem>
-#include <string>
 
 #include "storage/io_config.hpp"
 
diff --git a/include/server/api/parsed_url.hpp b/include/server/api/parsed_url.hpp
index ee1cf221809..bfdc46ef887 100644
--- a/include/server/api/parsed_url.hpp
+++ b/include/server/api/parsed_url.hpp
@@ -4,7 +4,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::api
 {
diff --git a/include/server/connection.hpp b/include/server/connection.hpp
index ad8e49d98a3..8ded1310d6d 100644
--- a/include/server/connection.hpp
+++ b/include/server/connection.hpp
@@ -11,7 +11,6 @@
 #include <boost/config.hpp>
 #include <boost/version.hpp>
 
-#include <memory>
 #include <vector>
 
 namespace osrm::server
diff --git a/include/server/request_handler.hpp b/include/server/request_handler.hpp
index 4841d2ec2b6..b05343bf823 100644
--- a/include/server/request_handler.hpp
+++ b/include/server/request_handler.hpp
@@ -3,8 +3,6 @@
 
 #include "server/service_handler.hpp"
 
-#include <string>
-
 namespace osrm::server
 {
 
diff --git a/include/server/server.hpp b/include/server/server.hpp
index 02b0dda050d..e7966a91a8c 100644
--- a/include/server/server.hpp
+++ b/include/server/server.hpp
@@ -18,7 +18,6 @@
 #include <sys/types.h>
 #endif
 
-#include <functional>
 #include <memory>
 #include <string>
 #include <thread>
diff --git a/include/server/service/base_service.hpp b/include/server/service/base_service.hpp
index 5e52a2e0933..a3e5eb403c6 100644
--- a/include/server/service/base_service.hpp
+++ b/include/server/service/base_service.hpp
@@ -8,7 +8,6 @@
 #include <variant>
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/match_service.hpp b/include/server/service/match_service.hpp
index 4294a1f4175..d8e5345e308 100644
--- a/include/server/service/match_service.hpp
+++ b/include/server/service/match_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/nearest_service.hpp b/include/server/service/nearest_service.hpp
index c4895ecfb95..b64fe4d412a 100644
--- a/include/server/service/nearest_service.hpp
+++ b/include/server/service/nearest_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/route_service.hpp b/include/server/service/route_service.hpp
index 19b52d38063..b03b3d65974 100644
--- a/include/server/service/route_service.hpp
+++ b/include/server/service/route_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/table_service.hpp b/include/server/service/table_service.hpp
index f4ce955b242..3b6b30410e6 100644
--- a/include/server/service/table_service.hpp
+++ b/include/server/service/table_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/tile_service.hpp b/include/server/service/tile_service.hpp
index 5cc62e6ca78..4bf4f21606d 100644
--- a/include/server/service/tile_service.hpp
+++ b/include/server/service/tile_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/server/service/trip_service.hpp b/include/server/service/trip_service.hpp
index 3f820b747f6..c1b4c2c0e80 100644
--- a/include/server/service/trip_service.hpp
+++ b/include/server/service/trip_service.hpp
@@ -8,7 +8,6 @@
 #include "util/coordinate.hpp"
 
 #include <string>
-#include <vector>
 
 namespace osrm::server::service
 {
diff --git a/include/storage/io.hpp b/include/storage/io.hpp
index cebb180cdb3..10ffcb58399 100644
--- a/include/storage/io.hpp
+++ b/include/storage/io.hpp
@@ -18,7 +18,6 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
-#include <tuple>
 #include <type_traits>
 
 namespace osrm::storage::io
diff --git a/include/storage/serialization.hpp b/include/storage/serialization.hpp
index 16965638eb7..b94aa7be94b 100644
--- a/include/storage/serialization.hpp
+++ b/include/storage/serialization.hpp
@@ -15,7 +15,6 @@
 
 #include <cmath>
 #include <cstdint>
-#include <tuple>
 
 namespace osrm::storage::serialization
 {
diff --git a/include/storage/shared_datatype.hpp b/include/storage/shared_datatype.hpp
index fae3989a2e1..d9c6670d958 100644
--- a/include/storage/shared_datatype.hpp
+++ b/include/storage/shared_datatype.hpp
@@ -7,8 +7,6 @@
 #include "util/exception.hpp"
 #include "util/exception_utils.hpp"
 
-#include <boost/assert.hpp>
-
 #include <array>
 #include <cstdint>
 #include <map>
diff --git a/include/storage/shared_memory.hpp b/include/storage/shared_memory.hpp
index 1b33d4ebe10..3acec0f3d8a 100644
--- a/include/storage/shared_memory.hpp
+++ b/include/storage/shared_memory.hpp
@@ -20,7 +20,6 @@
 #include <cstdint>
 
 #include <algorithm>
-#include <exception>
 #include <filesystem>
 #include <fstream>
 #include <thread>
diff --git a/include/updater/csv_file_parser.hpp b/include/updater/csv_file_parser.hpp
index bac8d9bfc2c..037f5b4ec91 100644
--- a/include/updater/csv_file_parser.hpp
+++ b/include/updater/csv_file_parser.hpp
@@ -16,9 +16,7 @@
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
-#include <exception>
 #include <filesystem>
-#include <stdexcept>
 #include <vector>
 
 namespace osrm::updater
diff --git a/include/updater/source.hpp b/include/updater/source.hpp
index 852b21216ea..6a5b56dcb52 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/updater/updater.hpp b/include/updater/updater.hpp
index b9e291c995d..3ebd52f3ede 100644
--- a/include/updater/updater.hpp
+++ b/include/updater/updater.hpp
@@ -5,7 +5,6 @@
 
 #include "extractor/edge_based_edge.hpp"
 
-#include <chrono>
 #include <vector>
 
 namespace osrm::updater
diff --git a/include/updater/updater_config.hpp b/include/updater/updater_config.hpp
index d1dab9f3c49..221371b0507 100644
--- a/include/updater/updater_config.hpp
+++ b/include/updater/updater_config.hpp
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/io_config.hpp"
 #include "storage/storage_config.hpp"
 
-#include <chrono>
 #include <filesystem>
 #include <string>
 
diff --git a/include/util/alias.hpp b/include/util/alias.hpp
index da6ab0e17d5..caf30751040 100644
--- a/include/util/alias.hpp
+++ b/include/util/alias.hpp
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OSRM_UTIL_ALIAS_HPP
 
 #include <cstddef>
-#include <functional>
 #include <ostream>
 #include <type_traits>
 
diff --git a/include/util/assert.hpp b/include/util/assert.hpp
index 31127f29cf2..bf611241849 100644
--- a/include/util/assert.hpp
+++ b/include/util/assert.hpp
@@ -2,7 +2,6 @@
 #define OSRM_UTIL_ASSERT_HPP
 
 #include <iostream>
-#include <string>
 
 #include "util/to_osm_link.hpp"
 
diff --git a/include/util/bearing.hpp b/include/util/bearing.hpp
index 4318786951b..13f78684d7f 100644
--- a/include/util/bearing.hpp
+++ b/include/util/bearing.hpp
@@ -2,9 +2,7 @@
 #define BEARING_HPP
 
 #include <algorithm>
-#include <boost/assert.hpp>
 #include <cmath>
-#include <string>
 
 namespace osrm::util
 {
diff --git a/include/util/cheap_ruler.hpp b/include/util/cheap_ruler.hpp
index 386a1785dd4..7be93e842ac 100644
--- a/include/util/cheap_ruler.hpp
+++ b/include/util/cheap_ruler.hpp
@@ -2,11 +2,7 @@
 
 #include <cassert>
 #include <cmath>
-#include <cstdint>
-#include <limits>
 #include <numbers>
-#include <tuple>
-#include <utility>
 
 namespace mapbox
 {
diff --git a/include/util/coordinate.hpp b/include/util/coordinate.hpp
index e19a1bc5ec5..df8843ecc0d 100644
--- a/include/util/coordinate.hpp
+++ b/include/util/coordinate.hpp
@@ -32,11 +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 <sstream>
-#include <string>
 #include <type_traits>
 
 namespace osrm
diff --git a/include/util/d_ary_heap.hpp b/include/util/d_ary_heap.hpp
index ce9f3fb809f..ad7dbf82452 100644
--- a/include/util/d_ary_heap.hpp
+++ b/include/util/d_ary_heap.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <boost/assert.hpp>
-#include <functional>
+#include <cstddef>
 #include <limits>
 #include <utility>
 #include <vector>
@@ -110,4 +110,4 @@ template <typename HeapData, int Arity, typename Comparator = std::less<HeapData
     Comparator comp;
     std::vector<HeapData> heap;
 };
-} // namespace osrm::util
\ No newline at end of file
+} // namespace osrm::util
diff --git a/include/util/debug.hpp b/include/util/debug.hpp
index 2f60c369b2b..41a15dfc81f 100644
--- a/include/util/debug.hpp
+++ b/include/util/debug.hpp
@@ -11,10 +11,9 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
 
+#include <bitset>
 #include <iomanip>
 #include <ostream>
-#include <sstream>
-#include <string>
 #include <vector>
 
 namespace osrm
diff --git a/include/util/exception.hpp b/include/util/exception.hpp
index 660bae69a75..8d3a8762d7a 100644
--- a/include/util/exception.hpp
+++ b/include/util/exception.hpp
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OSRM_EXCEPTION_HPP
 
 #include <array>
-#include <exception>
 #include <string>
 #include <utility>
 
diff --git a/include/util/filtered_integer_range.hpp b/include/util/filtered_integer_range.hpp
index eb86573a3fe..ff4ceb90c91 100644
--- a/include/util/filtered_integer_range.hpp
+++ b/include/util/filtered_integer_range.hpp
@@ -1,13 +1,10 @@
 #ifndef FILTERED_INTEGER_RANGE_HPP
 #define FILTERED_INTEGER_RANGE_HPP
 
-#include <boost/assert.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
 #include <type_traits>
 
-#include <cstdint>
-
 namespace osrm::util
 {
 
diff --git a/include/util/for_each_indexed.hpp b/include/util/for_each_indexed.hpp
index 2ca86bfdf96..a5daa354106 100644
--- a/include/util/for_each_indexed.hpp
+++ b/include/util/for_each_indexed.hpp
@@ -2,8 +2,6 @@
 #define FOR_EACH_INDEXED_HPP
 
 #include <iterator>
-#include <numeric>
-#include <utility>
 
 namespace osrm::util
 {
diff --git a/include/util/for_each_pair.hpp b/include/util/for_each_pair.hpp
index b1fb5b1bb8d..8b47b01476f 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/guidance/bearing_class.hpp b/include/util/guidance/bearing_class.hpp
index 1e5fce1ebd3..6b13b8749f1 100644
--- a/include/util/guidance/bearing_class.hpp
+++ b/include/util/guidance/bearing_class.hpp
@@ -5,8 +5,6 @@
 #include "util/typedefs.hpp"
 
 #include <cstddef>
-#include <cstdint>
-#include <functional>
 #include <vector>
 
 namespace osrm::util::guidance
diff --git a/include/util/guidance/entry_class.hpp b/include/util/guidance/entry_class.hpp
index 884ae6cdb74..676b9b9eb8f 100644
--- a/include/util/guidance/entry_class.hpp
+++ b/include/util/guidance/entry_class.hpp
@@ -4,9 +4,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <type_traits>
-
-#include <bitset>
 
 namespace osrm::util::guidance
 {
diff --git a/include/util/guidance/turn_lanes.hpp b/include/util/guidance/turn_lanes.hpp
index 21126ee16db..226772cdd63 100644
--- a/include/util/guidance/turn_lanes.hpp
+++ b/include/util/guidance/turn_lanes.hpp
@@ -6,10 +6,6 @@
 #include "util/typedefs.hpp"
 
 #include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <unordered_map>
-#include <vector>
 
 namespace osrm::util::guidance
 {
diff --git a/include/util/integer_range.hpp b/include/util/integer_range.hpp
index 973197b7ff6..18472bfac61 100644
--- a/include/util/integer_range.hpp
+++ b/include/util/integer_range.hpp
@@ -1,13 +1,10 @@
 #ifndef INTEGER_RANGE_HPP
 #define INTEGER_RANGE_HPP
 
-#include <boost/assert.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
 #include <type_traits>
 
-#include <cstdint>
-
 namespace osrm::util
 {
 
diff --git a/include/util/json_deep_compare.hpp b/include/util/json_deep_compare.hpp
index 438386e7963..6c7ddd86a5e 100644
--- a/include/util/json_deep_compare.hpp
+++ b/include/util/json_deep_compare.hpp
@@ -6,8 +6,6 @@
 
 #include <boost/assert.hpp>
 
-#include <algorithm>
-#include <functional>
 #include <set>
 
 namespace osrm::util::json
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index bdc3dcae0c7..2a6b9a90ff6 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/include/util/mmap_tar.hpp b/include/util/mmap_tar.hpp
index a70d5fba802..73e973d47b1 100644
--- a/include/util/mmap_tar.hpp
+++ b/include/util/mmap_tar.hpp
@@ -7,7 +7,6 @@
 
 #include <boost/iostreams/device/mapped_file.hpp>
 
-#include <tuple>
 #include <unordered_map>
 
 namespace osrm::util
diff --git a/include/util/msb.hpp b/include/util/msb.hpp
index c58b8d8a0f1..9a2a3b39eb4 100644
--- a/include/util/msb.hpp
+++ b/include/util/msb.hpp
@@ -3,7 +3,6 @@
 
 #include <bit>
 #include <boost/assert.hpp>
-#include <cstdint>
 #include <limits>
 
 namespace osrm::util
diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp
index cb17b5a223c..6f8786844f2 100644
--- a/include/util/node_based_graph.hpp
+++ b/include/util/node_based_graph.hpp
@@ -9,9 +9,6 @@
 
 #include <tbb/parallel_sort.h>
 
-#include <memory>
-#include <utility>
-
 namespace osrm::util
 {
 
diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp
index 08baa6e0923..22a234419fe 100644
--- a/include/util/packed_vector.hpp
+++ b/include/util/packed_vector.hpp
@@ -13,7 +13,6 @@
 
 #include <array>
 #include <cmath>
-#include <vector>
 
 #if defined(_MSC_VER)
 // for `InterlockedCompareExchange64`
diff --git a/include/util/percent.hpp b/include/util/percent.hpp
index 0285f40dfb4..173e3b657bf 100644
--- a/include/util/percent.hpp
+++ b/include/util/percent.hpp
@@ -2,7 +2,6 @@
 #define PERCENT_HPP
 
 #include <atomic>
-#include <iostream>
 
 #include "util/isatty.hpp"
 #include "util/log.hpp"
diff --git a/include/util/permutation.hpp b/include/util/permutation.hpp
index 34520389ad2..ac9cf127bea 100644
--- a/include/util/permutation.hpp
+++ b/include/util/permutation.hpp
@@ -3,6 +3,8 @@
 
 #include "util/integer_range.hpp"
 
+#include <boost/assert.hpp>
+
 #include <vector>
 
 namespace osrm::util
diff --git a/include/util/query_heap.hpp b/include/util/query_heap.hpp
index 22d9fc8c6f9..72b9e4b8860 100644
--- a/include/util/query_heap.hpp
+++ b/include/util/query_heap.hpp
@@ -6,10 +6,7 @@
 
 #include "d_ary_heap.hpp"
 #include <algorithm>
-#include <cstdint>
-#include <cstdlib>
 #include <limits>
-#include <map>
 #include <optional>
 #include <unordered_map>
 #include <vector>
diff --git a/include/util/range_table.hpp b/include/util/range_table.hpp
index 2808f6c1854..2c4c3d59c50 100644
--- a/include/util/range_table.hpp
+++ b/include/util/range_table.hpp
@@ -7,7 +7,6 @@
 #include "util/vector_view.hpp"
 
 #include <array>
-#include <fstream>
 #include <utility>
 
 namespace osrm::util
diff --git a/include/util/rectangle.hpp b/include/util/rectangle.hpp
index aca19244651..5ab3912b2af 100644
--- a/include/util/rectangle.hpp
+++ b/include/util/rectangle.hpp
@@ -6,7 +6,6 @@
 #include <boost/assert.hpp>
 
 #include <limits>
-#include <utility>
 
 #include <cstdint>
 
diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp
index c010471ea37..524f5dc983e 100644
--- a/include/util/static_graph.hpp
+++ b/include/util/static_graph.hpp
@@ -14,7 +14,6 @@
 #include <boost/assert.hpp>
 
 #include <algorithm>
-#include <limits>
 #include <type_traits>
 #include <utility>
 #include <vector>
diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp
index bbb12efa561..2678d1dd7b7 100644
--- a/include/util/static_rtree.hpp
+++ b/include/util/static_rtree.hpp
@@ -20,7 +20,6 @@
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/assert.hpp>
-#include <boost/format.hpp>
 #include <boost/iostreams/device/mapped_file.hpp>
 
 #include <tbb/blocked_range.h>
@@ -28,10 +27,8 @@
 #include <tbb/parallel_sort.h>
 
 #include <algorithm>
-#include <array>
 #include <filesystem>
 #include <limits>
-#include <memory>
 #include <queue>
 #include <string>
 #include <vector>
diff --git a/include/util/std_hash.hpp b/include/util/std_hash.hpp
index 4f64f940d7b..6bb4d5cd4a5 100644
--- a/include/util/std_hash.hpp
+++ b/include/util/std_hash.hpp
@@ -2,7 +2,6 @@
 #define STD_HASH_HPP
 
 #include <cstddef>
-#include <functional>
 #include <tuple>
 #include <utility>
 #include <vector>
diff --git a/include/util/string_util.hpp b/include/util/string_util.hpp
index 4e63511378c..45cb9885e62 100644
--- a/include/util/string_util.hpp
+++ b/include/util/string_util.hpp
@@ -4,9 +4,8 @@
 #include <array>
 #include <cctype>
 #include <cstddef>
-#include <random>
+#include <cstdint>
 #include <string>
-#include <vector>
 
 namespace osrm::util
 {
diff --git a/include/util/tarjan_scc.hpp b/include/util/tarjan_scc.hpp
index eb617026477..df1e89c73a5 100644
--- a/include/util/tarjan_scc.hpp
+++ b/include/util/tarjan_scc.hpp
@@ -14,11 +14,9 @@
 
 #include "osrm/coordinate.hpp"
 #include <boost/assert.hpp>
-#include <cstdint>
 
 #include <algorithm>
 #include <climits>
-#include <memory>
 #include <stack>
 #include <vector>
 
diff --git a/include/util/timed_histogram.hpp b/include/util/timed_histogram.hpp
index 9338154463c..e952d02b014 100644
--- a/include/util/timed_histogram.hpp
+++ b/include/util/timed_histogram.hpp
@@ -3,6 +3,8 @@
 
 #include "util/integer_range.hpp"
 
+#include <boost/assert.hpp>
+
 #include <algorithm>
 #include <atomic>
 #include <mutex>
diff --git a/include/util/timezones.hpp b/include/util/timezones.hpp
index e144662de7f..a7429f9d70c 100644
--- a/include/util/timezones.hpp
+++ b/include/util/timezones.hpp
@@ -8,7 +8,6 @@
 
 #include <rapidjson/document.h>
 
-#include <chrono>
 #include <filesystem>
 #include <optional>
 
diff --git a/include/util/timing_util.hpp b/include/util/timing_util.hpp
index fe074d70875..b54392d78f4 100644
--- a/include/util/timing_util.hpp
+++ b/include/util/timing_util.hpp
@@ -2,7 +2,6 @@
 #define TIMING_UTIL_HPP
 
 #include <chrono>
-#include <cstdint>
 
 namespace osrm::util
 {
diff --git a/include/util/vector_tile.hpp b/include/util/vector_tile.hpp
index 749d8550537..4d4fea6f39a 100644
--- a/include/util/vector_tile.hpp
+++ b/include/util/vector_tile.hpp
@@ -1,8 +1,6 @@
 #ifndef OSRM_UTIL_VECTOR_TILE_HPP
 #define OSRM_UTIL_VECTOR_TILE_HPP
 
-#include <cstdint>
-
 namespace osrm::util::vector_tile
 {
 // Vector tiles are 4096 virtual pixels on each side
diff --git a/include/util/viewport.hpp b/include/util/viewport.hpp
index 80598b870ba..210f0e69e17 100644
--- a/include/util/viewport.hpp
+++ b/include/util/viewport.hpp
@@ -4,10 +4,7 @@
 #include "util/coordinate.hpp"
 #include "util/web_mercator.hpp"
 
-#include <boost/assert.hpp>
-
 #include <cmath>
-#include <tuple>
 
 // Port of https://github.com/mapbox/geo-viewport
 
diff --git a/include/util/xor_fast_hash.hpp b/include/util/xor_fast_hash.hpp
index c90d2e7d635..a7fbf477ca7 100644
--- a/include/util/xor_fast_hash.hpp
+++ b/include/util/xor_fast_hash.hpp
@@ -8,7 +8,6 @@
 #include <iterator>
 #include <numeric>
 #include <random>
-#include <vector>
 
 #include <cstdint>
 
diff --git a/src/benchmarks/alias.cpp b/src/benchmarks/alias.cpp
index e847d3e0e5d..f8881f1b068 100644
--- a/src/benchmarks/alias.cpp
+++ b/src/benchmarks/alias.cpp
@@ -8,7 +8,6 @@
 #include <iostream>
 #include <numeric>
 #include <random>
-#include <string>
 #include <vector>
 
 using namespace osrm;
diff --git a/src/benchmarks/bench.cpp b/src/benchmarks/bench.cpp
index 86b263a6beb..4d7df06ba8c 100644
--- a/src/benchmarks/bench.cpp
+++ b/src/benchmarks/bench.cpp
@@ -17,7 +17,6 @@
 #include "osrm/status.hpp"
 
 #include "util/meminfo.hpp"
-#include <boost/assert.hpp>
 #include <boost/optional/optional.hpp>
 #include <cstdlib>
 #include <exception>
diff --git a/src/benchmarks/match.cpp b/src/benchmarks/match.cpp
index 2e917c7a99d..161e0905a7e 100644
--- a/src/benchmarks/match.cpp
+++ b/src/benchmarks/match.cpp
@@ -10,8 +10,6 @@
 #include "osrm/osrm.hpp"
 #include "osrm/status.hpp"
 
-#include <boost/assert.hpp>
-
 #include <cstdlib>
 #include <exception>
 #include <iostream>
diff --git a/src/benchmarks/packed_vector.cpp b/src/benchmarks/packed_vector.cpp
index 7049c185233..5f6747bb792 100644
--- a/src/benchmarks/packed_vector.cpp
+++ b/src/benchmarks/packed_vector.cpp
@@ -8,7 +8,6 @@
 #include <iostream>
 #include <numeric>
 #include <random>
-#include <string>
 #include <vector>
 
 using namespace osrm;
diff --git a/src/benchmarks/route.cpp b/src/benchmarks/route.cpp
index ada7a1d5e18..4e969fca10f 100644
--- a/src/benchmarks/route.cpp
+++ b/src/benchmarks/route.cpp
@@ -11,8 +11,6 @@
 #include "osrm/osrm.hpp"
 #include "osrm/status.hpp"
 
-#include <boost/assert.hpp>
-
 #include <boost/optional/optional.hpp>
 #include <cstdlib>
 #include <exception>
diff --git a/src/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp
index 8346b2e9b94..0001b485e3a 100644
--- a/src/benchmarks/static_rtree.cpp
+++ b/src/benchmarks/static_rtree.cpp
@@ -11,7 +11,6 @@
 #include "util/serialization.hpp"
 #include "util/timing_util.hpp"
 
-#include <fstream>
 #include <iostream>
 #include <random>
 
diff --git a/src/contractor/contractor.cpp b/src/contractor/contractor.cpp
index a0b430aa8c2..a88576f4958 100644
--- a/src/contractor/contractor.cpp
+++ b/src/contractor/contractor.cpp
@@ -26,14 +26,10 @@
 #include "util/typedefs.hpp"
 
 #include <algorithm>
-#include <bitset>
 #include <cstdint>
-#include <fstream>
 #include <iterator>
-#include <memory>
 #include <vector>
 
-#include <boost/assert.hpp>
 #include <tbb/global_control.h>
 
 namespace osrm::contractor
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index a17ea77994a..e362e584beb 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/engine/datafacade/mmap_memory_allocator.cpp b/src/engine/datafacade/mmap_memory_allocator.cpp
index 75482637b81..18096d28ace 100644
--- a/src/engine/datafacade/mmap_memory_allocator.cpp
+++ b/src/engine/datafacade/mmap_memory_allocator.cpp
@@ -8,8 +8,6 @@
 #include "util/log.hpp"
 #include "util/mmap_file.hpp"
 
-#include <boost/assert.hpp>
-
 namespace osrm::engine::datafacade
 {
 
diff --git a/src/engine/guidance/assemble_overview.cpp b/src/engine/guidance/assemble_overview.cpp
index 9ee7688656b..b87b1481bdf 100644
--- a/src/engine/guidance/assemble_overview.cpp
+++ b/src/engine/guidance/assemble_overview.cpp
@@ -5,8 +5,6 @@
 #include <iterator>
 #include <limits>
 #include <numeric>
-#include <tuple>
-#include <utility>
 #include <vector>
 
 namespace osrm::engine::guidance
diff --git a/src/engine/guidance/post_processing.cpp b/src/engine/guidance/post_processing.cpp
index 1e5f496d39c..d02de08eaef 100644
--- a/src/engine/guidance/post_processing.cpp
+++ b/src/engine/guidance/post_processing.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
-#include <limits>
 #include <utility>
 
 namespace osrm::engine::guidance
diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp
index 6fe8f669996..414032d1d26 100644
--- a/src/engine/plugins/match.cpp
+++ b/src/engine/plugins/match.cpp
@@ -11,8 +11,6 @@
 #include <cstdlib>
 
 #include <algorithm>
-#include <functional>
-#include <memory>
 #include <set>
 #include <vector>
 
diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp
index 64b1be8bf84..2683760afd2 100644
--- a/src/engine/plugins/trip.cpp
+++ b/src/engine/plugins/trip.cpp
@@ -9,7 +9,6 @@
 #include <boost/assert.hpp>
 
 #include <algorithm>
-#include <limits>
 #include <utility>
 #include <vector>
 
diff --git a/src/engine/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp
index 7435fed3fc5..9c015e4c3b2 100644
--- a/src/engine/polyline_compressor.cpp
+++ b/src/engine/polyline_compressor.cpp
@@ -1,7 +1,6 @@
 #include "engine/polyline_compressor.hpp"
 
 #include <algorithm>
-#include <boost/assert.hpp>
 #include <climits>
 #include <cmath>
 #include <cstddef>
diff --git a/src/engine/routing_algorithms/alternative_path_ch.cpp b/src/engine/routing_algorithms/alternative_path_ch.cpp
index 4110eb714c5..a5ee6b3bc9c 100644
--- a/src/engine/routing_algorithms/alternative_path_ch.cpp
+++ b/src/engine/routing_algorithms/alternative_path_ch.cpp
@@ -7,7 +7,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <memory>
 #include <unordered_set>
 #include <vector>
 
diff --git a/src/engine/routing_algorithms/alternative_path_mld.cpp b/src/engine/routing_algorithms/alternative_path_mld.cpp
index 9c0a579f527..696dc506d9e 100644
--- a/src/engine/routing_algorithms/alternative_path_mld.cpp
+++ b/src/engine/routing_algorithms/alternative_path_mld.cpp
@@ -7,7 +7,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <memory>
 #include <type_traits>
 #include <unordered_set>
 #include <utility>
diff --git a/src/engine/routing_algorithms/many_to_many_ch.cpp b/src/engine/routing_algorithms/many_to_many_ch.cpp
index b71b9f07234..8076f3d8acf 100644
--- a/src/engine/routing_algorithms/many_to_many_ch.cpp
+++ b/src/engine/routing_algorithms/many_to_many_ch.cpp
@@ -4,8 +4,6 @@
 #include <boost/assert.hpp>
 #include <ranges>
 
-#include <limits>
-#include <memory>
 #include <vector>
 
 namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/many_to_many_mld.cpp b/src/engine/routing_algorithms/many_to_many_mld.cpp
index 0e60ce6633b..5291ca14ff1 100644
--- a/src/engine/routing_algorithms/many_to_many_mld.cpp
+++ b/src/engine/routing_algorithms/many_to_many_mld.cpp
@@ -4,9 +4,6 @@
 #include <boost/assert.hpp>
 #include <ranges>
 
-#include <limits>
-#include <memory>
-#include <unordered_map>
 #include <vector>
 
 namespace osrm::engine::routing_algorithms
diff --git a/src/engine/routing_algorithms/map_matching.cpp b/src/engine/routing_algorithms/map_matching.cpp
index 45133551ef7..4f40c24c367 100644
--- a/src/engine/routing_algorithms/map_matching.cpp
+++ b/src/engine/routing_algorithms/map_matching.cpp
@@ -13,7 +13,6 @@
 #include <cstddef>
 #include <deque>
 #include <iomanip>
-#include <memory>
 #include <numeric>
 #include <utility>
 
diff --git a/src/extractor/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp
index ddfafcef4ba..c695bbf7843 100644
--- a/src/extractor/compressed_edge_container.cpp
+++ b/src/extractor/compressed_edge_container.cpp
@@ -5,10 +5,6 @@
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <limits>
-#include <string>
 
 namespace osrm::extractor
 {
diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp
index 624af1423ab..b5ab53e25c7 100644
--- a/src/extractor/edge_based_graph_factory.cpp
+++ b/src/extractor/edge_based_graph_factory.cpp
@@ -23,11 +23,9 @@
 
 #include <algorithm>
 #include <limits>
-#include <sstream>
 #include <string>
 #include <thread>
 #include <tuple>
-#include <unordered_map>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index eed6a3c43d6..9445c7c252b 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -22,10 +22,7 @@
 
 #include <tbb/parallel_sort.h>
 
-#include <chrono>
 #include <limits>
-#include <mutex>
-#include <sstream>
 
 namespace
 {
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
index c4394dbaa08..80b327e7179 100644
--- a/src/extractor/extractor.cpp
+++ b/src/extractor/extractor.cpp
@@ -47,14 +47,10 @@
 #include <tbb/parallel_pipeline.h>
 
 #include <algorithm>
-#include <atomic>
-#include <bitset>
-#include <chrono>
 #include <memory>
 #include <thread>
 #include <tuple>
 #include <type_traits>
-#include <unordered_map>
 #include <vector>
 
 namespace osrm::extractor
diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
index ea4744f0eab..5e47f15e3c6 100644
--- a/src/extractor/extractor_callbacks.cpp
+++ b/src/extractor/extractor_callbacks.cpp
@@ -20,7 +20,6 @@
 
 #include <limits>
 #include <string>
-#include <vector>
 
 #ifdef _MSC_VER
 namespace osrm
diff --git a/src/extractor/intersection/intersection.cpp b/src/extractor/intersection/intersection.cpp
index f48668aea89..a9f7add43ef 100644
--- a/src/extractor/intersection/intersection.cpp
+++ b/src/extractor/intersection/intersection.cpp
@@ -1,6 +1,5 @@
 #include "guidance/intersection.hpp"
 
-#include <limits>
 #include <string>
 
 #include <boost/range/adaptors.hpp>
diff --git a/src/extractor/restriction_graph.cpp b/src/extractor/restriction_graph.cpp
index 91b30f233cf..1a2b6ab898d 100644
--- a/src/extractor/restriction_graph.cpp
+++ b/src/extractor/restriction_graph.cpp
@@ -5,6 +5,8 @@
 #include "util/timing_util.hpp"
 #include <util/for_each_pair.hpp>
 
+#include <numeric>
+
 namespace osrm::extractor
 {
 
diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
index 8232f04768f..9aaf7977812 100644
--- a/src/extractor/scripting_environment_lua.cpp
+++ b/src/extractor/scripting_environment_lua.cpp
@@ -23,9 +23,6 @@
 
 #include <osmium/osm.hpp>
 
-#include <memory>
-#include <sstream>
-
 namespace sol
 {
 template <> struct is_container<osmium::Node> : std::false_type
diff --git a/src/extractor/turn_path_filter.cpp b/src/extractor/turn_path_filter.cpp
index 791837007b4..b341b33f0c4 100644
--- a/src/extractor/turn_path_filter.cpp
+++ b/src/extractor/turn_path_filter.cpp
@@ -5,7 +5,6 @@
 #include "util/typedefs.hpp"
 
 #include <algorithm>
-#include <boost/assert.hpp>
 
 namespace osrm::extractor
 {
diff --git a/src/extractor/way_restriction_map.cpp b/src/extractor/way_restriction_map.cpp
index 890d580317c..b7d257526d9 100644
--- a/src/extractor/way_restriction_map.cpp
+++ b/src/extractor/way_restriction_map.cpp
@@ -1,8 +1,5 @@
 #include "extractor/way_restriction_map.hpp"
 
-#include <tuple>
-#include <utility>
-
 namespace osrm::extractor
 {
 
diff --git a/src/guidance/turn_analysis.cpp b/src/guidance/turn_analysis.cpp
index 414b6fdd3a5..5e51a5cbe27 100644
--- a/src/guidance/turn_analysis.cpp
+++ b/src/guidance/turn_analysis.cpp
@@ -6,7 +6,6 @@
 #include "util/coordinate_calculation.hpp"
 
 #include <cstddef>
-#include <set>
 #include <unordered_set>
 #include <utility>
 
diff --git a/src/guidance/turn_classification.cpp b/src/guidance/turn_classification.cpp
index f6d26cfef10..15a4e3209f0 100644
--- a/src/guidance/turn_classification.cpp
+++ b/src/guidance/turn_classification.cpp
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <cstdint>
 
 namespace osrm::guidance
 {
diff --git a/src/guidance/turn_lane_handler.cpp b/src/guidance/turn_lane_handler.cpp
index 9b9bcbace54..19d246bc24e 100644
--- a/src/guidance/turn_lane_handler.cpp
+++ b/src/guidance/turn_lane_handler.cpp
@@ -9,7 +9,6 @@
 #include "util/typedefs.hpp"
 
 #include <cstddef>
-#include <cstdint>
 
 #include <boost/numeric/conversion/cast.hpp>
 
diff --git a/src/guidance/turn_lane_matcher.cpp b/src/guidance/turn_lane_matcher.cpp
index 31bc1df57dc..e47086ae6da 100644
--- a/src/guidance/turn_lane_matcher.cpp
+++ b/src/guidance/turn_lane_matcher.cpp
@@ -4,8 +4,6 @@
 #include <boost/assert.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <functional>
-
 using osrm::util::angularDeviation;
 
 namespace osrm::guidance::lanes
diff --git a/src/nodejs/node_osrm.cpp b/src/nodejs/node_osrm.cpp
index 5971fec1c3b..f8cd7e4756f 100644
--- a/src/nodejs/node_osrm.cpp
+++ b/src/nodejs/node_osrm.cpp
@@ -1,5 +1,3 @@
-
-
 #include "osrm/engine_config.hpp"
 #include "osrm/osrm.hpp"
 
@@ -10,10 +8,7 @@
 #include "osrm/tile_parameters.hpp"
 #include "osrm/trip_parameters.hpp"
 
-#include <exception>
 #include <napi.h>
-#include <sstream>
-#include <stdexcept>
 #include <type_traits>
 #include <utility>
 
diff --git a/src/osrm/osrm.cpp b/src/osrm/osrm.cpp
index 7f0ab103445..3596c06cb48 100644
--- a/src/osrm/osrm.cpp
+++ b/src/osrm/osrm.cpp
@@ -12,8 +12,6 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-#include <memory>
-
 namespace osrm
 {
 
diff --git a/src/partitioner/dinic_max_flow.cpp b/src/partitioner/dinic_max_flow.cpp
index 4038e4b252c..974478f999c 100644
--- a/src/partitioner/dinic_max_flow.cpp
+++ b/src/partitioner/dinic_max_flow.cpp
@@ -5,7 +5,6 @@
 #include <limits>
 #include <numeric>
 #include <queue>
-#include <set>
 #include <stack>
 
 namespace osrm::partitioner
diff --git a/src/partitioner/inertial_flow.cpp b/src/partitioner/inertial_flow.cpp
index 04805faaa54..407d767b52f 100644
--- a/src/partitioner/inertial_flow.cpp
+++ b/src/partitioner/inertial_flow.cpp
@@ -8,8 +8,6 @@
 #include <cstddef>
 #include <iterator>
 #include <mutex>
-#include <set>
-#include <tuple>
 #include <unordered_set>
 #include <utility>
 #include <vector>
diff --git a/src/partitioner/recursive_bisection.cpp b/src/partitioner/recursive_bisection.cpp
index 63b3a39fdb5..5de66b263a8 100644
--- a/src/partitioner/recursive_bisection.cpp
+++ b/src/partitioner/recursive_bisection.cpp
@@ -13,7 +13,6 @@
 #include <climits> // for CHAR_BIT
 #include <cstddef>
 #include <iterator>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
diff --git a/src/server/request_parser.cpp b/src/server/request_parser.cpp
index fa953febf7c..5d544062866 100644
--- a/src/server/request_parser.cpp
+++ b/src/server/request_parser.cpp
@@ -6,8 +6,6 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <string>
-
 namespace osrm::server
 {
 
diff --git a/src/server/service/match_service.cpp b/src/server/service/match_service.cpp
index 22b48245462..7b16853f43e 100644
--- a/src/server/service/match_service.cpp
+++ b/src/server/service/match_service.cpp
@@ -6,8 +6,6 @@
 
 #include "util/json_container.hpp"
 
-#include <boost/format.hpp>
-
 namespace osrm::server::service
 {
 namespace
diff --git a/src/server/service/nearest_service.cpp b/src/server/service/nearest_service.cpp
index 8eb0d1ea037..6ab85c75d8a 100644
--- a/src/server/service/nearest_service.cpp
+++ b/src/server/service/nearest_service.cpp
@@ -6,8 +6,6 @@
 
 #include "util/json_container.hpp"
 
-#include <boost/format.hpp>
-
 namespace osrm::server::service
 {
 
diff --git a/src/server/service/tile_service.cpp b/src/server/service/tile_service.cpp
index ba256cdc668..64512754ea2 100644
--- a/src/server/service/tile_service.cpp
+++ b/src/server/service/tile_service.cpp
@@ -6,8 +6,6 @@
 
 #include "util/json_container.hpp"
 
-#include <boost/format.hpp>
-
 namespace osrm::server::service
 {
 
diff --git a/src/server/service/trip_service.cpp b/src/server/service/trip_service.cpp
index 633a8b606f3..b7ff952a0b8 100644
--- a/src/server/service/trip_service.cpp
+++ b/src/server/service/trip_service.cpp
@@ -6,8 +6,6 @@
 
 #include "util/json_container.hpp"
 
-#include <boost/format.hpp>
-
 namespace osrm::server::service
 {
 namespace
diff --git a/src/server/service_handler.cpp b/src/server/service_handler.cpp
index d7ee9112692..1dd6894ab09 100644
--- a/src/server/service_handler.cpp
+++ b/src/server/service_handler.cpp
@@ -10,8 +10,6 @@
 #include "server/api/parsed_url.hpp"
 #include "util/json_util.hpp"
 
-#include <memory>
-
 namespace osrm::server
 {
 ServiceHandler::ServiceHandler(osrm::EngineConfig &config) : routing_machine(config)
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index 1f55a3afa14..ae1004b17d9 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -20,7 +20,6 @@
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
-#include <memory>
 #include <ostream>
 #include <string>
 #include <vector>
diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp
index e0b0a830b91..f8abdcaedaa 100644
--- a/src/tools/contract.cpp
+++ b/src/tools/contract.cpp
@@ -10,10 +10,8 @@
 #include <boost/program_options/errors.hpp>
 
 #include <cstdlib>
-#include <exception>
 #include <filesystem>
 #include <new>
-#include <ostream>
 #include <thread>
 
 #include "util/meminfo.hpp"
diff --git a/src/tools/extract.cpp b/src/tools/extract.cpp
index c39ecdc2a8c..1377c77da1f 100644
--- a/src/tools/extract.cpp
+++ b/src/tools/extract.cpp
@@ -7,7 +7,6 @@
 
 #include <boost/program_options.hpp>
 #include <cstdlib>
-#include <exception>
 #include <filesystem>
 #include <iostream>
 #include <new>
diff --git a/src/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp
index 966ab9879aa..507d64dc2c6 100644
--- a/src/tools/io-benchmark.cpp
+++ b/src/tools/io-benchmark.cpp
@@ -11,7 +11,6 @@
 #endif
 
 #include <algorithm>
-#include <chrono>
 #include <filesystem>
 #include <fstream>
 #include <iomanip>
diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp
index 1fd8212b0b1..3a08db577e3 100644
--- a/src/updater/updater.cpp
+++ b/src/updater/updater.cpp
@@ -35,9 +35,7 @@
 
 #include <algorithm>
 #include <atomic>
-#include <bitset>
 #include <cstdint>
-#include <fstream>
 #include <iterator>
 #include <memory>
 #include <tuple>
diff --git a/src/util/assert.cpp b/src/util/assert.cpp
index f8a9cc2e6dd..07aea522d5a 100644
--- a/src/util/assert.cpp
+++ b/src/util/assert.cpp
@@ -1,6 +1,3 @@
-#include <boost/assert.hpp>
-
-#include <exception>
 #include <iostream>
 #include <thread>
 
diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp
index 2e43d2abdae..19fbc2d0eb3 100644
--- a/src/util/coordinate_calculation.cpp
+++ b/src/util/coordinate_calculation.cpp
@@ -10,7 +10,6 @@
 #include <iterator>
 #include <limits>
 #include <optional>
-#include <utility>
 
 namespace osrm::util::coordinate_calculation
 {
diff --git a/src/util/fingerprint.cpp b/src/util/fingerprint.cpp
index caaa85f524c..50e0f973acc 100644
--- a/src/util/fingerprint.cpp
+++ b/src/util/fingerprint.cpp
@@ -3,13 +3,11 @@
 #include "util/exception_utils.hpp"
 #include "util/version.hpp"
 
-#include <boost/assert.hpp>
 #include <boost/crc.hpp>
 
 #include <cstring>
 
 #include <algorithm>
-#include <string>
 
 namespace osrm::util
 {
diff --git a/src/util/timezones.cpp b/src/util/timezones.cpp
index 3352cfaf093..ff1d7dbcaa2 100644
--- a/src/util/timezones.cpp
+++ b/src/util/timezones.cpp
@@ -10,7 +10,6 @@
 #include <filesystem>
 #include <fstream>
 #include <optional>
-#include <regex>
 #include <string>
 #include <unordered_map>
 
diff --git a/unit_tests/engine/base64.cpp b/unit_tests/engine/base64.cpp
index 60e5d73ca7d..40f5d8651e5 100644
--- a/unit_tests/engine/base64.cpp
+++ b/unit_tests/engine/base64.cpp
@@ -5,7 +5,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
-#include <iostream>
 
 // RFC 4648 "The Base16, Base32, and Base64 Data Encodings"
 BOOST_AUTO_TEST_SUITE(base64)
diff --git a/unit_tests/engine/tidy.cpp b/unit_tests/engine/tidy.cpp
index 518b9920600..018a9c3674d 100644
--- a/unit_tests/engine/tidy.cpp
+++ b/unit_tests/engine/tidy.cpp
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <vector>
 
 BOOST_AUTO_TEST_SUITE(tidy_test)
 
diff --git a/unit_tests/extractor/location_dependent_data_tests.cpp b/unit_tests/extractor/location_dependent_data_tests.cpp
index d70a48bbdb1..eea6c9cecde 100644
--- a/unit_tests/extractor/location_dependent_data_tests.cpp
+++ b/unit_tests/extractor/location_dependent_data_tests.cpp
@@ -8,8 +8,6 @@
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
-#include <random>
-#include <vector>
 
 BOOST_AUTO_TEST_SUITE(location_dependent_data_tests)
 
diff --git a/unit_tests/extractor/name_table.cpp b/unit_tests/extractor/name_table.cpp
index c4ebd0ac523..400486978e1 100644
--- a/unit_tests/extractor/name_table.cpp
+++ b/unit_tests/extractor/name_table.cpp
@@ -7,8 +7,6 @@
 
 #include <filesystem>
 #include <iomanip>
-#include <iostream>
-#include <sstream>
 #include <typeinfo>
 #include <vector>
 
diff --git a/unit_tests/partitioner/multi_level_graph.cpp b/unit_tests/partitioner/multi_level_graph.cpp
index 05a988440a0..26cecc6f24f 100644
--- a/unit_tests/partitioner/multi_level_graph.cpp
+++ b/unit_tests/partitioner/multi_level_graph.cpp
@@ -6,7 +6,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
-#include <random>
 #include <vector>
 
 using namespace osrm;
diff --git a/unit_tests/partitioner/reorder_first_last.cpp b/unit_tests/partitioner/reorder_first_last.cpp
index 8283f05063b..0a432104b50 100644
--- a/unit_tests/partitioner/reorder_first_last.cpp
+++ b/unit_tests/partitioner/reorder_first_last.cpp
@@ -3,9 +3,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
-#include <utility>
 #include <vector>
 
 using namespace osrm::partitioner;
diff --git a/unit_tests/server/url_parser.cpp b/unit_tests/server/url_parser.cpp
index 5f8af8680e5..776823174b6 100644
--- a/unit_tests/server/url_parser.cpp
+++ b/unit_tests/server/url_parser.cpp
@@ -1,7 +1,5 @@
 #include "server/api/url_parser.hpp"
 
-#include <fstream>
-
 // needed for BOOST_CHECK_EQUAL
 namespace osrm::server::api
 {
diff --git a/unit_tests/util/indexed_data.cpp b/unit_tests/util/indexed_data.cpp
index d7deb61c927..8bcf4a9cc4c 100644
--- a/unit_tests/util/indexed_data.cpp
+++ b/unit_tests/util/indexed_data.cpp
@@ -5,8 +5,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <iomanip>
-#include <iostream>
-#include <sstream>
 #include <typeinfo>
 #include <vector>
 
diff --git a/unit_tests/util/io.cpp b/unit_tests/util/io.cpp
index d9f86d0e7f5..345391fcf0d 100644
--- a/unit_tests/util/io.cpp
+++ b/unit_tests/util/io.cpp
@@ -7,7 +7,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <exception>
 #include <numeric>
 #include <string>
 
diff --git a/unit_tests/util/json_render.cpp b/unit_tests/util/json_render.cpp
index 4d2ce23cfa9..fc830b54526 100644
--- a/unit_tests/util/json_render.cpp
+++ b/unit_tests/util/json_render.cpp
@@ -3,8 +3,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <iostream>
-
 BOOST_AUTO_TEST_SUITE(json_renderer)
 
 using namespace osrm::util::json;
diff --git a/unit_tests/util/permutation.cpp b/unit_tests/util/permutation.cpp
index 5efca65c314..23e7744b014 100644
--- a/unit_tests/util/permutation.cpp
+++ b/unit_tests/util/permutation.cpp
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <numeric>
-#include <random>
 
 BOOST_AUTO_TEST_SUITE(permutation_test)
 
diff --git a/unit_tests/util/static_rtree.cpp b/unit_tests/util/static_rtree.cpp
index 06c75343215..2c78e07ad49 100644
--- a/unit_tests/util/static_rtree.cpp
+++ b/unit_tests/util/static_rtree.cpp
@@ -17,7 +17,6 @@
 #include <cstdint>
 
 #include <algorithm>
-#include <memory>
 #include <random>
 #include <string>
 #include <unordered_set>
diff --git a/unit_tests/util/viewport.cpp b/unit_tests/util/viewport.cpp
index 70a2003afd8..261114cb55b 100644
--- a/unit_tests/util/viewport.cpp
+++ b/unit_tests/util/viewport.cpp
@@ -4,8 +4,6 @@ using namespace osrm::util;
 
 #include <boost/test/unit_test.hpp>
 
-#include <iostream>
-
 BOOST_AUTO_TEST_SUITE(viewport_test)
 
 using namespace osrm;