diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp
index 3d0b3d9b2c8a7..10dc46e55ec70 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp
@@ -14,6 +14,8 @@
 #ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
 #define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
 
+#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
+
 #include <rviz_common/display.hpp>
 #include <rviz_common/properties/color_property.hpp>
 #include <rviz_common/properties/float_property.hpp>
@@ -22,8 +24,6 @@
 
 #include <memory>
 
-#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
-
 namespace autoware
 {
 namespace rviz_plugins
diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp
index c6bf9f57d090b..97479fb68ca9b 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp
@@ -14,10 +14,10 @@
 #ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
 #define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
 
-#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
-
 #include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
 
+#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
+
 namespace autoware
 {
 namespace rviz_plugins
diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp
index d67b5c60eda49..b3ee4a33b28c9 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp
@@ -15,6 +15,8 @@
 #ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
 #define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
 
+#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
+
 #include <rclcpp/logging.hpp>
 #include <rclcpp/rclcpp.hpp>
 
@@ -33,8 +35,6 @@
 #include <string>
 #include <vector>
 
-#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
-
 namespace autoware
 {
 namespace rviz_plugins
diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp
index 2dc00826a2225..a0a21406ba416 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp
@@ -16,6 +16,7 @@
 
 #include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"
 #include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"
+#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
 
 #include <rviz_common/display.hpp>
 #include <rviz_common/properties/color_property.hpp>
@@ -34,10 +35,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"
-#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"
-#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
-
 namespace autoware
 {
 namespace rviz_plugins
diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp
index dd8fb027d5e9a..775c18db6ba5c 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp
@@ -14,6 +14,8 @@
 #ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
 #define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
 
+#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
+
 #include <autoware_auto_perception_msgs/msg/predicted_objects.hpp>
 
 #include <boost/functional/hash.hpp>
@@ -29,8 +31,6 @@
 #include <utility>
 #include <vector>
 
-#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
-
 namespace autoware
 {
 namespace rviz_plugins
diff --git a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp
index ad028dd65d1d5..4e86a5ee93fd8 100644
--- a/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp
+++ b/common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp
@@ -14,6 +14,8 @@
 #ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
 #define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
 
+#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
+
 #include <autoware_auto_perception_msgs/msg/tracked_objects.hpp>
 
 #include <boost/uuid/uuid.hpp>
@@ -24,8 +26,6 @@
 #include <string>
 #include <vector>
 
-#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
-
 namespace autoware
 {
 namespace rviz_plugins