Merge pull request #1093 from tier4/beta-to-tier4-main-sync

chore: sync beta branch beta/v0.20.0 with tier4/main
tier4 · Jan 16, 2024 · c05b191 · c05b191
2 parents 44b25d3 + a45f52a
commit c05b191
Show file tree

Hide file tree

Showing 579 changed files with 12,954 additions and 5,600 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -79,7 +79,7 @@ evaluator/planning_evaluator/** [email protected] [email protected]
 launch/tier4_autoware_api_launch/** [email protected] [email protected] [email protected] [email protected]
 launch/tier4_control_launch/** [email protected] [email protected]
 launch/tier4_localization_launch/** [email protected] [email protected] [email protected] [email protected]
-launch/tier4_map_launch/** [email protected] [email protected] [email protected]
+launch/tier4_map_launch/** [email protected] [email protected] [email protected] [email protected]
 launch/tier4_perception_launch/** [email protected] [email protected] [email protected]
 launch/tier4_planning_launch/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 launch/tier4_sensing_launch/** [email protected]
@@ -105,10 +105,10 @@ localization/yabloc/yabloc_image_processing/** [email protected] masahir
 localization/yabloc/yabloc_monitor/** [email protected] [email protected] [email protected]
 localization/yabloc/yabloc_particle_filter/** [email protected] [email protected]
 localization/yabloc/yabloc_pose_initializer/** [email protected] [email protected]
-map/map_height_fitter/** [email protected] [email protected] [email protected]
-map/map_loader/** [email protected] [email protected] [email protected] [email protected]
-map/map_projection_loader/** [email protected] [email protected] [email protected]
-map/map_tf_generator/** azumi.suzuki@tier4.jp
+map/map_height_fitter/** [email protected] [email protected] [email protected] [email protected]
+map/map_loader/** [email protected] [email protected] [email protected] [email protected] [email protected]
+map/map_projection_loader/** [email protected] [email protected] [email protected] [email protected]
+map/map_tf_generator/** [email protected] [email protected] yamato.ando@tier4.jp
 map/util/lanelet2_map_preprocessor/** [email protected]
 perception/bytetrack/** [email protected]
 perception/cluster_merger/** [email protected] [email protected] [email protected]
@@ -122,7 +122,7 @@ perception/euclidean_cluster/** [email protected]
 perception/front_vehicle_velocity_estimator/** [email protected] [email protected]
 perception/ground_segmentation/** [email protected] [email protected] [email protected] [email protected]
 perception/heatmap_visualizer/** [email protected]
-perception/image_projection_based_fusion/** [email protected] [email protected] [email protected] [email protected] [email protected]
+perception/image_projection_based_fusion/** [email protected] [email protected] shunsuke.miura@tier4.jp tao.zhong@tier4.jp [email protected] [email protected] [email protected]
 perception/lidar_apollo_instance_segmentation/** [email protected]
 perception/lidar_apollo_segmentation_tvm/** [email protected] [email protected]
 perception/lidar_apollo_segmentation_tvm_nodes/** [email protected] [email protected]
@@ -156,13 +156,15 @@ perception/traffic_light_ssd_fine_detector/** [email protected]
 perception/traffic_light_visualization/** [email protected]
 planning/behavior_path_avoidance_by_lane_change_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_avoidance_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/behavior_path_external_request_lane_change_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_goal_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/behavior_path_lane_change_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
-planning/behavior_path_planner_common/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/behavior_path_planner_common/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_side_shift_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_start_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_blind_spot_module/** [email protected] [email protected] [email protected]
-planning/behavior_velocity_crosswalk_module/** [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/behavior_velocity_crosswalk_module/** [email protected] [email protected] [email protected] [email protected] [email protected] tomoya.kimura@tier4.jp yuki.takagi@tier4.jp
 planning/behavior_velocity_detection_area_module/** [email protected] [email protected] [email protected]
 planning/behavior_velocity_intersection_module/** [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_no_drivable_lane_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
@@ -186,7 +188,7 @@ planning/mission_planner/** [email protected] [email protected] ryohs
 planning/motion_velocity_smoother/** [email protected] [email protected] [email protected]
 planning/objects_of_interest_marker_interface/** [email protected] [email protected] [email protected]
 planning/obstacle_avoidance_planner/** [email protected] [email protected] [email protected]
-planning/obstacle_cruise_planner/** [email protected] [email protected] [email protected]
+planning/obstacle_cruise_planner/** [email protected] [email protected] [email protected] [email protected]
 planning/obstacle_stop_planner/** [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/obstacle_velocity_limiter/** [email protected]
 planning/path_smoother/** [email protected] [email protected]
@@ -226,13 +228,13 @@ system/default_ad_api/** [email protected] [email protected] makoto.yabut
 system/default_ad_api_helpers/ad_api_adaptors/** [email protected] [email protected] [email protected] [email protected] [email protected]
 system/default_ad_api_helpers/ad_api_visualizers/** [email protected] [email protected] [email protected] [email protected] [email protected]
 system/default_ad_api_helpers/automatic_pose_initializer/** [email protected] [email protected] [email protected] [email protected] [email protected]
+system/diagnostic_graph_aggregator/** [email protected]
 system/dummy_diag_publisher/** [email protected] [email protected]
 system/dummy_infrastructure/** [email protected]
 system/duplicated_node_checker/** [email protected] [email protected]
 system/emergency_handler/** [email protected]
 system/mrm_comfortable_stop_operator/** [email protected] [email protected]
 system/mrm_emergency_stop_operator/** [email protected] [email protected]
-system/system_diagnostic_graph/** [email protected]
 system/system_error_monitor/** [email protected]
 system/system_monitor/** [email protected] [email protected]
 system/topic_state_monitor/** [email protected]

diff --git a/common/autoware_auto_common/design/comparisons.md b/common/autoware_auto_common/design/comparisons.md
@@ -22,8 +22,8 @@ The `exclusive_or` function will test whether two values cast to different boole
 ## Example Usage
 
 ```c++
-#include "common/bool_comparisons.hpp"
-#include "common/float_comparisons.hpp"
+#include "autoware_auto_common/common/bool_comparisons.hpp"
+#include "autoware_auto_common/common/float_comparisons.hpp"
 
 #include <iostream>
 

diff --git a/...uto_common/include/common/type_traits.hpp → ...toware_auto_common/common/type_traits.hpp b/...uto_common/include/common/type_traits.hpp → ...toware_auto_common/common/type_traits.hpp
@@ -14,15 +14,15 @@
 //
 // Developed by Apex.AI, Inc.
 
-#include <common/types.hpp>
-#include <common/visibility_control.hpp>
+#include "autoware_auto_common/common/types.hpp"
+#include "autoware_auto_common/common/visibility_control.hpp"
 
 #include <cstdint>
 #include <tuple>
 #include <type_traits>
 
-#ifndef COMMON__TYPE_TRAITS_HPP_
-#define COMMON__TYPE_TRAITS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_
+#define AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_
 
 namespace autoware
 {
@@ -219,4 +219,4 @@ struct intersect
 }  // namespace common
 }  // namespace autoware
 
-#endif  // COMMON__TYPE_TRAITS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__COMMON__TYPE_TRAITS_HPP_
diff --git a/...ware_auto_common/include/common/types.hpp → ...ude/autoware_auto_common/common/types.hpp b/...ware_auto_common/include/common/types.hpp → ...ude/autoware_auto_common/common/types.hpp
@@ -16,11 +16,11 @@
 /// \file
 /// \brief This file includes common type definition
 
-#ifndef COMMON__TYPES_HPP_
-#define COMMON__TYPES_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_
+#define AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_
 
-#include "common/visibility_control.hpp"
-#include "helper_functions/float_comparisons.hpp"
+#include "autoware_auto_common/common/visibility_control.hpp"
+#include "autoware_auto_common/helper_functions/float_comparisons.hpp"
 
 #include <cstdint>
 #include <limits>
@@ -122,4 +122,4 @@ using void_t = void;
 }  // namespace common
 }  // namespace autoware
 
-#endif  // COMMON__TYPES_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__COMMON__TYPES_HPP_
diff --git a/...mon/include/common/visibility_control.hpp → ...auto_common/common/visibility_control.hpp b/...mon/include/common/visibility_control.hpp → ...auto_common/common/visibility_control.hpp
@@ -14,8 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef COMMON__VISIBILITY_CONTROL_HPP_
-#define COMMON__VISIBILITY_CONTROL_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_
+#define AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_
 
 #if defined(_MSC_VER) && defined(_WIN64)
 #if defined(COMMON_BUILDING_DLL) || defined(COMMON_EXPORTS)
@@ -35,4 +35,4 @@
 #error "Unsupported Build Configuration"
 #endif  // _MSC_VER
 
-#endif  // COMMON__VISIBILITY_CONTROL_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__COMMON__VISIBILITY_CONTROL_HPP_
diff --git a/.../include/helper_functions/angle_utils.hpp → ...o_common/helper_functions/angle_utils.hpp b/.../include/helper_functions/angle_utils.hpp → ...o_common/helper_functions/angle_utils.hpp
@@ -14,8 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
-#define HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
 
 #include <cmath>
 #include <type_traits>
@@ -63,4 +63,4 @@ constexpr T wrap_angle(T angle) noexcept
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__ANGLE_UTILS_HPP_
diff --git a/...ude/helper_functions/bool_comparisons.hpp → ...mon/helper_functions/bool_comparisons.hpp b/...ude/helper_functions/bool_comparisons.hpp → ...mon/helper_functions/bool_comparisons.hpp
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#ifndef HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
-#define HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
 
-#include "common/types.hpp"
+#include "autoware_auto_common/common/types.hpp"
 
 namespace autoware
 {
@@ -47,4 +47,4 @@ types::bool8_t exclusive_or(const T & a, const T & b)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BOOL_COMPARISONS_HPP_
diff --git a/.../include/helper_functions/byte_reader.hpp → ...o_common/helper_functions/byte_reader.hpp b/.../include/helper_functions/byte_reader.hpp → ...o_common/helper_functions/byte_reader.hpp
@@ -16,8 +16,8 @@
 /// \file
 /// \brief This file includes common helper functions
 
-#ifndef HELPER_FUNCTIONS__BYTE_READER_HPP_
-#define HELPER_FUNCTIONS__BYTE_READER_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_
 
 #include <cstdint>
 #include <cstring>
@@ -70,4 +70,4 @@ class ByteReader
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__BYTE_READER_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__BYTE_READER_HPP_
diff --git a/..._common/include/helper_functions/crtp.hpp → ...are_auto_common/helper_functions/crtp.hpp b/..._common/include/helper_functions/crtp.hpp → ...are_auto_common/helper_functions/crtp.hpp
@@ -16,8 +16,8 @@
 /// \file
 /// \brief This file includes common helper functions
 
-#ifndef HELPER_FUNCTIONS__CRTP_HPP_
-#define HELPER_FUNCTIONS__CRTP_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_
 
 namespace autoware
 {
@@ -49,4 +49,4 @@ class crtp
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__CRTP_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__CRTP_HPP_
diff --git a/...de/helper_functions/float_comparisons.hpp → ...on/helper_functions/float_comparisons.hpp b/...de/helper_functions/float_comparisons.hpp → ...on/helper_functions/float_comparisons.hpp
@@ -18,8 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#ifndef HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
-#define HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
 
 #include <algorithm>
 #include <cmath>
@@ -146,4 +146,4 @@ bool approx_eq(const T & a, const T & b, const T & abs_eps, const T & rel_eps)
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__FLOAT_COMPARISONS_HPP_
diff --git a/...helper_functions/mahalanobis_distance.hpp → ...helper_functions/mahalanobis_distance.hpp b/...helper_functions/mahalanobis_distance.hpp → ...helper_functions/mahalanobis_distance.hpp
@@ -14,8 +14,8 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
-#define HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
 
 #include <Eigen/Cholesky>
 
@@ -69,4 +69,4 @@ types::float32_t calculate_mahalanobis_distance(
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MAHALANOBIS_DISTANCE_HPP_
diff --git a/...ude/helper_functions/message_adapters.hpp → ...mon/helper_functions/message_adapters.hpp b/...ude/helper_functions/message_adapters.hpp → ...mon/helper_functions/message_adapters.hpp
@@ -16,8 +16,8 @@
 /// \file
 /// \brief This file includes common helper functions
 
-#ifndef HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
-#define HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
 
 #include <builtin_interfaces/msg/time.hpp>
 
@@ -112,4 +112,4 @@ TimeStamp get_stamp(const T & msg) noexcept
 }  // namespace common
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__MESSAGE_ADAPTERS_HPP_
diff --git a/...clude/helper_functions/template_utils.hpp → ...ommon/helper_functions/template_utils.hpp b/...clude/helper_functions/template_utils.hpp → ...ommon/helper_functions/template_utils.hpp
@@ -14,10 +14,10 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
-#define HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
 
-#include <common/types.hpp>
+#include "autoware_auto_common/common/types.hpp"
 
 #include <type_traits>
 
@@ -72,4 +72,4 @@ struct expression_valid_with_return<
 }  // namespace helper_functions
 }  // namespace common
 }  // namespace autoware
-#endif  // HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TEMPLATE_UTILS_HPP_
diff --git a/...on/include/helper_functions/type_name.hpp → ...uto_common/helper_functions/type_name.hpp b/...on/include/helper_functions/type_name.hpp → ...uto_common/helper_functions/type_name.hpp
@@ -14,10 +14,10 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#ifndef HELPER_FUNCTIONS__TYPE_NAME_HPP_
-#define HELPER_FUNCTIONS__TYPE_NAME_HPP_
+#ifndef AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_
+#define AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_
 
-#include <common/visibility_control.hpp>
+#include "autoware_auto_common/common/visibility_control.hpp"
 
 #include <string>
 #include <typeinfo>
@@ -53,4 +53,4 @@ COMMON_PUBLIC std::string get_type_name(const T &)
 }  // namespace helper_functions
 }  // namespace autoware
 
-#endif  // HELPER_FUNCTIONS__TYPE_NAME_HPP_
+#endif  // AUTOWARE_AUTO_COMMON__HELPER_FUNCTIONS__TYPE_NAME_HPP_
diff --git a/common/autoware_auto_common/test/test_angle_utils.cpp b/common/autoware_auto_common/test/test_angle_utils.cpp
@@ -14,8 +14,8 @@
 //
 // Developed by Apex.AI, Inc.
 
-#include <common/types.hpp>
-#include <helper_functions/angle_utils.hpp>
+#include "autoware_auto_common/common/types.hpp"
+#include "autoware_auto_common/helper_functions/angle_utils.hpp"
 
 #include <gtest/gtest.h>
 

diff --git a/common/autoware_auto_common/test/test_bool_comparisons.cpp b/common/autoware_auto_common/test/test_bool_comparisons.cpp
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#include "helper_functions/bool_comparisons.hpp"
+#include "autoware_auto_common/helper_functions/bool_comparisons.hpp"
 
 #include <gtest/gtest.h>
 

diff --git a/common/autoware_auto_common/test/test_byte_reader.cpp b/common/autoware_auto_common/test/test_byte_reader.cpp
@@ -14,9 +14,10 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include "common/types.hpp"
-#include "gtest/gtest.h"
-#include "helper_functions/byte_reader.hpp"
+#include "autoware_auto_common/common/types.hpp"
+#include "autoware_auto_common/helper_functions/byte_reader.hpp"
+
+#include <gtest/gtest.h>
 
 #include <vector>
 

diff --git a/common/autoware_auto_common/test/test_float_comparisons.cpp b/common/autoware_auto_common/test/test_float_comparisons.cpp
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#include "helper_functions/float_comparisons.hpp"
+#include "autoware_auto_common/helper_functions/float_comparisons.hpp"
 
 #include <gtest/gtest.h>
 

diff --git a/common/autoware_auto_common/test/test_mahalanobis_distance.cpp b/common/autoware_auto_common/test/test_mahalanobis_distance.cpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
-#include <common/types.hpp>
-#include <helper_functions/mahalanobis_distance.hpp>
+#include "autoware_auto_common/common/types.hpp"
+#include "autoware_auto_common/helper_functions/mahalanobis_distance.hpp"
 
 #include <gtest/gtest.h>
 

diff --git a/common/autoware_auto_common/test/test_message_field_adapters.cpp b/common/autoware_auto_common/test/test_message_field_adapters.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <helper_functions/message_adapters.hpp>
+#include "autoware_auto_common/helper_functions/message_adapters.hpp"
 
 #include <geometry_msgs/msg/transform_stamped.hpp>
 

diff --git a/common/autoware_auto_common/test/test_template_utils.cpp b/common/autoware_auto_common/test/test_template_utils.cpp
@@ -14,7 +14,7 @@
 //
 // Co-developed by Tier IV, Inc. and Apex.AI, Inc.
 
-#include <helper_functions/template_utils.hpp>
+#include "autoware_auto_common/helper_functions/template_utils.hpp"
 
 #include <gtest/gtest.h>
 

diff --git a/common/autoware_auto_common/test/test_type_name.cpp b/common/autoware_auto_common/test/test_type_name.cpp
@@ -14,8 +14,8 @@
 //
 // Developed by Apex.AI, Inc.
 
-#include <common/types.hpp>
-#include <helper_functions/type_name.hpp>
+#include "autoware_auto_common/common/types.hpp"
+#include "autoware_auto_common/helper_functions/type_name.hpp"
 
 #include <gtest/gtest.h>