diff --git a/build_depends.repos b/build_depends.repos
index 8783b0ade7..371dd23b2a 100644
--- a/build_depends.repos
+++ b/build_depends.repos
@@ -10,4 +10,4 @@ repositories:
   autoware_internal_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_internal_msgs
-    version: main
\ No newline at end of file
+    version: main
diff --git a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
index 6d27b758b1..a15fb1fc77 100644
--- a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
+++ b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
@@ -19,6 +19,9 @@
 #include <rclcpp/rclcpp.hpp>
 
 #include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
+#include <autoware_internal_planning_msgs/msg/path_point_with_lane_id.hpp>
+#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
+#include <autoware_internal_planning_msgs/msg/scenario.hpp>
 #include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
 #include <autoware_planning_msgs/msg/lanelet_primitive.hpp>
 #include <autoware_planning_msgs/msg/lanelet_route.hpp>
@@ -30,9 +33,6 @@
 #include <nav_msgs/msg/odometry.hpp>
 #include <rosgraph_msgs/msg/clock.hpp>
 #include <tf2_msgs/msg/tf_message.hpp>
-#include <autoware_internal_planning_msgs/msg/path_point_with_lane_id.hpp>
-#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
-#include <autoware_internal_planning_msgs/msg/scenario.hpp>
 
 #include <lanelet2_io/Io.h>
 
@@ -48,22 +48,22 @@
 namespace autoware::test_utils
 {
 using autoware_adapi_v1_msgs::msg::OperationModeState;
+using autoware_internal_planning_msgs::msg::PathPointWithLaneId;
+using autoware_internal_planning_msgs::msg::PathWithLaneId;
 using autoware_map_msgs::msg::LaneletMapBin;
 using autoware_planning_msgs::msg::LaneletPrimitive;
 using autoware_planning_msgs::msg::LaneletRoute;
 using autoware_planning_msgs::msg::LaneletSegment;
 using autoware_planning_msgs::msg::Path;
 using autoware_planning_msgs::msg::Trajectory;
-using autoware_internal_planning_msgs::msg::PathPointWithLaneId;
-using autoware_internal_planning_msgs::msg::PathWithLaneId;
 using RouteSections = std::vector<autoware_planning_msgs::msg::LaneletSegment>;
+using autoware_internal_planning_msgs::msg::Scenario;
 using geometry_msgs::msg::Point;
 using geometry_msgs::msg::Pose;
 using geometry_msgs::msg::PoseStamped;
 using nav_msgs::msg::OccupancyGrid;
 using nav_msgs::msg::Odometry;
 using tf2_msgs::msg::TFMessage;
-using autoware_internal_planning_msgs::msg::Scenario;
 
 /**
  * @brief Creates a Pose message with the specified position and orientation.
diff --git a/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp b/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp
index daebd89736..e4cba1f1a8 100644
--- a/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp
+++ b/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp
@@ -19,6 +19,7 @@
 #include <builtin_interfaces/msg/time.hpp>
 
 #include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
+#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
 #include <autoware_perception_msgs/msg/predicted_objects.hpp>
 #include <autoware_perception_msgs/msg/tracked_objects.hpp>
 #include <autoware_perception_msgs/msg/traffic_light_group_array.hpp>
@@ -29,7 +30,6 @@
 #include <geometry_msgs/msg/pose_with_covariance.hpp>
 #include <geometry_msgs/msg/twist_with_covariance.hpp>
 #include <nav_msgs/msg/odometry.hpp>
-#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
 
 #include <yaml-cpp/yaml.h>
 
@@ -56,6 +56,8 @@ using autoware_perception_msgs::msg::TrafficLightElement;
 using autoware_perception_msgs::msg::TrafficLightGroup;
 using autoware_perception_msgs::msg::TrafficLightGroupArray;
 
+using autoware_internal_planning_msgs::msg::PathPointWithLaneId;
+using autoware_internal_planning_msgs::msg::PathWithLaneId;
 using autoware_planning_msgs::msg::LaneletPrimitive;
 using autoware_planning_msgs::msg::LaneletRoute;
 using autoware_planning_msgs::msg::LaneletSegment;
@@ -72,8 +74,6 @@ using geometry_msgs::msg::Twist;
 using geometry_msgs::msg::TwistWithCovariance;
 using nav_msgs::msg::Odometry;
 using std_msgs::msg::Header;
-using autoware_internal_planning_msgs::msg::PathPointWithLaneId;
-using autoware_internal_planning_msgs::msg::PathWithLaneId;
 using unique_identifier_msgs::msg::UUID;
 
 /**
diff --git a/common/autoware_test_utils/package.xml b/common/autoware_test_utils/package.xml
index 038280c3b4..f23fe145b0 100644
--- a/common/autoware_test_utils/package.xml
+++ b/common/autoware_test_utils/package.xml
@@ -21,6 +21,7 @@
   <depend>autoware_component_interface_specs</depend>
   <depend>autoware_component_interface_utils</depend>
   <depend>autoware_control_msgs</depend>
+  <depend>autoware_internal_planning_msgs</depend>
   <depend>autoware_lanelet2_extension</depend>
   <depend>autoware_map_msgs</depend>
   <depend>autoware_perception_msgs</depend>
@@ -34,7 +35,6 @@
   <depend>std_srvs</depend>
   <depend>tf2_msgs</depend>
   <depend>tf2_ros</depend>
-  <depend>autoware_internal_planning_msgs</depend>
   <depend>unique_identifier_msgs</depend>
   <depend>yaml_cpp_vendor</depend>
 
diff --git a/common/autoware_test_utils/src/topic_snapshot_saver.cpp b/common/autoware_test_utils/src/topic_snapshot_saver.cpp
index cd4986c665..70d716de72 100644
--- a/common/autoware_test_utils/src/topic_snapshot_saver.cpp
+++ b/common/autoware_test_utils/src/topic_snapshot_saver.cpp
@@ -18,6 +18,7 @@
 #include <rclcpp/rclcpp.hpp>
 
 #include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
+#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
 #include <autoware_perception_msgs/msg/predicted_objects.hpp>
 #include <autoware_perception_msgs/msg/tracked_objects.hpp>
 #include <autoware_perception_msgs/msg/traffic_light_group_array.hpp>
@@ -25,7 +26,6 @@
 #include <geometry_msgs/msg/accel_with_covariance_stamped.hpp>
 #include <nav_msgs/msg/odometry.hpp>
 #include <std_srvs/srv/empty.hpp>
-#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
 
 #include <yaml-cpp/yaml.h>
 
@@ -48,7 +48,7 @@ using MessageType = std::variant<
   autoware_planning_msgs::msg::LaneletRoute,              // 4
   autoware_perception_msgs::msg::TrafficLightGroupArray,  // 5
   autoware_perception_msgs::msg::TrackedObjects,          // 6
-  autoware_internal_planning_msgs::msg::PathWithLaneId                // 7
+  autoware_internal_planning_msgs::msg::PathWithLaneId    // 7
   >;
 
 std::optional<size_t> get_topic_index(const std::string & name)