diff --git a/planning/autoware_obstacle_stop_planner/src/adaptive_cruise_control.hpp b/planning/autoware_obstacle_stop_planner/src/adaptive_cruise_control.hpp
index 9836d1822e43b..25664b14320c1 100644
--- a/planning/autoware_obstacle_stop_planner/src/adaptive_cruise_control.hpp
+++ b/planning/autoware_obstacle_stop_planner/src/adaptive_cruise_control.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_STOP_PLANNER__ADAPTIVE_CRUISE_CONTROL_HPP_
-#define OBSTACLE_STOP_PLANNER__ADAPTIVE_CRUISE_CONTROL_HPP_
+#ifndef ADAPTIVE_CRUISE_CONTROL_HPP_
+#define ADAPTIVE_CRUISE_CONTROL_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -234,4 +234,4 @@ class AdaptiveCruiseController
 
 }  // namespace autoware::motion_planning
 
-#endif  // OBSTACLE_STOP_PLANNER__ADAPTIVE_CRUISE_CONTROL_HPP_
+#endif  // ADAPTIVE_CRUISE_CONTROL_HPP_
diff --git a/planning/autoware_obstacle_stop_planner/src/debug_marker.hpp b/planning/autoware_obstacle_stop_planner/src/debug_marker.hpp
index 9992c635c1d1d..b37bdb59c9289 100644
--- a/planning/autoware_obstacle_stop_planner/src/debug_marker.hpp
+++ b/planning/autoware_obstacle_stop_planner/src/debug_marker.hpp
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef OBSTACLE_STOP_PLANNER__DEBUG_MARKER_HPP_
-#define OBSTACLE_STOP_PLANNER__DEBUG_MARKER_HPP_
+#ifndef DEBUG_MARKER_HPP_
+#define DEBUG_MARKER_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -156,4 +156,4 @@ class ObstacleStopPlannerDebugNode
 
 }  // namespace autoware::motion_planning
 
-#endif  // OBSTACLE_STOP_PLANNER__DEBUG_MARKER_HPP_
+#endif  // DEBUG_MARKER_HPP_
diff --git a/planning/autoware_obstacle_stop_planner/src/node.hpp b/planning/autoware_obstacle_stop_planner/src/node.hpp
index c3c5330f709c7..0cf03751f685f 100644
--- a/planning/autoware_obstacle_stop_planner/src/node.hpp
+++ b/planning/autoware_obstacle_stop_planner/src/node.hpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_STOP_PLANNER__NODE_HPP_
-#define OBSTACLE_STOP_PLANNER__NODE_HPP_
+#ifndef NODE_HPP_
+#define NODE_HPP_
 
+#include "adaptive_cruise_control.hpp"
 #include "autoware/universe_utils/ros/logger_level_configure.hpp"
 #include "autoware/universe_utils/system/stop_watch.hpp"
-#include "adaptive_cruise_control.hpp"
 #include "debug_marker.hpp"
 #include "planner_data.hpp"
 
@@ -321,4 +321,4 @@ class ObstacleStopPlannerNode : public rclcpp::Node
 };
 }  // namespace autoware::motion_planning
 
-#endif  // OBSTACLE_STOP_PLANNER__NODE_HPP_
+#endif  // NODE_HPP_
diff --git a/planning/autoware_obstacle_stop_planner/src/planner_data.hpp b/planning/autoware_obstacle_stop_planner/src/planner_data.hpp
index 40d8ff4be9129..bb9cbd59423e9 100644
--- a/planning/autoware_obstacle_stop_planner/src/planner_data.hpp
+++ b/planning/autoware_obstacle_stop_planner/src/planner_data.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_STOP_PLANNER__PLANNER_DATA_HPP_
-#define OBSTACLE_STOP_PLANNER__PLANNER_DATA_HPP_
+#ifndef PLANNER_DATA_HPP_
+#define PLANNER_DATA_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -284,4 +284,4 @@ struct PlannerData
 
 }  // namespace autoware::motion_planning
 
-#endif  // OBSTACLE_STOP_PLANNER__PLANNER_DATA_HPP_
+#endif  // PLANNER_DATA_HPP_
diff --git a/planning/autoware_obstacle_stop_planner/src/planner_utils.hpp b/planning/autoware_obstacle_stop_planner/src/planner_utils.hpp
index 41f7087198c7b..24086ece223c0 100644
--- a/planning/autoware_obstacle_stop_planner/src/planner_utils.hpp
+++ b/planning/autoware_obstacle_stop_planner/src/planner_utils.hpp
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_STOP_PLANNER__PLANNER_UTILS_HPP_
-#define OBSTACLE_STOP_PLANNER__PLANNER_UTILS_HPP_
+#ifndef PLANNER_UTILS_HPP_
+#define PLANNER_UTILS_HPP_
 
 #include "planner_data.hpp"
 
@@ -151,4 +151,4 @@ rclcpp::SubscriptionOptions createSubscriptionOptions(rclcpp::Node * node_ptr);
 
 }  // namespace autoware::motion_planning
 
-#endif  // OBSTACLE_STOP_PLANNER__PLANNER_UTILS_HPP_
+#endif  // PLANNER_UTILS_HPP_