diff --git a/perception/autoware_object_merger/src/association/data_association.cpp b/perception/autoware_object_merger/src/association/data_association.cpp
index f9f6834bfb289..ce5f477639a40 100644
--- a/perception/autoware_object_merger/src/association/data_association.cpp
+++ b/perception/autoware_object_merger/src/association/data_association.cpp
@@ -14,8 +14,8 @@
 
 #include "association/data_association.hpp"
 
-#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "association/solver/gnn_solver.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "object_recognition_utils/object_recognition_utils.hpp"
 
 #include <algorithm>
diff --git a/perception/autoware_object_merger/src/association/data_association.hpp b/perception/autoware_object_merger/src/association/data_association.hpp
index 4cf3060ca52b2..ea4a71cefd903 100644
--- a/perception/autoware_object_merger/src/association/data_association.hpp
+++ b/perception/autoware_object_merger/src/association/data_association.hpp
@@ -16,8 +16,8 @@
 // Author: v1.0 Yukihiro Saito
 //
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
+#ifndef ASSOCIATION__DATA_ASSOCIATION_HPP_
+#define ASSOCIATION__DATA_ASSOCIATION_HPP_
 
 #define EIGEN_MPL2_ONLY
 
@@ -62,4 +62,4 @@ class DataAssociation
 
 }  // namespace autoware::object_merger
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
+#endif  // ASSOCIATION__DATA_ASSOCIATION_HPP_
diff --git a/perception/autoware_object_merger/src/association/solver/gnn_solver.hpp b/perception/autoware_object_merger/src/association/solver/gnn_solver.hpp
index d43982f644d5c..d89c0c8eee0b5 100644
--- a/perception/autoware_object_merger/src/association/solver/gnn_solver.hpp
+++ b/perception/autoware_object_merger/src/association/solver/gnn_solver.hpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#define ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
 
 #include "association/solver/gnn_solver_interface.hpp"
 #include "association/solver/mu_ssp.hpp"
 #include "association/solver/ssp.hpp"
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#endif  // ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
diff --git a/perception/autoware_object_merger/src/association/solver/gnn_solver_interface.hpp b/perception/autoware_object_merger/src/association/solver/gnn_solver_interface.hpp
index 6a0702f056ba7..c485c9a8eaccd 100644
--- a/perception/autoware_object_merger/src/association/solver/gnn_solver_interface.hpp
+++ b/perception/autoware_object_merger/src/association/solver/gnn_solver_interface.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#define ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
 
 #include <unordered_map>
 #include <vector>
@@ -32,4 +32,4 @@ class GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#endif  // ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
diff --git a/perception/autoware_object_merger/src/association/solver/mu_ssp.hpp b/perception/autoware_object_merger/src/association/solver/mu_ssp.hpp
index d080c943eac79..2662dca7e3e7d 100644
--- a/perception/autoware_object_merger/src/association/solver/mu_ssp.hpp
+++ b/perception/autoware_object_merger/src/association/solver/mu_ssp.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
+#ifndef ASSOCIATION__SOLVER__MU_SSP_HPP_
+#define ASSOCIATION__SOLVER__MU_SSP_HPP_
 
 #include "association/solver/gnn_solver_interface.hpp"
 
@@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
+#endif  // ASSOCIATION__SOLVER__MU_SSP_HPP_
diff --git a/perception/autoware_object_merger/src/association/solver/ssp.hpp b/perception/autoware_object_merger/src/association/solver/ssp.hpp
index c109731f86202..f599d670afa17 100644
--- a/perception/autoware_object_merger/src/association/solver/ssp.hpp
+++ b/perception/autoware_object_merger/src/association/solver/ssp.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
+#ifndef ASSOCIATION__SOLVER__SSP_HPP_
+#define ASSOCIATION__SOLVER__SSP_HPP_
 
 #include "association/solver/gnn_solver_interface.hpp"
 
@@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
+#endif  // ASSOCIATION__SOLVER__SSP_HPP_
diff --git a/perception/autoware_object_merger/src/object_association_merger_node.hpp b/perception/autoware_object_merger/src/object_association_merger_node.hpp
index 57975f2759843..939e488446d0b 100644
--- a/perception/autoware_object_merger/src/object_association_merger_node.hpp
+++ b/perception/autoware_object_merger/src/object_association_merger_node.hpp
@@ -15,10 +15,10 @@
 #ifndef OBJECT_ASSOCIATION_MERGER_NODE_HPP_
 #define OBJECT_ASSOCIATION_MERGER_NODE_HPP_
 
+#include "association/data_association.hpp"
 #include "autoware/universe_utils/ros/debug_publisher.hpp"
 #include "autoware/universe_utils/ros/published_time_publisher.hpp"
 #include "autoware/universe_utils/system/stop_watch.hpp"
-#include "association/data_association.hpp"
 
 #include <rclcpp/rclcpp.hpp>