From 8e1b93de3cc8aa510308d21f5c19642ea0eaff58 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 11:54:47 +0000
Subject: [PATCH] style(pre-commit): autofix

---
 .../bounding_box/bounding_box_common.hpp           | 12 ++++++------
 .../bounding_box/eigenbox_2d.hpp                   | 10 +++++-----
 .../autoware_auto_geometry/bounding_box/lfit.hpp   | 10 +++++-----
 .../bounding_box/rotating_calipers.hpp             | 14 +++++++-------
 .../autoware_auto_geometry/bounding_box_2d.hpp     |  6 +++---
 .../include/autoware_auto_geometry/common_2d.hpp   |  6 +++---
 .../include/autoware_auto_geometry/common_3d.hpp   |  6 +++---
 .../include/autoware_auto_geometry/convex_hull.hpp |  7 ++++---
 .../autoware_auto_geometry/hull_pockets.hpp        |  9 +++++----
 .../autoware_auto_geometry/intersection.hpp        | 12 ++++++------
 .../include/autoware_auto_geometry/interval.hpp    |  6 +++---
 .../autoware_auto_geometry/lookup_table.hpp        |  8 ++++----
 .../autoware_auto_geometry/spatial_hash.hpp        | 11 ++++++-----
 .../autoware_auto_geometry/spatial_hash_config.hpp | 11 ++++++-----
 .../autoware_auto_geometry/visibility_control.hpp  |  6 +++---
 common/autoware_auto_geometry/src/bounding_box.cpp |  5 +++--
 .../test/src/lookup_table.cpp                      |  3 ++-
 .../autoware_auto_geometry/test/src/test_area.cpp  |  4 ++--
 .../test/src/test_common_2d.cpp                    |  4 ++--
 .../test/src/test_intersection.cpp                 |  6 +++---
 20 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
index 98d718d660a30..e73daf6825664 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
@@ -17,11 +17,8 @@
 /// \file
 /// \brief Common functionality for bounding box computation algorithms
 
-#ifndef GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
-#define GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
-
-#include "autoware_auto_geometry/common_2d.hpp>
-#include "autoware_auto_geometry/visibility_control.hpp>
+#ifndef AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
 
 #include <autoware_auto_perception_msgs/msg/bounding_box.hpp>
 #include <autoware_auto_perception_msgs/msg/detected_object.hpp>
@@ -32,6 +29,9 @@
 #include <limits>
 #include <vector>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
+
 namespace autoware
 {
 namespace common
@@ -185,4 +185,4 @@ std::vector<geometry_msgs::msg::Point32> GEOMETRY_PUBLIC get_transformed_corners
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
index c864535ef8e06..1a57194b3b780 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
@@ -19,14 +19,14 @@
 ///        bounding box
 
 // cspell: ignore eigenbox, EIGENBOX
-#ifndef GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
-#define GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
-
-#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
+#ifndef AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
 
 #include <limits>
 #include <utility>
 
+#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
+
 namespace autoware
 {
 namespace common
@@ -244,4 +244,4 @@ BoundingBox eigenbox_2d(const IT begin, const IT end)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
index a7c6ac25aa2c8..d44e11d416ec4 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
@@ -20,14 +20,14 @@
 
 // cspell: ignore LFIT, lfit
 // LFIT means "L-Shape Fitting"
-#ifndef GEOMETRY__BOUNDING_BOX__LFIT_HPP_
-#define GEOMETRY__BOUNDING_BOX__LFIT_HPP_
-
-#include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
+#ifndef AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__LFIT_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__LFIT_HPP_
 
 #include <limits>
 #include <utility>
 
+#include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
+
 namespace autoware
 {
 namespace common
@@ -278,4 +278,4 @@ BoundingBox lfit_bounding_box_2d(const IT begin, const IT end)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__BOUNDING_BOX__LFIT_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__LFIT_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
index 7dd1e1d189bfe..5902c401d8456 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
@@ -17,17 +17,17 @@
 /// \file
 /// \brief This file implements the rotating calipers algorithm for minimum oriented bounding boxes
 
-#ifndef GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
-#define GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
-#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
-#include "autoware_auto_geometry/common_2d.hpp>
-#include "autoware_auto_geometry/convex_hull.hpp>
-
+#ifndef AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
 #include <algorithm>
 #include <cstring>
 #include <limits>
 #include <list>
 
+#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/convex_hull.hpp>
+
 namespace autoware
 {
 namespace common
@@ -277,4 +277,4 @@ BoundingBox minimum_perimeter_bounding_box(std::list<PointT> & list)
 }  // namespace geometry
 }  // namespace common
 }  // namespace autoware
-#endif  // GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
index 0408a0799d0d6..586f2b9994050 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
@@ -15,8 +15,8 @@
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 /// \file
 /// \brief Main header for user-facing bounding box algorithms: functions and types
-#ifndef GEOMETRY__BOUNDING_BOX_2D_HPP_
-#define GEOMETRY__BOUNDING_BOX_2D_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX_2D_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX_2D_HPP_
 
 #include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
 #include "autoware_auto_geometry/bounding_box/lfit.hpp>
@@ -31,4 +31,4 @@ namespace geometry
 }  // namespace geometry
 }  // namespace common
 }  // namespace autoware
-#endif  // GEOMETRY__BOUNDING_BOX_2D_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__BOUNDING_BOX_2D_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
index c111918735165..da7121bf4e9b5 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
@@ -16,8 +16,8 @@
 /// \file
 /// \brief This file includes common functionality for 2D geometry, such as dot products
 
-#ifndef GEOMETRY__COMMON_2D_HPP_
-#define GEOMETRY__COMMON_2D_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__COMMON_2D_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__COMMON_2D_HPP_
 
 #include "autoware_auto_geometry/interval.hpp"
 
@@ -584,4 +584,4 @@ bool is_point_inside_polygon_2d(
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__COMMON_2D_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__COMMON_2D_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
index 2e48d9e3d2692..8c9877228eb53 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
@@ -16,8 +16,8 @@
 /// \file
 /// \brief This file includes common functionality for 3D geometry, such as dot products
 
-#ifndef GEOMETRY__COMMON_3D_HPP_
-#define GEOMETRY__COMMON_3D_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__COMMON_3D_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__COMMON_3D_HPP_
 
 #include "autoware_auto_geometry/common_2d.hpp>
 
@@ -74,4 +74,4 @@ inline OUT distance_3d(const T1 & a, const T2 & b)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__COMMON_3D_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__COMMON_3D_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
index 3b36b4036d371..2b94e51d4fac6 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
@@ -18,10 +18,11 @@
 /// \brief This file implements the monotone chain algorithm to compute 2D convex hulls on linked
 ///        lists of points
 
-#ifndef GEOMETRY__CONVEX_HULL_HPP_
-#define GEOMETRY__CONVEX_HULL_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__CONVEX_HULL_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__CONVEX_HULL_HPP_
 
 #include <common/types.hpp>
+
 #include "autoware_auto_geometry/common_2d.hpp>
 
 // lint -e537 NOLINT pclint vs cpplint
@@ -191,4 +192,4 @@ typename std::list<PointT>::const_iterator convex_hull(std::list<PointT> & list)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__CONVEX_HULL_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__CONVEX_HULL_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
index d041096e95a71..6651092703fd2 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
@@ -18,11 +18,10 @@
 /// \brief This file implements an algorithm for getting a list of "pockets" in the convex
 ///        hull of a non-convex simple polygon.
 
-#ifndef GEOMETRY__HULL_POCKETS_HPP_
-#define GEOMETRY__HULL_POCKETS_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__HULL_POCKETS_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__HULL_POCKETS_HPP_
 
 #include <common/types.hpp>
-#include "autoware_auto_geometry/common_2d.hpp>
 
 #include <algorithm>
 #include <iterator>
@@ -30,6 +29,8 @@
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+
 using autoware::common::types::float32_t;
 
 namespace autoware
@@ -107,4 +108,4 @@ typename std::vector<std::vector<typename std::iterator_traits<Iter1>::value_typ
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__HULL_POCKETS_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__HULL_POCKETS_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
index b4c03639a1e6f..e831f5caa88bf 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
@@ -14,11 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef GEOMETRY__INTERSECTION_HPP_
-#define GEOMETRY__INTERSECTION_HPP_
-
-#include "autoware_auto_geometry/common_2d.hpp>
-#include "autoware_auto_geometry/convex_hull.hpp>
+#ifndef AUTOWARE_AUTO_GEOMETRY__INTERSECTION_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__INTERSECTION_HPP_
 
 #include <autoware_auto_perception_msgs/msg/bounding_box.hpp>
 #include <autoware_auto_planning_msgs/msg/trajectory_point.hpp>
@@ -32,6 +29,9 @@
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/convex_hull.hpp>
+
 namespace autoware
 {
 namespace common
@@ -309,4 +309,4 @@ common::types::float32_t convex_intersection_over_union_2d(
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__INTERSECTION_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__INTERSECTION_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp
index 59c26f27cc454..17e2789ac0325 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp
@@ -18,8 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#ifndef GEOMETRY__INTERVAL_HPP_
-#define GEOMETRY__INTERVAL_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__INTERVAL_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__INTERVAL_HPP_
 
 #include "common/types.hpp"
 #include "helper_functions/float_comparisons.hpp"
@@ -355,4 +355,4 @@ T Interval<T>::clamp_to(const Interval & i, T val)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__INTERVAL_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__INTERVAL_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
index 1206a5ffcce76..c689638aa2bd9 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
@@ -17,11 +17,11 @@
 /// \file
 /// \brief This file contains a 1D linear lookup table implementation
 
-#ifndef GEOMETRY__LOOKUP_TABLE_HPP_
-#define GEOMETRY__LOOKUP_TABLE_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__LOOKUP_TABLE_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__LOOKUP_TABLE_HPP_
 
-#include "common/types.hpp"
 #include "autoware_auto_geometry/interval.hpp"
+#include "common/types.hpp"
 
 #include <cmath>
 #include <stdexcept>
@@ -175,4 +175,4 @@ class LookupTable1D
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__LOOKUP_TABLE_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__LOOKUP_TABLE_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
index 8f9becad5130a..520f688497dd3 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
@@ -17,17 +17,18 @@
 /// \brief This file implements a spatial hash for efficient fixed-radius near neighbor queries in
 ///        2D
 
-#ifndef GEOMETRY__SPATIAL_HASH_HPP_
-#define GEOMETRY__SPATIAL_HASH_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_HPP_
 
 #include <common/types.hpp>
-#include "autoware_auto_geometry/spatial_hash_config.hpp>
-#include "autoware_auto_geometry/visibility_control.hpp>
 
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/spatial_hash_config.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
+
 using autoware::common::types::bool8_t;
 using autoware::common::types::float32_t;
 
@@ -328,4 +329,4 @@ using SpatialHash3d = SpatialHash<T, Config3d>;
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__SPATIAL_HASH_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
index c9e5b9668d0e6..e8f7d02b38121 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
@@ -17,14 +17,12 @@
 /// \brief This file implements a spatial hash for efficient fixed-radius near neighbor queries in
 ///        2D
 
-#ifndef GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
-#define GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
 
 #include "helper_functions/crtp.hpp"
 
 #include <common/types.hpp>
-#include "autoware_auto_geometry/common_2d.hpp>
-#include "autoware_auto_geometry/visibility_control.hpp>
 
 #include <algorithm>
 #include <cmath>
@@ -32,6 +30,9 @@
 #include <stdexcept>
 #include <utility>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
+
 using autoware::common::types::bool8_t;
 using autoware::common::types::float32_t;
 using autoware::common::types::float64_t;
@@ -447,4 +448,4 @@ class GEOMETRY_PUBLIC Config3d : public Config<Config3d>
 }  // namespace common
 }  // namespace autoware
 
-#endif  // GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__SPATIAL_HASH_CONFIG_HPP_
diff --git a/common/autoware_auto_geometry/include/autoware_auto_geometry/visibility_control.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/visibility_control.hpp
index 96efe9aa6e27b..8972246997997 100644
--- a/common/autoware_auto_geometry/include/autoware_auto_geometry/visibility_control.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/visibility_control.hpp
@@ -14,8 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef GEOMETRY__VISIBILITY_CONTROL_HPP_
-#define GEOMETRY__VISIBILITY_CONTROL_HPP_
+#ifndef AUTOWARE_AUTO_GEOMETRY__VISIBILITY_CONTROL_HPP_
+#define AUTOWARE_AUTO_GEOMETRY__VISIBILITY_CONTROL_HPP_
 
 ////////////////////////////////////////////////////////////////////////////////
 #if defined(__WIN32)
@@ -38,4 +38,4 @@
 #else  // defined(__linux__)
 #error "Unsupported Build Configuration"
 #endif  // defined(__WIN32)
-#endif  // GEOMETRY__VISIBILITY_CONTROL_HPP_
+#endif  // AUTOWARE_AUTO_GEOMETRY__VISIBILITY_CONTROL_HPP_
diff --git a/common/autoware_auto_geometry/src/bounding_box.cpp b/common/autoware_auto_geometry/src/bounding_box.cpp
index 23d50210f943b..1b65306a57939 100644
--- a/common/autoware_auto_geometry/src/bounding_box.cpp
+++ b/common/autoware_auto_geometry/src/bounding_box.cpp
@@ -15,13 +15,12 @@
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
 #include <autoware_auto_tf2/tf2_autoware_auto_msgs.hpp>
+
 #include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
 #include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
 // cspell: ignore eigenbox
 #include "autoware_auto_geometry/bounding_box/lfit.hpp>
 // cspell: ignore lfit
-#include "autoware_auto_geometry/bounding_box/rotating_calipers.hpp>
-
 #include <geometry_msgs/msg/point32.hpp>
 
 #include <algorithm>
@@ -30,6 +29,8 @@
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/bounding_box/rotating_calipers.hpp>
+
 namespace autoware
 {
 namespace common
diff --git a/common/autoware_auto_geometry/test/src/lookup_table.cpp b/common/autoware_auto_geometry/test/src/lookup_table.cpp
index 4bf11f5429bca..9a22186ee3c4c 100644
--- a/common/autoware_auto_geometry/test/src/lookup_table.cpp
+++ b/common/autoware_auto_geometry/test/src/lookup_table.cpp
@@ -14,9 +14,10 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <common/types.hpp>
 #include "autoware_auto_geometry/lookup_table.hpp>
 
+#include <common/types.hpp>
+
 #include <gtest/gtest.h>
 
 #include <memory>
diff --git a/common/autoware_auto_geometry/test/src/test_area.cpp b/common/autoware_auto_geometry/test/src/test_area.cpp
index 4010609d7956d..3019fc591683f 100644
--- a/common/autoware_auto_geometry/test/src/test_area.cpp
+++ b/common/autoware_auto_geometry/test/src/test_area.cpp
@@ -14,8 +14,6 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "autoware_auto_geometry/common_2d.hpp>
-
 #include <geometry_msgs/msg/point32.hpp>
 
 #include <gtest/gtest.h>
@@ -24,6 +22,8 @@
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+
 template <typename DataStructure>
 class AreaTest : public ::testing::Test
 {
diff --git a/common/autoware_auto_geometry/test/src/test_common_2d.cpp b/common/autoware_auto_geometry/test/src/test_common_2d.cpp
index e599d531ced4b..4c62757cb4f62 100644
--- a/common/autoware_auto_geometry/test/src/test_common_2d.cpp
+++ b/common/autoware_auto_geometry/test/src/test_common_2d.cpp
@@ -14,8 +14,6 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "autoware_auto_geometry/common_2d.hpp>
-
 #include <autoware_auto_perception_msgs/msg/point_clusters.hpp>
 #include <geometry_msgs/msg/point32.hpp>
 
@@ -24,6 +22,8 @@
 #include <utility>
 #include <vector>
 
+#include "autoware_auto_geometry/common_2d.hpp>
+
 using autoware::common::geometry::point_adapter::xr_;
 using autoware::common::geometry::point_adapter::yr_;
 
diff --git a/common/autoware_auto_geometry/test/src/test_intersection.cpp b/common/autoware_auto_geometry/test/src/test_intersection.cpp
index 7508cf6414f47..359ead8642197 100644
--- a/common/autoware_auto_geometry/test/src/test_intersection.cpp
+++ b/common/autoware_auto_geometry/test/src/test_intersection.cpp
@@ -14,13 +14,13 @@
 
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "autoware_auto_geometry/convex_hull.hpp>
-#include "autoware_auto_geometry/intersection.hpp>
-
 #include <gtest/gtest.h>
 
 #include <list>
 
+#include "autoware_auto_geometry/convex_hull.hpp>
+#include "autoware_auto_geometry/intersection.hpp>
+
 struct TestPoint
 {
   autoware::common::types::float32_t x;