diff --git a/system/autoware_auto_msgs_adapter/package.xml b/system/autoware_auto_msgs_adapter/package.xml
index cdadbdd0090d2..4866af045d95b 100644
--- a/system/autoware_auto_msgs_adapter/package.xml
+++ b/system/autoware_auto_msgs_adapter/package.xml
@@ -26,10 +26,10 @@
   <depend>autoware_control_msgs</depend>
   <depend>autoware_map_msgs</depend>
   <depend>autoware_perception_msgs</depend>
-  <depend>rviz_2d_overlay_msgs</depend>
   <depend>autoware_planning_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
+  <depend>rviz_2d_overlay_msgs</depend>
 
   <export>
     <build_type>ament_cmake</build_type>
diff --git a/system/autoware_auto_msgs_adapter/src/include/autoware_auto_msgs_adapter_core.hpp b/system/autoware_auto_msgs_adapter/src/include/autoware_auto_msgs_adapter_core.hpp
index 43dad0de48161..5d8466d56b01d 100644
--- a/system/autoware_auto_msgs_adapter/src/include/autoware_auto_msgs_adapter_core.hpp
+++ b/system/autoware_auto_msgs_adapter/src/include/autoware_auto_msgs_adapter_core.hpp
@@ -17,8 +17,8 @@
 #include "adapter_control.hpp"
 #include "adapter_map.hpp"
 #include "adapter_perception.hpp"
-#include "adapter_traffic_signals.hpp"
 #include "adapter_planning.hpp"
+#include "adapter_traffic_signals.hpp"
 
 #include <rclcpp/rclcpp.hpp>