From 3fe7f045031f060fe7d52f52191c47bf25ee4666 Mon Sep 17 00:00:00 2001
From: Masaya Kataoka <ms.kataoka@gmail.com>
Date: Fri, 5 Apr 2024 10:56:45 +0900
Subject: [PATCH] remove // headers in STL comment

Signed-off-by: Masaya Kataoka <ms.kataoka@gmail.com>
---
 docs/developer_guide/TrafficSimulator.md             |  3 ---
 .../include/cpp_mock_scenarios/cpp_scenario_node.hpp |  8 +++-----
 .../src/behavior_plugin/load_do_nothing_plugin.cpp   |  6 ++----
 .../src/collision/crashing_npc.cpp                   |  6 ++----
 .../src/collision/spawn_with_offset.cpp              |  6 ++----
 .../src/crosswalk/stop_at_crosswalk.cpp              |  6 ++----
 .../follow_front_entity/accelerate_and_follow.cpp    |  6 ++----
 .../follow_front_entity/decelerate_and_follow.cpp    |  6 ++----
 .../follow_lane/acquire_position_in_world_frame.cpp  |  6 ++----
 .../src/follow_lane/assign_route_in_world_frame.cpp  |  6 ++----
 .../src/follow_lane/cancel_request.cpp               |  6 ++----
 .../src/follow_lane/follow_with_offset.cpp           |  6 ++----
 .../src/lane_change/lanechange_left.cpp              |  6 ++----
 .../src/lane_change/lanechange_left_with_id.cpp      |  6 ++----
 .../src/lane_change/lanechange_linear.cpp            |  6 ++----
 .../lanechange_linear_lateral_velocity.cpp           |  6 ++----
 .../src/lane_change/lanechange_linear_time.cpp       |  6 ++----
 .../lane_change/lanechange_longitudinal_distance.cpp |  6 ++----
 .../src/lane_change/lanechange_right.cpp             |  6 ++----
 .../src/lane_change/lanechange_right_with_id.cpp     |  6 ++----
 .../src/lane_change/lanechange_time.cpp              |  6 ++----
 .../get_distance_in_lane_coordinate_distance.cpp     |  6 ++----
 .../src/measurement/get_distance_to_lane_bound.cpp   |  6 ++----
 mock/cpp_mock_scenarios/src/merge/merge_left.cpp     |  6 ++----
 .../src/metrics/traveled_distance.cpp                | 12 +++++-------
 .../src/move_backward/move_backward.cpp              |  6 ++----
 .../src/pedestrian/walk_straight.cpp                 |  6 ++----
 .../src/random_scenario/random001.cpp                |  8 +++-----
 .../src/speed_planning/request_speed_change.cpp      |  6 ++----
 .../request_speed_change_continuous_false.cpp        |  6 ++----
 .../speed_planning/request_speed_change_relative.cpp |  6 ++----
 .../src/speed_planning/request_speed_change_step.cpp |  6 ++----
 .../request_speed_change_with_limit.cpp              |  6 ++----
 .../request_speed_change_with_time_constraint.cpp    |  6 ++----
 ...uest_speed_change_with_time_constraint_linear.cpp |  6 ++----
 ...st_speed_change_with_time_constraint_relative.cpp |  6 ++----
 .../src/traffic_simulation_demo.cpp                  |  6 ++----
 37 files changed, 77 insertions(+), 152 deletions(-)

diff --git a/docs/developer_guide/TrafficSimulator.md b/docs/developer_guide/TrafficSimulator.md
index a2063379add..67d8839a7a1 100644
--- a/docs/developer_guide/TrafficSimulator.md
+++ b/docs/developer_guide/TrafficSimulator.md
@@ -26,10 +26,7 @@ You can also see the detailed documentation of the API classes [here](https://ti
 #include <traffic_simulator/api/api.hpp>
 #include <quaternion_operation/quaternion_operation.h>
 #include <ament_index_cpp/get_package_share_directory.hpp>
-
 #include <rclcpp/rclcpp.hpp>
-
-// headers in STL
 #include <memory>
 #include <vector>
 #include <string>
diff --git a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp
index cee1618f281..5989f077922 100644
--- a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp
+++ b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp
@@ -15,14 +15,12 @@
 #ifndef CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_
 #define CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_
 
-#include <rclcpp/rclcpp.hpp>
-#include <simple_junit/junit5.hpp>
-#include <traffic_simulator/api/api.hpp>
-
-// headers in STL
 #include <limits>
 #include <memory>
+#include <rclcpp/rclcpp.hpp>
+#include <simple_junit/junit5.hpp>
 #include <string>
+#include <traffic_simulator/api/api.hpp>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp
index d511b065fe7..124f53f1597 100644
--- a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp
+++ b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp
index f85738e8817..a7cb7b95605 100644
--- a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp
+++ b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp
index 7210d5c8bdc..04fa1eceac6 100644
--- a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp
+++ b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp
index 3e433423821..cd19c42a469 100644
--- a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp
+++ b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp
index d71729b2a30..d89f8584c03 100644
--- a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp
index 24108503cb6..6079e54af5e 100644
--- a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp
index e2c477b79e3..9ca26be1585 100644
--- a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp
index 3631456c15a..ea6d6cbf02d 100644
--- a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp
index d21a4889826..acb92544a19 100644
--- a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp
index 38bba72a680..dc2d0df7616 100644
--- a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp
+++ b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp
index e7ad9daa2a0..0da53d6be17 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp
index b49470be49a..f44fd8cf1db 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp
index a22427f0691..96e4f951e36 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp
index 5f81424dced..5fb7bf04e9c 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp
index a0581369b18..ce85da9136b 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp
index c822a005b25..18b71d0914a 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp
index 491f557bd4b..99a832208b4 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp
index 9ebd20c6b51..aca94784ae8 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp
index 3d815d19113..d51f0629965 100644
--- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp
+++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp
index 4d51b8dd65c..373ba5d72de 100644
--- a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp
+++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp
index 0ffc13ec20b..b059a66602b 100644
--- a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp
+++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp
index 1dd1ab4738a..58657664c30 100644
--- a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp
+++ b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp
index ee1f035b666..a9fb6e778d1 100644
--- a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp
+++ b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp
@@ -15,22 +15,20 @@
 #include <quaternion_operation/quaternion_operation.h>
 
 #include <ament_index_cpp/get_package_share_directory.hpp>
+#include <cmath>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <limits>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
+#include <vector>
 
 #include "rclcpp/logger.hpp"
 #include "rclcpp/logging.hpp"
 
-// headers in STL
-#include <cmath>
-#include <limits>
-#include <memory>
-#include <string>
-#include <vector>
-
 namespace cpp_mock_scenarios
 {
 class TraveledDistanceScenario : public cpp_mock_scenarios::CppScenarioNode
diff --git a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp
index 33638138c07..86472368741 100644
--- a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp
+++ b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp
index 54478ddc5ab..c43a293acaa 100644
--- a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp
+++ b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp
index 07c451dcb0c..18ba59f2115 100644
--- a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp
+++ b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp
@@ -17,15 +17,13 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <random001_parameters.hpp>
+#include <random>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <random>
-#include <string>
 #include <vector>
 
 class RandomScenario : public cpp_mock_scenarios::CppScenarioNode
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp
index 94844fabf3f..79b7c5dfb05 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp
index 7a83e377531..b49c3b12311 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp
index c1c14e5e77d..87721639833 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp
index 7e6d66932bc..2cdec5c0d60 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp
index 675181e00c4..5e9e161d001 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp
index f486fcec618..3552d6dbb75 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp
index 144857533df..b6999ecd263 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp
index 9336be41024..be3fa4e59d9 100644
--- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp
+++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios
diff --git a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp
index a3c311ad6a6..d323f921542 100644
--- a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp
+++ b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp
@@ -17,13 +17,11 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <cpp_mock_scenarios/catalogs.hpp>
 #include <cpp_mock_scenarios/cpp_scenario_node.hpp>
+#include <memory>
 #include <rclcpp/rclcpp.hpp>
+#include <string>
 #include <traffic_simulator/api/api.hpp>
 #include <traffic_simulator_msgs/msg/behavior_parameter.hpp>
-
-// headers in STL
-#include <memory>
-#include <string>
 #include <vector>
 
 namespace cpp_mock_scenarios