diff --git a/system/leader_election_converter/src/common/converter/availability_converter.cpp b/system/leader_election_converter/src/common/converter/availability_converter.cpp
index a213ffe0a529c..f4bba88fe0581 100644
--- a/system/leader_election_converter/src/common/converter/availability_converter.cpp
+++ b/system/leader_election_converter/src/common/converter/availability_converter.cpp
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-#include <memory>
 #include "availability_converter.hpp"
 
 #include "rclcpp/rclcpp.hpp"
 
+#include <memory>
+#include <string>
+
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/common/converter/availability_converter.hpp b/system/leader_election_converter/src/common/converter/availability_converter.hpp
index f7031cc37399e..a0dd5ebb422bb 100644
--- a/system/leader_election_converter/src/common/converter/availability_converter.hpp
+++ b/system/leader_election_converter/src/common/converter/availability_converter.hpp
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON__AVAILABILITY_CONVERTER_HPP_
-#define COMMON__AVAILABILITY_CONVERTER_HPP_
+#ifndef COMMON__CONVERTER__AVAILABILITY_CONVERTER_HPP_
+#define COMMON__CONVERTER__AVAILABILITY_CONVERTER_HPP_
 
-#include <autoware_auto_vehicle_msgs/msg/control_mode_report.hpp>
-#include <tier4_system_msgs/msg/operation_mode_availability.hpp>
+#include "udp_sender.hpp"
 
 #include <rclcpp/rclcpp.hpp>
-#include <string>
-#include <memory>
 
-#include "udp_sender.hpp"
+#include <autoware_auto_vehicle_msgs/msg/control_mode_report.hpp>
+#include <tier4_system_msgs/msg/operation_mode_availability.hpp>
 
+#include <memory>
+#include <string>
 
 namespace leader_election_converter
 {
diff --git a/system/leader_election_converter/src/common/converter/log_converter.cpp b/system/leader_election_converter/src/common/converter/log_converter.cpp
index f2a65092e8f98..9945bd27fc6bc 100644
--- a/system/leader_election_converter/src/common/converter/log_converter.cpp
+++ b/system/leader_election_converter/src/common/converter/log_converter.cpp
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-#include <memory>
-
-#include "rclcpp/rclcpp.hpp"
 #include "log_converter.hpp"
 
 #include "rclcpp/rclcpp.hpp"
 
+#include <memory>
+#include <string>
+
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/common/converter/log_converter.hpp b/system/leader_election_converter/src/common/converter/log_converter.hpp
index d465fb28d7187..aaf27513759d8 100644
--- a/system/leader_election_converter/src/common/converter/log_converter.hpp
+++ b/system/leader_election_converter/src/common/converter/log_converter.hpp
@@ -30,9 +30,6 @@
 #include <string>
 #include <thread>
 
-#include "udp_sender.hpp"
-#include "udp_receiver.hpp"
-
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/common/converter/mrm_converter.cpp b/system/leader_election_converter/src/common/converter/mrm_converter.cpp
index bd4ae0346b902..d18583d1b617b 100644
--- a/system/leader_election_converter/src/common/converter/mrm_converter.cpp
+++ b/system/leader_election_converter/src/common/converter/mrm_converter.cpp
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-#include <memory>
-
-#include "rclcpp/rclcpp.hpp"
 #include "mrm_converter.hpp"
 
 #include "rclcpp/rclcpp.hpp"
 
+#include <memory>
+#include <string>
+
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/common/converter/mrm_converter.hpp b/system/leader_election_converter/src/common/converter/mrm_converter.hpp
index f645804a4f8ec..347a816029ecc 100644
--- a/system/leader_election_converter/src/common/converter/mrm_converter.hpp
+++ b/system/leader_election_converter/src/common/converter/mrm_converter.hpp
@@ -28,9 +28,6 @@
 #include <string>
 #include <thread>
 
-#include "udp_sender.hpp"
-#include "udp_receiver.hpp"
-
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/common/converter/udp_receiver.hpp b/system/leader_election_converter/src/common/converter/udp_receiver.hpp
index 137a13cd811a2..3a3e9f7075004 100644
--- a/system/leader_election_converter/src/common/converter/udp_receiver.hpp
+++ b/system/leader_election_converter/src/common/converter/udp_receiver.hpp
@@ -17,7 +17,6 @@
 #define COMMON__CONVERTER__UDP_RECEIVER_HPP_
 
 #include <errno.h>
-#include <string>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/socket.h>
@@ -28,6 +27,7 @@
 #include <functional>
 #include <iostream>
 #include <stdexcept>
+#include <string>
 
 namespace leader_election_converter
 {
diff --git a/system/leader_election_converter/src/common/converter/udp_sender.hpp b/system/leader_election_converter/src/common/converter/udp_sender.hpp
index 87ca1790bac33..15cb16774a24e 100644
--- a/system/leader_election_converter/src/common/converter/udp_sender.hpp
+++ b/system/leader_election_converter/src/common/converter/udp_sender.hpp
@@ -19,11 +19,11 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <string>
 
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
+#include <string>
 
 namespace leader_election_converter
 {
diff --git a/system/leader_election_converter/src/node/leader_election_converter.cpp b/system/leader_election_converter/src/node/leader_election_converter.cpp
index e289fab5c4a4b..abd136fdea39c 100644
--- a/system/leader_election_converter/src/node/leader_election_converter.cpp
+++ b/system/leader_election_converter/src/node/leader_election_converter.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-
 #include "leader_election_converter.hpp"
 
+#include <string>
+
 namespace leader_election_converter
 {
 
diff --git a/system/leader_election_converter/src/node/leader_election_converter.hpp b/system/leader_election_converter/src/node/leader_election_converter.hpp
index e4dfb0a35b625..87381b2968097 100644
--- a/system/leader_election_converter/src/node/leader_election_converter.hpp
+++ b/system/leader_election_converter/src/node/leader_election_converter.hpp
@@ -15,10 +15,6 @@
 #ifndef NODE__LEADER_ELECTION_CONVERTER_HPP_
 #define NODE__LEADER_ELECTION_CONVERTER_HPP_
 
-#include <rclcpp/rclcpp.hpp>
-#include <memory>
-#include <string>
-
 #include "availability_converter.hpp"
 #include "log_converter.hpp"
 #include "mrm_converter.hpp"
@@ -26,6 +22,7 @@
 #include <rclcpp/rclcpp.hpp>
 
 #include <memory>
+#include <string>
 
 namespace leader_election_converter
 {