diff --git a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp index 6b00a0dbdd4dc..e87de2d15e75c 100644 --- a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp +++ b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp @@ -15,36 +15,25 @@ #ifndef AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_ #define AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_ -#include -#include -#include -#include -#include -#include +#include #include #include #include #include #include +#include #include #include #include #include #include -#include -#include #include #include #include #include -#include -#include #include -#include -#include -#include #include #include @@ -65,18 +54,13 @@ using autoware_planning_msgs::msg::Trajectory; using tier4_planning_msgs::msg::PathPointWithLaneId; using tier4_planning_msgs::msg::PathWithLaneId; using RouteSections = std::vector; -using autoware::universe_utils::createPoint; -using autoware::universe_utils::createQuaternionFromRPY; using geometry_msgs::msg::Point; using geometry_msgs::msg::Pose; using geometry_msgs::msg::PoseStamped; -using geometry_msgs::msg::TransformStamped; using nav_msgs::msg::OccupancyGrid; using nav_msgs::msg::Odometry; -using sensor_msgs::msg::PointCloud2; using tf2_msgs::msg::TFMessage; using tier4_planning_msgs::msg::Scenario; -using unique_identifier_msgs::msg::UUID; /** * @brief Creates a Pose message with the specified position and orientation. diff --git a/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp b/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp index 754f809fa3f23..6e9902a3ec3b5 100644 --- a/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp +++ b/common/autoware_test_utils/include/autoware_test_utils/mock_data_parser.hpp @@ -15,6 +15,7 @@ #ifndef AUTOWARE_TEST_UTILS__MOCK_DATA_PARSER_HPP_ #define AUTOWARE_TEST_UTILS__MOCK_DATA_PARSER_HPP_ +#include #include #include #include diff --git a/common/autoware_test_utils/src/autoware_test_utils.cpp b/common/autoware_test_utils/src/autoware_test_utils.cpp index 2c06d00263562..f62c47b67fda6 100644 --- a/common/autoware_test_utils/src/autoware_test_utils.cpp +++ b/common/autoware_test_utils/src/autoware_test_utils.cpp @@ -13,20 +13,28 @@ // limitations under the License. #include +#include +#include +#include +#include +#include #include #include -#include -#include -#include #include #include +#include +#include #include namespace autoware::test_utils { +using autoware::universe_utils::createPoint; +using autoware::universe_utils::createQuaternionFromRPY; +using geometry_msgs::msg::TransformStamped; + geometry_msgs::msg::Pose createPose( double x, double y, double z, double roll, double pitch, double yaw) { diff --git a/common/autoware_test_utils/src/mock_data_parser.cpp b/common/autoware_test_utils/src/mock_data_parser.cpp index e9c7911af0e44..b4b2a77edbc07 100644 --- a/common/autoware_test_utils/src/mock_data_parser.cpp +++ b/common/autoware_test_utils/src/mock_data_parser.cpp @@ -16,13 +16,6 @@ #include -#include -#include -#include -#include - -#include - #include #include #include diff --git a/planning/autoware_planning_test_manager/include/autoware_planning_test_manager/autoware_planning_test_manager_utils.hpp b/planning/autoware_planning_test_manager/include/autoware_planning_test_manager/autoware_planning_test_manager_utils.hpp index 9a93b647dac02..63ad2ecce09cc 100644 --- a/planning/autoware_planning_test_manager/include/autoware_planning_test_manager/autoware_planning_test_manager_utils.hpp +++ b/planning/autoware_planning_test_manager/include/autoware_planning_test_manager/autoware_planning_test_manager_utils.hpp @@ -15,6 +15,7 @@ #ifndef AUTOWARE_PLANNING_TEST_MANAGER__AUTOWARE_PLANNING_TEST_MANAGER_UTILS_HPP_ #define AUTOWARE_PLANNING_TEST_MANAGER__AUTOWARE_PLANNING_TEST_MANAGER_UTILS_HPP_ #include +#include #include #include