Project-OSRM · DennisOSRM · Feb 22, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 21, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,8 +3,6 @@
 
 #include "util/typedefs.hpp"
 
-#include <limits>
-#include <string>
 #include <vector>
 
 namespace osrm::extractor
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,6 @@ @@
     #include "util/json_util.hpp"
-    #include <vector>
     namespace osrm::engine::plugins
     {
@@ Expand Down @@