diff --git a/control/autoware_autonomous_emergency_braking/package.xml b/control/autoware_autonomous_emergency_braking/package.xml
index 364a9dc66322b..7684aae3f4831 100644
--- a/control/autoware_autonomous_emergency_braking/package.xml
+++ b/control/autoware_autonomous_emergency_braking/package.xml
@@ -16,6 +16,8 @@
   <buildtool_depend>autoware_cmake</buildtool_depend>
   <test_depend>ament_cmake_ros</test_depend>
   <test_depend>ament_lint_auto</test_depend>
+  <test_depend>ament_lint_auto</test_depend>
+  <test_depend>autoware_lint_common</test_depend>
   <test_depend>autoware_lint_common</test_depend>
   <test_depend>autoware_test_utils</test_depend>
 
diff --git a/control/autoware_control_evaluator/include/autoware/control_evaluator/control_evaluator_node.hpp b/control/autoware_control_evaluator/include/autoware/control_evaluator/control_evaluator_node.hpp
index 4ff4765d48c08..99c04b10bd9db 100644
--- a/control/autoware_control_evaluator/include/autoware/control_evaluator/control_evaluator_node.hpp
+++ b/control/autoware_control_evaluator/include/autoware/control_evaluator/control_evaluator_node.hpp
@@ -47,7 +47,6 @@ using LaneletRoute = autoware_auto_planning_msgs::msg::HADMapRoute;
 using geometry_msgs::msg::AccelWithCovarianceStamped;
 using sensor_msgs::msg::Imu;
 
-
 /**
  * @brief Node for control evaluation
  */
@@ -64,8 +63,7 @@ class ControlEvaluatorNode : public rclcpp::Node
 
   DiagnosticStatus generateAEBDiagnosticStatus(const DiagnosticStatus & diag);
   DiagnosticStatus generateLaneletDiagnosticStatus(const Pose & ego_pose) const;
-  DiagnosticStatus generateKinematicStateDiagnosticStatus(
-    const Odometry & odom, const Imu & imu);
+  DiagnosticStatus generateKinematicStateDiagnosticStatus(const Odometry & odom, const Imu & imu);
 
   void onDiagnostics(const DiagnosticArray::ConstSharedPtr diag_msg);
   void onTimer();
@@ -80,8 +78,7 @@ class ControlEvaluatorNode : public rclcpp::Node
     this, "~/input/odometry"};
   // autoware::universe_utils::InterProcessPollingSubscriber<AccelWithCovarianceStamped> accel_sub_{
   //   this, "~/input/acceleration"};
-  autoware::universe_utils::InterProcessPollingSubscriber<Imu> imu_sub_{
-    this, "~/input/imu"};
+  autoware::universe_utils::InterProcessPollingSubscriber<Imu> imu_sub_{this, "~/input/imu"};
   autoware::universe_utils::InterProcessPollingSubscriber<Trajectory> traj_sub_{
     this, "~/input/trajectory"};
   autoware::universe_utils::InterProcessPollingSubscriber<
diff --git a/control/autoware_control_evaluator/include/autoware/control_evaluator/metrics/deviation_metrics.hpp b/control/autoware_control_evaluator/include/autoware/control_evaluator/metrics/deviation_metrics.hpp
index 0602d76cb6268..82935147be716 100644
--- a/control/autoware_control_evaluator/include/autoware/control_evaluator/metrics/deviation_metrics.hpp
+++ b/control/autoware_control_evaluator/include/autoware/control_evaluator/metrics/deviation_metrics.hpp
@@ -15,8 +15,8 @@
 #ifndef AUTOWARE__CONTROL_EVALUATOR__METRICS__DEVIATION_METRICS_HPP_
 #define AUTOWARE__CONTROL_EVALUATOR__METRICS__DEVIATION_METRICS_HPP_
 
-#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"
 #include "autoware_auto_planning_msgs/msg/trajectory.hpp"
+#include "autoware_auto_planning_msgs/msg/trajectory_point.hpp"
 
 namespace control_diagnostics
 {
diff --git a/control/autoware_control_evaluator/package.xml b/control/autoware_control_evaluator/package.xml
index 78422ca66bb3d..12e68fb08f2f4 100644
--- a/control/autoware_control_evaluator/package.xml
+++ b/control/autoware_control_evaluator/package.xml
@@ -14,14 +14,14 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
-  <depend>autoware_evaluator_utils</depend>
-  <depend>tier4_autoware_utils</depend>
   <depend>autoware_auto_planning_msgs</depend>
-  <depend>route_handler</depend>
+  <depend>autoware_evaluator_utils</depend>
   <depend>diagnostic_msgs</depend>
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
+  <depend>route_handler</depend>
+  <depend>tier4_autoware_utils</depend>
   <!-- <depend>nav_msgs</depend> -->
 
   <test_depend>ament_cmake_ros</test_depend>