refactor: revise includes based on include-what-you-use recommendations

pageldev · pageldev · commit 2336d7caf565 · 2025-10-11T06:56:54.000Z
diff --git a/include/Junction.h b/include/Junction.h
@@ -2,7 +2,6 @@
 #include "Utils.hpp"
 #include "XmlNode.h"
 
-#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <map>
diff --git a/include/Lane.h b/include/Lane.h
@@ -6,10 +6,10 @@
 #include <cstddef>
 #include <functional>
 #include <map>
-#include <memory>
 #include <ostream>
 #include <set>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace odr
diff --git a/include/RefLine.h b/include/RefLine.h
@@ -6,7 +6,6 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <string>
 
 namespace odr
 {
diff --git a/include/Road.h b/include/Road.h
@@ -8,9 +8,10 @@
 #include "RoadSignal.h"
 #include "XmlNode.h"
 
-#include <cstddef>
 #include <map>
 #include <set>
+#include <stdint.h>
+#include <string>
 #include <vector>
 
 namespace odr
diff --git a/include/RoadNetworkMesh.h b/include/RoadNetworkMesh.h
@@ -2,12 +2,14 @@
 #include "Mesh.h"
 
 #include <array>
+#include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
 namespace odr
 {
+
 struct RoadsMesh : public Mesh3D
 {
     RoadsMesh() = default;
diff --git a/include/RoutingGraph.h b/include/RoutingGraph.h
@@ -1,9 +1,11 @@
 #pragma once
 #include "Lane.h"
 
+#include <algorithm>
 #include <cstddef>
 #include <functional>
-#include <memory>
+#include <string>
+#include <string_view>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
diff --git a/src/Geometries/CubicSpline.cpp b/src/Geometries/CubicSpline.cpp
@@ -10,12 +10,12 @@
 #include <set>
 #include <stdexcept>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
 namespace odr
 {
+
 Poly3::Poly3(double s0, double a, double b, double c, double d)
 {
     /* ds = s - s0 => resolve to polynomial form */
diff --git a/src/Lane.cpp b/src/Lane.cpp
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <type_traits>
 
 namespace odr
 {
diff --git a/src/Mesh.cpp b/src/Mesh.cpp
@@ -1,12 +1,13 @@
 #include "Mesh.h"
 
-#include <array>
+#include <algorithm>
 #include <cstddef>
 #include <sstream>
 #include <string>
 
 namespace odr
 {
+
 void Mesh3D::add_mesh(const Mesh3D& other)
 {
     const std::size_t idx_offset = this->vertices.size();
diff --git a/src/OpenDriveMap.cpp b/src/OpenDriveMap.cpp
@@ -19,21 +19,22 @@
 #include "Utils.hpp"
 
 #include <algorithm>
+#include <cctype>
 #include <climits>
 #include <cmath>
+#include <cstddef>
 #include <iterator>
 #include <memory>
 #include <optional>
 #include <set>
 #include <stdexcept>
-#include <stdio.h>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
 namespace odr
 {
+
 std::vector<LaneValidityRecord> extract_lane_validity_records(const pugi::xml_node& xml_node)
 {
     std::vector<LaneValidityRecord> lane_validities;
diff --git a/src/RefLine.cpp b/src/RefLine.cpp
@@ -1,18 +1,18 @@
 #include "RefLine.h"
-#include "Geometries/RoadGeometry.h"
 #include "Math.hpp"
 #include "Utils.hpp"
 
+#include <algorithm>
 #include <cmath>
 #include <functional>
 #include <iterator>
 #include <stdexcept>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
 namespace odr
 {
+
 RefLine::RefLine(double length) : length(length) {}
 
 RefLine::RefLine(const RefLine& other) : length(other.length), elevation_profile(other.elevation_profile)
diff --git a/src/Road.cpp b/src/Road.cpp
@@ -1,11 +1,12 @@
 #include "Road.h"
+#include "Fmt.hpp"
 #include "Lane.h"
-#include "Log.hpp"
 #include "RefLine.h"
 #include "RoadMark.h"
 #include "Utils.hpp"
 
 #include "earcut.hpp"
+#include "pugixml.hpp"
 
 #include <algorithm>
 #include <array>
@@ -14,13 +15,12 @@
 #include <cstdint>
 #include <iterator>
 #include <limits>
-#include <sstream>
 #include <stdexcept>
-#include <type_traits>
 #include <utility>
 
 namespace odr
 {
+
 double Crossfall::get_crossfall(const double s, const bool on_left_side) const
 {
     if (this->s0_to_poly.size() > 0)
diff --git a/src/RoadNetworkMesh.cpp b/src/RoadNetworkMesh.cpp
@@ -1,8 +1,12 @@
 #include "RoadNetworkMesh.h"
 #include "Utils.hpp"
 
+#include <algorithm>
+#include <iterator>
+
 namespace odr
 {
+
 template<typename T>
 std::vector<size_t> get_outline_indices(const std::map<size_t, T>& start_indices, const std::size_t num_vertices)
 {
diff --git a/src/RoadObject.cpp b/src/RoadObject.cpp
@@ -1,5 +1,6 @@
 #include "RoadObject.h"
 
+#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstddef>
diff --git a/src/RoadSignal.cpp b/src/RoadSignal.cpp
@@ -1,7 +1,12 @@
 #include "RoadSignal.h"
+#include "Math.hpp"
+
+#include <algorithm>
+#include <cstdint>
 
 namespace odr
 {
+
 RoadSignal::RoadSignal(std::string road_id,
                        std::string id,
                        std::string name,
diff --git a/src/RoutingGraph.cpp b/src/RoutingGraph.cpp
@@ -1,9 +1,11 @@
 #include "RoutingGraph.h"
+#include "Utils.hpp"
 
 #include <algorithm>
 #include <limits>
 #include <queue>
 #include <utility>
+
 namespace odr
 {
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`#include <map>`
`7`	`7`	`#include <memory>`
`8`	`8`	`#include <set>`
`9`		`-#include <string>`
`10`	`9`
`11`	`10`	`namespace odr`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,14 @@`
`2`	`2`	`#include "Mesh.h"`
`3`	`3`
`4`	`4`	`#include <array>`
	`5`	`+#include <cstddef>`
`5`	`6`	`#include <map>`
`6`	`7`	`#include <string>`
`7`	`8`	`#include <vector>`
`8`	`9`
`9`	`10`	`namespace odr`
`10`	`11`	`{`
	`12`	`+`
`11`	`13`	`struct RoadsMesh : public Mesh3D`
`12`	`14`	`{`
`13`	`15`	`RoadsMesh() = default;`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@`
`10`	`10`	`#include <set>`
`11`	`11`	`#include <stdexcept>`
`12`	`12`	`#include <string>`
`13`		`-#include <type_traits>`
`14`	`13`	`#include <utility>`
`15`	`14`	`#include <vector>`
`16`	`15`
`17`	`16`	`namespace odr`
`18`	`17`	`{`
	`18`	`+`
`19`	`19`	`Poly3::Poly3(double s0, double a, double b, double c, double d)`
`20`	`20`	`{`
`21`	`21`	`/* ds = s - s0 => resolve to polynomial form */`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`#include <algorithm>`
`5`	`5`	`#include <iterator>`
`6`		`-#include <type_traits>`
`7`	`6`
`8`	`7`	`namespace odr`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`#include "Mesh.h"`
`2`	`2`
`3`		`-#include <array>`
	`3`	`+#include <algorithm>`
`4`	`4`	`#include <cstddef>`
`5`	`5`	`#include <sstream>`
`6`	`6`	`#include <string>`
`7`	`7`
`8`	`8`	`namespace odr`
`9`	`9`	`{`
	`10`	`+`
`10`	`11`	`void Mesh3D::add_mesh(const Mesh3D& other)`
`11`	`12`	`{`
`12`	`13`	`const std::size_t idx_offset = this->vertices.size();`