From 7d3b5e1be99181c9f9229518bb22935f627b9781 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve.fernandez@tier4.jp>
Date: Fri, 22 Dec 2023 12:51:29 +0100
Subject: [PATCH] fix(autoware_auto_geometry): move headers to a separate
 directory

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
---
 common/autoware_auto_geometry/design/interval.md          | 2 +-
 .../bounding_box/bounding_box_common.hpp                  | 4 ++--
 .../bounding_box/eigenbox_2d.hpp                          | 2 +-
 .../bounding_box/lfit.hpp                                 | 2 +-
 .../bounding_box/rotating_calipers.hpp                    | 6 +++---
 .../bounding_box_2d.hpp                                   | 6 +++---
 .../{geometry => autoware_auto_geometry}/common_2d.hpp    | 2 +-
 .../{geometry => autoware_auto_geometry}/common_3d.hpp    | 2 +-
 .../{geometry => autoware_auto_geometry}/convex_hull.hpp  | 2 +-
 .../{geometry => autoware_auto_geometry}/hull_pockets.hpp | 2 +-
 .../{geometry => autoware_auto_geometry}/intersection.hpp | 4 ++--
 .../{geometry => autoware_auto_geometry}/interval.hpp     | 0
 .../{geometry => autoware_auto_geometry}/lookup_table.hpp | 2 +-
 .../{geometry => autoware_auto_geometry}/spatial_hash.hpp | 4 ++--
 .../spatial_hash_config.hpp                               | 4 ++--
 .../visibility_control.hpp                                | 0
 common/autoware_auto_geometry/src/bounding_box.cpp        | 8 ++++----
 common/autoware_auto_geometry/src/spatial_hash.cpp        | 2 +-
 .../test/include/test_bounding_box.hpp                    | 4 ++--
 .../test/include/test_spatial_hash.hpp                    | 2 +-
 common/autoware_auto_geometry/test/src/lookup_table.cpp   | 2 +-
 common/autoware_auto_geometry/test/src/test_area.cpp      | 2 +-
 common/autoware_auto_geometry/test/src/test_common_2d.cpp | 2 +-
 .../autoware_auto_geometry/test/src/test_convex_hull.cpp  | 2 +-
 .../autoware_auto_geometry/test/src/test_hull_pockets.cpp | 4 ++--
 .../autoware_auto_geometry/test/src/test_intersection.cpp | 4 ++--
 common/autoware_auto_geometry/test/src/test_interval.cpp  | 2 +-
 27 files changed, 39 insertions(+), 39 deletions(-)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/bounding_box/bounding_box_common.hpp (98%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/bounding_box/eigenbox_2d.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/bounding_box/lfit.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/bounding_box/rotating_calipers.hpp (98%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/bounding_box_2d.hpp (84%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/common_2d.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/common_3d.hpp (98%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/convex_hull.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/hull_pockets.hpp (98%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/intersection.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/interval.hpp (100%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/lookup_table.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/spatial_hash.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/spatial_hash_config.hpp (99%)
 rename common/autoware_auto_geometry/include/{geometry => autoware_auto_geometry}/visibility_control.hpp (100%)

diff --git a/common/autoware_auto_geometry/design/interval.md b/common/autoware_auto_geometry/design/interval.md
index 26260ba8d8e67..4fe65ff8e0310 100644
--- a/common/autoware_auto_geometry/design/interval.md
+++ b/common/autoware_auto_geometry/design/interval.md
@@ -39,7 +39,7 @@ See 'Example Usage' below.
 ## Example Usage
 
 ```c++
-#include "geometry/interval.hpp"
+#include "autoware_auto_geometry/interval.hpp"
 
 #include <iostream>
 
diff --git a/common/autoware_auto_geometry/include/geometry/bounding_box/bounding_box_common.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
similarity index 98%
rename from common/autoware_auto_geometry/include/geometry/bounding_box/bounding_box_common.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
index d1dee63f73b56..98d718d660a30 100644
--- a/common/autoware_auto_geometry/include/geometry/bounding_box/bounding_box_common.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/bounding_box_common.hpp
@@ -20,8 +20,8 @@
 #ifndef GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
 #define GEOMETRY__BOUNDING_BOX__BOUNDING_BOX_COMMON_HPP_
 
-#include <geometry/common_2d.hpp>
-#include <geometry/visibility_control.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
 
 #include <autoware_auto_perception_msgs/msg/bounding_box.hpp>
 #include <autoware_auto_perception_msgs/msg/detected_object.hpp>
diff --git a/common/autoware_auto_geometry/include/geometry/bounding_box/eigenbox_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/bounding_box/eigenbox_2d.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
index f050628f32f25..c864535ef8e06 100644
--- a/common/autoware_auto_geometry/include/geometry/bounding_box/eigenbox_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/eigenbox_2d.hpp
@@ -22,7 +22,7 @@
 #ifndef GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
 #define GEOMETRY__BOUNDING_BOX__EIGENBOX_2D_HPP_
 
-#include <geometry/bounding_box/bounding_box_common.hpp>
+#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
 
 #include <limits>
 #include <utility>
diff --git a/common/autoware_auto_geometry/include/geometry/bounding_box/lfit.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/bounding_box/lfit.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
index 9b8991a7c7132..a7c6ac25aa2c8 100644
--- a/common/autoware_auto_geometry/include/geometry/bounding_box/lfit.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/lfit.hpp
@@ -23,7 +23,7 @@
 #ifndef GEOMETRY__BOUNDING_BOX__LFIT_HPP_
 #define GEOMETRY__BOUNDING_BOX__LFIT_HPP_
 
-#include <geometry/bounding_box/eigenbox_2d.hpp>
+#include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
 
 #include <limits>
 #include <utility>
diff --git a/common/autoware_auto_geometry/include/geometry/bounding_box/rotating_calipers.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
similarity index 98%
rename from common/autoware_auto_geometry/include/geometry/bounding_box/rotating_calipers.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
index 5bc05810bb1b0..7dd1e1d189bfe 100644
--- a/common/autoware_auto_geometry/include/geometry/bounding_box/rotating_calipers.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box/rotating_calipers.hpp
@@ -19,9 +19,9 @@
 
 #ifndef GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
 #define GEOMETRY__BOUNDING_BOX__ROTATING_CALIPERS_HPP_
-#include <geometry/bounding_box/bounding_box_common.hpp>
-#include <geometry/common_2d.hpp>
-#include <geometry/convex_hull.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>
 
 #include <algorithm>
 #include <cstring>
diff --git a/common/autoware_auto_geometry/include/geometry/bounding_box_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
similarity index 84%
rename from common/autoware_auto_geometry/include/geometry/bounding_box_2d.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
index d1d84122889c9..0408a0799d0d6 100644
--- a/common/autoware_auto_geometry/include/geometry/bounding_box_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/bounding_box_2d.hpp
@@ -18,9 +18,9 @@
 #ifndef GEOMETRY__BOUNDING_BOX_2D_HPP_
 #define GEOMETRY__BOUNDING_BOX_2D_HPP_
 
-#include <geometry/bounding_box/eigenbox_2d.hpp>
-#include <geometry/bounding_box/lfit.hpp>
-#include <geometry/bounding_box/rotating_calipers.hpp>
+#include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
+#include "autoware_auto_geometry/bounding_box/lfit.hpp>
+#include "autoware_auto_geometry/bounding_box/rotating_calipers.hpp>
 
 namespace autoware
 {
diff --git a/common/autoware_auto_geometry/include/geometry/common_2d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/common_2d.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
index fd045003521ea..c111918735165 100644
--- a/common/autoware_auto_geometry/include/geometry/common_2d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_2d.hpp
@@ -19,7 +19,7 @@
 #ifndef GEOMETRY__COMMON_2D_HPP_
 #define GEOMETRY__COMMON_2D_HPP_
 
-#include "geometry/interval.hpp"
+#include "autoware_auto_geometry/interval.hpp"
 
 #include <common/types.hpp>
 
diff --git a/common/autoware_auto_geometry/include/geometry/common_3d.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
similarity index 98%
rename from common/autoware_auto_geometry/include/geometry/common_3d.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
index 4477b010e7eba..2e48d9e3d2692 100644
--- a/common/autoware_auto_geometry/include/geometry/common_3d.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/common_3d.hpp
@@ -19,7 +19,7 @@
 #ifndef GEOMETRY__COMMON_3D_HPP_
 #define GEOMETRY__COMMON_3D_HPP_
 
-#include <geometry/common_2d.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
 
 namespace autoware
 {
diff --git a/common/autoware_auto_geometry/include/geometry/convex_hull.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/convex_hull.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
index e690c4d07441b..3b36b4036d371 100644
--- a/common/autoware_auto_geometry/include/geometry/convex_hull.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/convex_hull.hpp
@@ -22,7 +22,7 @@
 #define GEOMETRY__CONVEX_HULL_HPP_
 
 #include <common/types.hpp>
-#include <geometry/common_2d.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
 
 // lint -e537 NOLINT pclint vs cpplint
 #include <algorithm>
diff --git a/common/autoware_auto_geometry/include/geometry/hull_pockets.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
similarity index 98%
rename from common/autoware_auto_geometry/include/geometry/hull_pockets.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
index 6e8caa0df1e80..d041096e95a71 100644
--- a/common/autoware_auto_geometry/include/geometry/hull_pockets.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/hull_pockets.hpp
@@ -22,7 +22,7 @@
 #define GEOMETRY__HULL_POCKETS_HPP_
 
 #include <common/types.hpp>
-#include <geometry/common_2d.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
 
 #include <algorithm>
 #include <iterator>
diff --git a/common/autoware_auto_geometry/include/geometry/intersection.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/intersection.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
index 87dc32b0190d0..b4c03639a1e6f 100644
--- a/common/autoware_auto_geometry/include/geometry/intersection.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/intersection.hpp
@@ -17,8 +17,8 @@
 #ifndef GEOMETRY__INTERSECTION_HPP_
 #define GEOMETRY__INTERSECTION_HPP_
 
-#include <geometry/common_2d.hpp>
-#include <geometry/convex_hull.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/convex_hull.hpp>
 
 #include <autoware_auto_perception_msgs/msg/bounding_box.hpp>
 #include <autoware_auto_planning_msgs/msg/trajectory_point.hpp>
diff --git a/common/autoware_auto_geometry/include/geometry/interval.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp
similarity index 100%
rename from common/autoware_auto_geometry/include/geometry/interval.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/interval.hpp
diff --git a/common/autoware_auto_geometry/include/geometry/lookup_table.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/lookup_table.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
index e23a8c31b60f8..1206a5ffcce76 100644
--- a/common/autoware_auto_geometry/include/geometry/lookup_table.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/lookup_table.hpp
@@ -21,7 +21,7 @@
 #define GEOMETRY__LOOKUP_TABLE_HPP_
 
 #include "common/types.hpp"
-#include "geometry/interval.hpp"
+#include "autoware_auto_geometry/interval.hpp"
 
 #include <cmath>
 #include <stdexcept>
diff --git a/common/autoware_auto_geometry/include/geometry/spatial_hash.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/spatial_hash.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
index 78626548e5c74..8f9becad5130a 100644
--- a/common/autoware_auto_geometry/include/geometry/spatial_hash.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash.hpp
@@ -21,8 +21,8 @@
 #define GEOMETRY__SPATIAL_HASH_HPP_
 
 #include <common/types.hpp>
-#include <geometry/spatial_hash_config.hpp>
-#include <geometry/visibility_control.hpp>
+#include "autoware_auto_geometry/spatial_hash_config.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
 
 #include <unordered_map>
 #include <utility>
diff --git a/common/autoware_auto_geometry/include/geometry/spatial_hash_config.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
similarity index 99%
rename from common/autoware_auto_geometry/include/geometry/spatial_hash_config.hpp
rename to common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
index e118ec24c7759..c9e5b9668d0e6 100644
--- a/common/autoware_auto_geometry/include/geometry/spatial_hash_config.hpp
+++ b/common/autoware_auto_geometry/include/autoware_auto_geometry/spatial_hash_config.hpp
@@ -23,8 +23,8 @@
 #include "helper_functions/crtp.hpp"
 
 #include <common/types.hpp>
-#include <geometry/common_2d.hpp>
-#include <geometry/visibility_control.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
+#include "autoware_auto_geometry/visibility_control.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/common/autoware_auto_geometry/include/geometry/visibility_control.hpp b/common/autoware_auto_geometry/include/autoware_auto_geometry/visibility_control.hpp
similarity index 100%
rename from common/autoware_auto_geometry/include/geometry/visibility_control.hpp
rename to common/autoware_auto_geometry/include/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 225ea099e4e79..23d50210f943b 100644
--- a/common/autoware_auto_geometry/src/bounding_box.cpp
+++ b/common/autoware_auto_geometry/src/bounding_box.cpp
@@ -15,12 +15,12 @@
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
 #include <autoware_auto_tf2/tf2_autoware_auto_msgs.hpp>
-#include <geometry/bounding_box/bounding_box_common.hpp>
-#include <geometry/bounding_box/eigenbox_2d.hpp>
+#include "autoware_auto_geometry/bounding_box/bounding_box_common.hpp>
+#include "autoware_auto_geometry/bounding_box/eigenbox_2d.hpp>
 // cspell: ignore eigenbox
-#include <geometry/bounding_box/lfit.hpp>
+#include "autoware_auto_geometry/bounding_box/lfit.hpp>
 // cspell: ignore lfit
-#include <geometry/bounding_box/rotating_calipers.hpp>
+#include "autoware_auto_geometry/bounding_box/rotating_calipers.hpp>
 
 #include <geometry_msgs/msg/point32.hpp>
 
diff --git a/common/autoware_auto_geometry/src/spatial_hash.cpp b/common/autoware_auto_geometry/src/spatial_hash.cpp
index 024cca48b8ee7..677ca935800c1 100644
--- a/common/autoware_auto_geometry/src/spatial_hash.cpp
+++ b/common/autoware_auto_geometry/src/spatial_hash.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <geometry/spatial_hash.hpp>
+#include "autoware_auto_geometry/spatial_hash.hpp>
 
 #include <geometry_msgs/msg/point32.hpp>
 // lint -e537 NOLINT repeated include file due to cpplint rule
diff --git a/common/autoware_auto_geometry/test/include/test_bounding_box.hpp b/common/autoware_auto_geometry/test/include/test_bounding_box.hpp
index 5e42622b19ce9..a179fbde5f151 100644
--- a/common/autoware_auto_geometry/test/include/test_bounding_box.hpp
+++ b/common/autoware_auto_geometry/test/include/test_bounding_box.hpp
@@ -17,9 +17,9 @@
 #ifndef TEST_BOUNDING_BOX_HPP_
 #define TEST_BOUNDING_BOX_HPP_
 
-#include "geometry/bounding_box/lfit.hpp"
+#include "autoware_auto_geometry/bounding_box/lfit.hpp"
 // cspell: ignore lfit
-#include "geometry/bounding_box/rotating_calipers.hpp"
+#include "autoware_auto_geometry/bounding_box/rotating_calipers.hpp"
 
 #include <geometry_msgs/msg/point32.hpp>
 
diff --git a/common/autoware_auto_geometry/test/include/test_spatial_hash.hpp b/common/autoware_auto_geometry/test/include/test_spatial_hash.hpp
index 50e946c416270..fc2d97c257b95 100644
--- a/common/autoware_auto_geometry/test/include/test_spatial_hash.hpp
+++ b/common/autoware_auto_geometry/test/include/test_spatial_hash.hpp
@@ -17,7 +17,7 @@
 #ifndef TEST_SPATIAL_HASH_HPP_
 #define TEST_SPATIAL_HASH_HPP_
 
-#include "geometry/spatial_hash.hpp"
+#include "autoware_auto_geometry/spatial_hash.hpp"
 
 #include <geometry_msgs/msg/point32.hpp>
 
diff --git a/common/autoware_auto_geometry/test/src/lookup_table.cpp b/common/autoware_auto_geometry/test/src/lookup_table.cpp
index e7533518d7f49..4bf11f5429bca 100644
--- a/common/autoware_auto_geometry/test/src/lookup_table.cpp
+++ b/common/autoware_auto_geometry/test/src/lookup_table.cpp
@@ -15,7 +15,7 @@
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
 #include <common/types.hpp>
-#include <geometry/lookup_table.hpp>
+#include "autoware_auto_geometry/lookup_table.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/common/autoware_auto_geometry/test/src/test_area.cpp b/common/autoware_auto_geometry/test/src/test_area.cpp
index d722314dada83..4010609d7956d 100644
--- a/common/autoware_auto_geometry/test/src/test_area.cpp
+++ b/common/autoware_auto_geometry/test/src/test_area.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <geometry/common_2d.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
 
 #include <geometry_msgs/msg/point32.hpp>
 
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 642e396bdce31..e599d531ced4b 100644
--- a/common/autoware_auto_geometry/test/src/test_common_2d.cpp
+++ b/common/autoware_auto_geometry/test/src/test_common_2d.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <geometry/common_2d.hpp>
+#include "autoware_auto_geometry/common_2d.hpp>
 
 #include <autoware_auto_perception_msgs/msg/point_clusters.hpp>
 #include <geometry_msgs/msg/point32.hpp>
diff --git a/common/autoware_auto_geometry/test/src/test_convex_hull.cpp b/common/autoware_auto_geometry/test/src/test_convex_hull.cpp
index 43e3a3ad08adf..8b9bbce36c428 100644
--- a/common/autoware_auto_geometry/test/src/test_convex_hull.cpp
+++ b/common/autoware_auto_geometry/test/src/test_convex_hull.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "geometry/convex_hull.hpp"
+#include "autoware_auto_geometry/convex_hull.hpp"
 
 #include <geometry_msgs/msg/point32.hpp>
 
diff --git a/common/autoware_auto_geometry/test/src/test_hull_pockets.cpp b/common/autoware_auto_geometry/test/src/test_hull_pockets.cpp
index 2b79d4ff0f22b..9477a83a488ed 100644
--- a/common/autoware_auto_geometry/test/src/test_hull_pockets.cpp
+++ b/common/autoware_auto_geometry/test/src/test_hull_pockets.cpp
@@ -14,8 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "geometry/convex_hull.hpp"
-#include "geometry/hull_pockets.hpp"
+#include "autoware_auto_geometry/convex_hull.hpp"
+#include "autoware_auto_geometry/hull_pockets.hpp"
 
 #include <geometry_msgs/msg/point32.hpp>
 
diff --git a/common/autoware_auto_geometry/test/src/test_intersection.cpp b/common/autoware_auto_geometry/test/src/test_intersection.cpp
index 69c54960d4fc5..7508cf6414f47 100644
--- a/common/autoware_auto_geometry/test/src/test_intersection.cpp
+++ b/common/autoware_auto_geometry/test/src/test_intersection.cpp
@@ -14,8 +14,8 @@
 
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <geometry/convex_hull.hpp>
-#include <geometry/intersection.hpp>
+#include "autoware_auto_geometry/convex_hull.hpp>
+#include "autoware_auto_geometry/intersection.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/common/autoware_auto_geometry/test/src/test_interval.cpp b/common/autoware_auto_geometry/test/src/test_interval.cpp
index ba8d5742dadc5..266ab123f5203 100644
--- a/common/autoware_auto_geometry/test/src/test_interval.cpp
+++ b/common/autoware_auto_geometry/test/src/test_interval.cpp
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#include "geometry/interval.hpp"
+#include "autoware_auto_geometry/interval.hpp"
 
 #include <gtest/gtest.h>