From f85c5a8edaf3ba4e501dd4bfde0fecd598f2fa37 Mon Sep 17 00:00:00 2001
From: sea-bass <sebas.a.castro@gmail.com>
Date: Mon, 20 Jan 2025 13:05:29 -0500
Subject: [PATCH] Update includes for generate_parameter_library 0.4.0

---
 .../moveit/online_signal_smoothing/acceleration_filter.hpp     | 2 +-
 .../moveit/online_signal_smoothing/butterworth_filter.hpp      | 2 +-
 .../include/moveit/online_signal_smoothing/ruckig_filter.hpp   | 2 +-
 .../cached_ik_kinematics_plugin.hpp                            | 2 +-
 .../templates/ikfast61_moveit_plugin_template.cpp              | 2 +-
 .../moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp     | 2 +-
 .../moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp     | 2 +-
 .../pilz_industrial_motion_planner/command_list_manager.hpp    | 2 +-
 .../pilz_industrial_motion_planner/limits_container.hpp        | 2 +-
 .../pilz_industrial_motion_planner.hpp                         | 2 +-
 .../src/command_list_manager.cpp                               | 2 +-
 .../src/pilz_industrial_motion_planner.cpp                     | 2 +-
 .../unit_tests/src/unittest_trajectory_generator_common.cpp    | 2 +-
 .../include/stomp_moveit/stomp_moveit_planning_context.hpp     | 2 +-
 moveit_planners/stomp/src/stomp_moveit_planning_context.cpp    | 2 +-
 .../src/prbt_manipulator_ikfast_moveit_plugin.cpp              | 2 +-
 .../src/hybrid_planning_manager.cpp                            | 2 +-
 .../local_planner_component/src/local_planner_component.cpp    | 2 +-
 .../moveit_servo/include/moveit_servo/collision_monitor.hpp    | 2 +-
 moveit_ros/moveit_servo/include/moveit_servo/servo.hpp         | 2 +-
 moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp  | 2 +-
 .../kinematics_plugin_loader/kinematics_plugin_loader.hpp      | 2 +-
 .../include/moveit/planning_pipeline/planning_pipeline.hpp     | 2 +-
 .../src/check_for_stacked_constraints.cpp                      | 2 +-
 .../src/check_start_state_bounds.cpp                           | 2 +-
 .../src/check_start_state_collision.cpp                        | 2 +-
 .../src/validate_workspace_bounds.cpp                          | 2 +-
 .../src/add_time_optimal_parameterization.cpp                  | 2 +-
 .../src/display_motion_path.cpp                                | 2 +-
 .../planning_response_adapter_plugins/src/validate_path.cpp    | 3 ++-
 30 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
index def9fa48ec..8a542983ba 100644
--- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
+++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
@@ -78,7 +78,7 @@ c --------x--- v   |
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/robot_state/robot_state.hpp>
 #include <moveit/utils/logger.hpp>
-#include <moveit_acceleration_filter_parameters.hpp>
+#include <moveit_core/moveit_acceleration_filter_parameters.hpp>
 
 #include <osqp.h>
 #include <types.h>
diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
index aa7d4af124..ae153fbba8 100644
--- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
+++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
@@ -41,9 +41,9 @@
 
 #include <cstddef>
 
-#include <moveit_butterworth_filter_parameters.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
+#include <moveit_core/moveit_butterworth_filter_parameters.hpp>
 
 namespace online_signal_smoothing
 {
diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
index db523cfa2e..f5fddba4d0 100644
--- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
+++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
@@ -42,7 +42,7 @@ Description: Applies jerk/acceleration/velocity limits to online motion commands
 
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
-#include <moveit_ruckig_filter_parameters.hpp>
+#include <moveit_core/moveit_ruckig_filter_parameters.hpp>
 
 #include <ruckig/ruckig.hpp>
 
diff --git a/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp b/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
index a0cce0ab4b..dca7185a75 100644
--- a/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
+++ b/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
@@ -55,8 +55,8 @@
 #include <unordered_map>
 #include <utility>
 #include <filesystem>
-#include <cached_ik_kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <moveit_kinematics/cached_ik_kinematics_parameters.hpp>
 
 namespace cached_ik_kinematics_plugin
 {
diff --git a/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp b/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp
index 49f506b420..250fdca17b 100644
--- a/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp
+++ b/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp
@@ -47,8 +47,8 @@
 #include <Eigen/Geometry>
 #include <tf2_kdl/tf2_kdl.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
-#include <ikfast_kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <moveit_kinematics/ikfast_kinematics_parameters.hpp>
 
 using namespace moveit::core;
 
diff --git a/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp b/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp
index f6bb09f0e5..710e560d33 100644
--- a/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp
+++ b/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp
@@ -39,7 +39,6 @@
 // ROS
 #include <rclcpp/rclcpp.hpp>
 #include <random_numbers/random_numbers.h>
-#include <kdl_kinematics_parameters.hpp>
 
 // ROS msgs
 #include <geometry_msgs/msg/pose_stamped.hpp>
@@ -58,6 +57,7 @@
 #include <moveit/kdl_kinematics_plugin/joint_mimic.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/robot_state/robot_state.hpp>
+#include <moveit_kinematics/kdl_kinematics_parameters.hpp>
 
 #include <cfloat>
 
diff --git a/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp b/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp
index 84b2289ad3..6a2f11da4a 100644
--- a/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp
+++ b/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp
@@ -43,7 +43,6 @@
 
 // ROS2
 #include <rclcpp/rclcpp.hpp>
-#include <srv_kinematics_parameters.hpp>
 
 // System
 #include <memory>
@@ -56,6 +55,7 @@
 // MoveIt
 #include <moveit/kinematics_base/kinematics_base.hpp>
 #include <moveit/robot_state/robot_state.hpp>
+#include <moveit_kinematics/srv_kinematics_parameters.hpp>
 
 namespace srv_kinematics_plugin
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp
index a3a64b6dfe..213cb3b5ad 100644
--- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp
+++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp
@@ -48,7 +48,7 @@
 #include <pilz_industrial_motion_planner/trajectory_blender.hpp>
 #include <pilz_industrial_motion_planner/trajectory_generation_exceptions.hpp>
 
-#include <cartesian_limits_parameters.hpp>
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp
index e26a52e276..42e2df3f88 100644
--- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp
+++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp
@@ -37,7 +37,7 @@
 #include <pilz_industrial_motion_planner/joint_limits_container.hpp>
 #include <math.h>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp
index 535fbd9644..e5bab155ce 100644
--- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp
+++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp
@@ -45,7 +45,7 @@
 #include <pluginlib/class_loader.hpp>
 #include <memory>
 
-#include <cartesian_limits_parameters.hpp>
+#include </pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp b/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
index d222dd1e7c..03083f3ae5 100644
--- a/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
+++ b/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
@@ -44,7 +44,7 @@
 #include <moveit/robot_state/conversions.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 #include <pilz_industrial_motion_planner/joint_limits_aggregator.hpp>
 #include <pilz_industrial_motion_planner/tip_frame_getter.hpp>
 #include <pilz_industrial_motion_planner/trajectory_blend_request.hpp>
diff --git a/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp b/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp
index fbf19bf372..c3c3e83034 100644
--- a/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp
+++ b/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp
@@ -40,7 +40,7 @@
 #include <pilz_industrial_motion_planner/planning_context_loader_ptp.hpp>
 #include <pilz_industrial_motion_planner/planning_exceptions.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 #include <pilz_industrial_motion_planner/joint_limits_aggregator.hpp>
 
 #include <pluginlib/class_list_macros.hpp>
diff --git a/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp b/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp
index fbc31afa11..9c491789c3 100644
--- a/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp
+++ b/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp
@@ -53,7 +53,7 @@
 
 #include <rclcpp/rclcpp.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 const std::string PARAM_MODEL_NO_GRIPPER_NAME{ "robot_description" };
 const std::string PARAM_MODEL_WITH_GRIPPER_NAME{ "robot_description_pg70" };
diff --git a/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp b/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp
index a5add5e515..dcce1be46c 100644
--- a/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp
+++ b/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp
@@ -41,7 +41,7 @@
 
 #include <moveit/planning_interface/planning_interface.hpp>
 
-#include <stomp_moveit_parameters.hpp>
+#include <moveit_planners_stomp/stomp_moveit_parameters.hpp>
 
 // Forward declaration
 namespace stomp
diff --git a/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp b/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp
index 4d37e61de6..52a5413588 100644
--- a/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp
+++ b/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp
@@ -47,7 +47,7 @@
 #include <stomp_moveit/noise_generators.hpp>
 #include <stomp_moveit/cost_functions.hpp>
 #include <stomp_moveit/stomp_moveit_task.hpp>
-#include <stomp_moveit_parameters.hpp>
+#include <moveit_planners_stomp/stomp_moveit_parameters.hpp>
 
 #include <moveit/constraint_samplers/constraint_sampler_manager.hpp>
 #include <moveit/robot_state/conversions.hpp>
diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp
index 4ea25702de..b1929ff008 100644
--- a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp
+++ b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp
@@ -52,7 +52,7 @@
 #include <tf2_kdl/tf2_kdl.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
 #include <moveit/robot_state/robot_state.hpp>
-#include <prbt_ikfast_kinematics_parameters.hpp>
+#include <moveit_resources_prbt_ikfast_manipulator_plugin/prbt_ikfast_kinematics_parameters.hpp>
 
 using namespace moveit::core;
 
diff --git a/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp b/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp
index ec1e3a2f95..44c0f0f26c 100644
--- a/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp
+++ b/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp
@@ -34,7 +34,7 @@
 
 #include <moveit/hybrid_planning_manager/hybrid_planning_manager.hpp>
 #include <moveit/hybrid_planning_manager/hybrid_planning_events.hpp>
-#include <hp_manager_parameters.hpp>
+#include <moveit_hybrid_planning/hp_manager_parameters.hpp>
 #include <moveit/utils/logger.hpp>
 
 namespace moveit::hybrid_planning
diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp
index f9914f2ee9..cff465afe7 100644
--- a/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp
+++ b/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp
@@ -33,7 +33,7 @@
  *********************************************************************/
 
 #include <moveit/local_planner/local_planner_component.hpp>
-#include <local_planner_parameters.hpp>
+#include <moveit_hybrid_planning/local_planner_parameters.hpp>
 
 #include <moveit/planning_scene/planning_scene.hpp>
 #include <moveit/robot_state/robot_state.hpp>
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp b/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp
index 9752e5feb6..91c1dfdb9a 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp
@@ -41,9 +41,9 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/planning_scene/planning_scene.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 
 namespace moveit_servo
 {
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
index d0331c650d..c9a99151d4 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -41,8 +41,8 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/collision_monitor.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/utils/command.hpp>
 #include <moveit_servo/utils/datatypes.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp b/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp
index 6d44c18298..1da9fd7e5e 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp
@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/utils/datatypes.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/robot_model/joint_model_group.hpp>
diff --git a/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp b/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp
index e7494cf73c..968beae2f6 100644
--- a/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp
+++ b/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp
@@ -39,8 +39,8 @@
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
-#include <kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <moveit_ros_planning/kinematics_parameters.hpp>
 
 namespace kinematics_plugin_loader
 {
diff --git a/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp b/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp
index 18abda399b..f5681eeb19 100644
--- a/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp
+++ b/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp
@@ -49,7 +49,7 @@
 #include <moveit_msgs/msg/pipeline_state.hpp>
 #include <memory>
 #include <moveit_planning_pipeline_export.h>
-#include <planning_pipeline_parameters.hpp>
+#include <moveit_ros_planning/planning_pipeline_parameters.hpp>
 
 namespace planning_pipeline
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp
index e0b60847c1..08727ab521 100644
--- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp
+++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp
@@ -43,7 +43,7 @@
 #include <rclcpp/node.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp
index 4b22eee85a..b0e29a46aa 100644
--- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp
+++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp
@@ -53,7 +53,7 @@
 #include <rclcpp/parameter_value.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp
index 99ccf820d7..5843dde8dc 100644
--- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp
+++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp
@@ -45,7 +45,7 @@
 #include <rclcpp/parameter_value.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp
index a21dffe61e..df87b43326 100644
--- a/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp
+++ b/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp
@@ -44,7 +44,7 @@
 #include <rclcpp/node.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp
index b5097dce5f..fd2a764c0b 100644
--- a/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp
+++ b/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp
@@ -39,7 +39,7 @@
 #include <class_loader/class_loader.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
 
 namespace default_planning_response_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp
index bc6fa5f605..0c25d552ae 100644
--- a/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp
+++ b/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp
@@ -42,7 +42,7 @@
 #include <moveit/utils/logger.hpp>
 #include <moveit_msgs/msg/display_trajectory.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
 
 namespace default_planning_response_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp
index 1284ba821b..25384fc704 100644
--- a/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp
+++ b/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp
@@ -42,7 +42,8 @@
 #include <visualization_msgs/msg/marker_array.hpp>
 #include <moveit/collision_detection/collision_tools.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
+
 namespace default_planning_response_adapters
 {
 /**