Merge e45f708448 into c59ad69d6a

2025-02-10 21:01:04 +00:00 · 2025-02-10 21:01:04 +00:00 · f0358e9fe9
commit f0358e9fe9
parent c59ad69d6a e45f708448
187 changed files with 14 additions and 316 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -78,6 +78,7 @@
      - FIXED: Ensure required file check in osrm-routed is correctly enforced. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - FIXED: Correct HTTP docs to reflect summary output dependency on steps parameter. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
+      - 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)
--- 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
 {
--- 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
--- 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"
--- 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>
--- 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
 {
--- a/include/engine/base64.hpp
+++ b/include/engine/base64.hpp
@ -3,17 +3,13 @@

 #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>
-#include <boost/range/algorithm/copy.hpp>

 namespace osrm
 {
--- 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>
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@ -38,7 +38,6 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <utility>
 #include <vector>

 namespace osrm::engine::datafacade
--- 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
--- 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>

--- 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
 {
--- 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
--- 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
--- 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
--- 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
--- 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
 {
--- 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>

--- 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
 {

--- 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.
--- 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
--- 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
 {
--- 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>

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>

--- 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
--- 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
 {
--- 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>

--- 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
 {

--- 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>

--- 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
 {
--- 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
--- 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>

--- 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>

--- 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
--- 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
 {
--- 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>

--- a/include/extractor/node_restriction_map.hpp
+++ b/include/extractor/node_restriction_map.hpp
@ -7,10 +7,6 @@

 #include <boost/range/adaptor/filtered.hpp>

-#include <unordered_map>
-#include <utility>
-#include <vector>
-
 namespace osrm::extractor
 {

--- 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
--- 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>

--- 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
 {
--- 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"
--- 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>
--- a/include/extractor/segment_data_container.hpp
+++ b/include/extractor/segment_data_container.hpp
@ -11,10 +11,7 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/iterator_range.hpp>

-#include <filesystem>
 #include <string>
-#include <unordered_map>
-#include <vector>

 namespace osrm::extractor
 {
--- 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
 {

--- 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
--- 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>

--- 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
--- 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>
--- 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
--- 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
 {

--- 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
--- 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
--- 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>

--- 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
 {

--- 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>
--- 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
 {

--- a/include/partitioner/bisection_graph_view.hpp
+++ b/include/partitioner/bisection_graph_view.hpp
@ -8,7 +8,6 @@
 #include <boost/range/iterator_range.hpp>

 #include <cstddef>
-#include <cstdint>

 namespace osrm::partitioner
 {
--- 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
--- 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
 {
--- 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
--- 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>

--- 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"

--- 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
 {
--- 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
--- 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
 {

--- 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>
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- a/include/storage/serialization.hpp
+++ b/include/storage/serialization.hpp
@ -15,7 +15,6 @@

 #include <cmath>
 #include <cstdint>
-#include <tuple>

 namespace osrm::storage::serialization
 {
--- 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>
--- 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>
--- 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
--- 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
--- 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
--- 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>

--- 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>

--- 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"

--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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>

--- 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
 {

--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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
 {
--- 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
 {

--- a/Show More
+++ b/Show More