From cb02e9f5dd09695273f72baee81746e17f85148c Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Tue, 1 Sep 2026 17:48:20 +0200 Subject: [PATCH] granular rclcpp/rclcpp.hpp and include what you use Signed-off-by: Alejandro Hernandez Cordero --- .../minimal_action_client/member_functions.cpp | 13 +++++++++---- .../minimal_action_client/not_composable.cpp | 9 +++++++-- .../not_composable_with_cancel.cpp | 9 +++++++-- .../not_composable_with_feedback.cpp | 10 ++++++++-- .../minimal_action_server/member_functions.cpp | 12 ++++++++++-- .../minimal_action_server/not_composable.cpp | 12 ++++++++++-- .../minimal_action_server/single_goal.cpp | 13 +++++++++++-- .../minimal_composition/publisher_node.hpp | 7 ++++++- .../minimal_composition/subscriber_node.hpp | 4 +++- .../minimal_composition/src/composed.cpp | 4 +++- .../minimal_composition/src/publisher_node.cpp | 5 ++++- .../src/standalone_publisher.cpp | 4 +++- .../src/standalone_subscriber.cpp | 4 +++- .../src/subscriber_node.cpp | 3 ++- .../examples_rclcpp_cbg_executor/ping_node.hpp | 8 +++++--- .../examples_rclcpp_cbg_executor/pong_node.hpp | 6 ++++-- .../examples_rclcpp_cbg_executor/ping_node.cpp | 6 +++++- .../examples_rclcpp_cbg_executor/pong_node.cpp | 8 ++++++-- .../examples_rclcpp_cbg_executor/utilities.hpp | 4 +++- rclcpp/executors/cbg_executor/src/ping.cpp | 16 ++++------------ .../executors/cbg_executor/src/ping_pong.cpp | 14 ++++---------- rclcpp/executors/cbg_executor/src/pong.cpp | 14 ++++---------- .../multithreaded_executor.cpp | 14 +++++++++++++- rclcpp/services/async_client/main.cpp | 15 ++++++++++++++- rclcpp/services/minimal_client/main.cpp | 7 ++++++- rclcpp/services/minimal_service/main.cpp | 6 +++++- rclcpp/timers/minimal_timer/lambda.cpp | 6 +++++- .../timers/minimal_timer/member_function.cpp | 7 ++++++- rclcpp/topics/minimal_publisher/lambda.cpp | 8 +++++++- .../minimal_publisher/member_function.cpp | 8 +++++++- .../member_function_with_type_adapter.cpp | 8 +++++++- ...tion_with_unique_network_flow_endpoints.cpp | 10 +++++++++- ...member_function_with_wait_for_all_acked.cpp | 12 ++++++++++-- .../minimal_publisher/not_composable.cpp | 8 +++++++- .../minimal_subscriber/content_filtering.cpp | 10 +++++++++- rclcpp/topics/minimal_subscriber/lambda.cpp | 6 +++++- .../minimal_subscriber/member_function.cpp | 6 +++++- .../member_function_with_topic_statistics.cpp | 7 ++++++- .../member_function_with_type_adapter.cpp | 6 +++++- ...tion_with_unique_network_flow_endpoints.cpp | 8 +++++++- .../minimal_subscriber/not_composable.cpp | 8 +++++++- .../static_wait_set_subscriber.cpp | 15 +++++++++++++-- .../time_triggered_wait_set_subscriber.cpp | 15 +++++++++++++-- .../minimal_subscriber/wait_set_subscriber.cpp | 14 ++++++++++++-- rclcpp/wait_set/include/wait_set/listener.hpp | 7 ++++++- .../include/wait_set/random_listener.hpp | 5 +++-- .../include/wait_set/random_talker.hpp | 8 +++++++- rclcpp/wait_set/include/wait_set/talker.hpp | 7 ++++++- rclcpp/wait_set/src/executor_random_order.cpp | 5 +++-- rclcpp/wait_set/src/listener.cpp | 11 +++++++++-- rclcpp/wait_set/src/static_wait_set.cpp | 17 ++++++++++++++++- rclcpp/wait_set/src/talker.cpp | 4 +++- rclcpp/wait_set/src/thread_safe_wait_set.cpp | 12 +++++++++++- rclcpp/wait_set/src/wait_set.cpp | 12 +++++++++++- rclcpp/wait_set/src/wait_set_composed.cpp | 4 +++- rclcpp/wait_set/src/wait_set_random_order.cpp | 10 +++++++++- .../wait_set/src/wait_set_topics_and_timer.cpp | 13 ++++++++++++- .../wait_set_topics_with_different_rates.cpp | 18 +++++++++++++++--- 58 files changed, 413 insertions(+), 109 deletions(-) diff --git a/rclcpp/actions/minimal_action_client/member_functions.cpp b/rclcpp/actions/minimal_action_client/member_functions.cpp index f4b83e06e..26a46a872 100644 --- a/rclcpp/actions/minimal_action_client/member_functions.cpp +++ b/rclcpp/actions/minimal_action_client/member_functions.cpp @@ -15,13 +15,18 @@ #include #include #include -#include #include -#include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/client.hpp" +#include "rclcpp_action/client_goal_handle.hpp" +#include "rclcpp_action/create_client.hpp" class MinimalActionClient : public rclcpp::Node { diff --git a/rclcpp/actions/minimal_action_client/not_composable.cpp b/rclcpp/actions/minimal_action_client/not_composable.cpp index ab083f700..3668dfe30 100644 --- a/rclcpp/actions/minimal_action_client/not_composable.cpp +++ b/rclcpp/actions/minimal_action_client/not_composable.cpp @@ -16,8 +16,13 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/client_goal_handle.hpp" +#include "rclcpp_action/create_client.hpp" using Fibonacci = example_interfaces::action::Fibonacci; diff --git a/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp b/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp index 0710dc22a..ae2414f6a 100644 --- a/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp +++ b/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp @@ -15,8 +15,13 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/client_goal_handle.hpp" +#include "rclcpp_action/create_client.hpp" using Fibonacci = example_interfaces::action::Fibonacci; diff --git a/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp b/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp index 30c833052..dadd14466 100644 --- a/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp +++ b/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp @@ -17,8 +17,14 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/client.hpp" +#include "rclcpp_action/client_goal_handle.hpp" +#include "rclcpp_action/create_client.hpp" using Fibonacci = example_interfaces::action::Fibonacci; rclcpp::Node::SharedPtr g_node = nullptr; diff --git a/rclcpp/actions/minimal_action_server/member_functions.cpp b/rclcpp/actions/minimal_action_server/member_functions.cpp index c4af37a25..edb770c69 100644 --- a/rclcpp/actions/minimal_action_server/member_functions.cpp +++ b/rclcpp/actions/minimal_action_server/member_functions.cpp @@ -17,8 +17,16 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/rate.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/create_server.hpp" +#include "rclcpp_action/server.hpp" +#include "rclcpp_action/server_goal_handle.hpp" +#include "rclcpp_action/types.hpp" class MinimalActionServer : public rclcpp::Node { diff --git a/rclcpp/actions/minimal_action_server/not_composable.cpp b/rclcpp/actions/minimal_action_server/not_composable.cpp index 4b0948fbd..6dbd8bbe7 100644 --- a/rclcpp/actions/minimal_action_server/not_composable.cpp +++ b/rclcpp/actions/minimal_action_server/not_composable.cpp @@ -16,8 +16,16 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/rate.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/create_server.hpp" +#include "rclcpp_action/server.hpp" +#include "rclcpp_action/server_goal_handle.hpp" +#include "rclcpp_action/types.hpp" using Fibonacci = example_interfaces::action::Fibonacci; using GoalHandleFibonacci = rclcpp_action::ServerGoalHandle; diff --git a/rclcpp/actions/minimal_action_server/single_goal.cpp b/rclcpp/actions/minimal_action_server/single_goal.cpp index b170e9920..db019cea3 100644 --- a/rclcpp/actions/minimal_action_server/single_goal.cpp +++ b/rclcpp/actions/minimal_action_server/single_goal.cpp @@ -18,8 +18,17 @@ #include #include "example_interfaces/action/fibonacci.hpp" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp_action/rclcpp_action.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/executors/multi_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/rate.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp_action/create_server.hpp" +#include "rclcpp_action/server.hpp" +#include "rclcpp_action/server_goal_handle.hpp" +#include "rclcpp_action/types.hpp" class MinimalActionServer : public rclcpp::Node { diff --git a/rclcpp/composition/minimal_composition/include/minimal_composition/publisher_node.hpp b/rclcpp/composition/minimal_composition/include/minimal_composition/publisher_node.hpp index 95c29c4df..25ca08127 100644 --- a/rclcpp/composition/minimal_composition/include/minimal_composition/publisher_node.hpp +++ b/rclcpp/composition/minimal_composition/include/minimal_composition/publisher_node.hpp @@ -15,7 +15,12 @@ #ifndef MINIMAL_COMPOSITION__PUBLISHER_NODE_HPP_ #define MINIMAL_COMPOSITION__PUBLISHER_NODE_HPP_ -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" #include "std_msgs/msg/string.hpp" #include "minimal_composition/visibility.h" diff --git a/rclcpp/composition/minimal_composition/include/minimal_composition/subscriber_node.hpp b/rclcpp/composition/minimal_composition/include/minimal_composition/subscriber_node.hpp index e52152979..1861f47d5 100644 --- a/rclcpp/composition/minimal_composition/include/minimal_composition/subscriber_node.hpp +++ b/rclcpp/composition/minimal_composition/include/minimal_composition/subscriber_node.hpp @@ -15,7 +15,9 @@ #ifndef MINIMAL_COMPOSITION__SUBSCRIBER_NODE_HPP_ #define MINIMAL_COMPOSITION__SUBSCRIBER_NODE_HPP_ -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" #include "std_msgs/msg/string.hpp" #include "minimal_composition/visibility.h" diff --git a/rclcpp/composition/minimal_composition/src/composed.cpp b/rclcpp/composition/minimal_composition/src/composed.cpp index dba1ac0c2..a3a43839e 100644 --- a/rclcpp/composition/minimal_composition/src/composed.cpp +++ b/rclcpp/composition/minimal_composition/src/composed.cpp @@ -15,7 +15,9 @@ #include #include "minimal_composition/publisher_node.hpp" #include "minimal_composition/subscriber_node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" int main(int argc, char * argv[]) { diff --git a/rclcpp/composition/minimal_composition/src/publisher_node.cpp b/rclcpp/composition/minimal_composition/src/publisher_node.cpp index b21917a2c..36dad2789 100644 --- a/rclcpp/composition/minimal_composition/src/publisher_node.cpp +++ b/rclcpp/composition/minimal_composition/src/publisher_node.cpp @@ -13,9 +13,12 @@ // limitations under the License. #include +#include +#include #include "minimal_composition/publisher_node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node_options.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/composition/minimal_composition/src/standalone_publisher.cpp b/rclcpp/composition/minimal_composition/src/standalone_publisher.cpp index 3eb4eb067..0da3870b3 100644 --- a/rclcpp/composition/minimal_composition/src/standalone_publisher.cpp +++ b/rclcpp/composition/minimal_composition/src/standalone_publisher.cpp @@ -14,7 +14,9 @@ #include #include "minimal_composition/publisher_node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" int main(int argc, char * argv[]) { diff --git a/rclcpp/composition/minimal_composition/src/standalone_subscriber.cpp b/rclcpp/composition/minimal_composition/src/standalone_subscriber.cpp index fca148def..7f14e2432 100644 --- a/rclcpp/composition/minimal_composition/src/standalone_subscriber.cpp +++ b/rclcpp/composition/minimal_composition/src/standalone_subscriber.cpp @@ -14,7 +14,9 @@ #include #include "minimal_composition/subscriber_node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" int main(int argc, char * argv[]) { diff --git a/rclcpp/composition/minimal_composition/src/subscriber_node.cpp b/rclcpp/composition/minimal_composition/src/subscriber_node.cpp index 0f5e32cf1..8fffb79c5 100644 --- a/rclcpp/composition/minimal_composition/src/subscriber_node.cpp +++ b/rclcpp/composition/minimal_composition/src/subscriber_node.cpp @@ -13,7 +13,8 @@ // limitations under the License. #include "minimal_composition/subscriber_node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node_options.hpp" #include "std_msgs/msg/string.hpp" SubscriberNode::SubscriberNode(rclcpp::NodeOptions options) diff --git a/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/ping_node.hpp b/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/ping_node.hpp index c8ec52e49..2250709b2 100644 --- a/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/ping_node.hpp +++ b/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/ping_node.hpp @@ -17,11 +17,13 @@ #include #include -#include -#include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/time.hpp" +#include "rclcpp/timer.hpp" #include "std_msgs/msg/int32.hpp" namespace examples_rclcpp_cbg_executor diff --git a/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/pong_node.hpp b/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/pong_node.hpp index 7c02628f8..ad0f0fb08 100644 --- a/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/pong_node.hpp +++ b/rclcpp/executors/cbg_executor/include/examples_rclcpp_cbg_executor/pong_node.hpp @@ -17,9 +17,11 @@ #include #include -#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" #include "std_msgs/msg/int32.hpp" namespace examples_rclcpp_cbg_executor diff --git a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/ping_node.cpp b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/ping_node.cpp index 4b65cb733..1c5ffd76c 100644 --- a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/ping_node.cpp +++ b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/ping_node.cpp @@ -14,11 +14,15 @@ #include "examples_rclcpp_cbg_executor/ping_node.hpp" -#include +#include +#include #include #include #include +#include "rclcpp/logging.hpp" +#include "rclcpp/qos.hpp" + #include "./utilities.hpp" namespace examples_rclcpp_cbg_executor diff --git a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/pong_node.cpp b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/pong_node.cpp index 234ba13db..e64129271 100644 --- a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/pong_node.cpp +++ b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/pong_node.cpp @@ -14,11 +14,15 @@ #include "examples_rclcpp_cbg_executor/pong_node.hpp" -#include - #include +#include +#include #include +#include "rclcpp/callback_group.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription_options.hpp" + #include "./utilities.hpp" namespace examples_rclcpp_cbg_executor diff --git a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/utilities.hpp b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/utilities.hpp index 272295b54..e5b810f97 100644 --- a/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/utilities.hpp +++ b/rclcpp/executors/cbg_executor/src/examples_rclcpp_cbg_executor/utilities.hpp @@ -18,7 +18,9 @@ #include #include +#include #include +#include #include #include #include @@ -41,7 +43,7 @@ #include #endif -#include +#include "rclcpp/node.hpp" namespace examples_rclcpp_cbg_executor { diff --git a/rclcpp/executors/cbg_executor/src/ping.cpp b/rclcpp/executors/cbg_executor/src/ping.cpp index 99ad48721..787138beb 100644 --- a/rclcpp/executors/cbg_executor/src/ping.cpp +++ b/rclcpp/executors/cbg_executor/src/ping.cpp @@ -12,22 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include -#include -#include -#include #include -#include -#include #include -#include -#include "rclcpp/executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/utilities.hpp" #include "examples_rclcpp_cbg_executor/ping_node.hpp" #include "examples_rclcpp_cbg_executor/utilities.hpp" diff --git a/rclcpp/executors/cbg_executor/src/ping_pong.cpp b/rclcpp/executors/cbg_executor/src/ping_pong.cpp index 96bc21440..95cf9c312 100644 --- a/rclcpp/executors/cbg_executor/src/ping_pong.cpp +++ b/rclcpp/executors/cbg_executor/src/ping_pong.cpp @@ -13,21 +13,15 @@ // limitations under the License. #include -#include -#include #include -#include -#include -#include #include -#include -#include #include -#include -#include "rclcpp/executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/utilities.hpp" #include "examples_rclcpp_cbg_executor/ping_node.hpp" #include "examples_rclcpp_cbg_executor/pong_node.hpp" diff --git a/rclcpp/executors/cbg_executor/src/pong.cpp b/rclcpp/executors/cbg_executor/src/pong.cpp index f99ed5dec..d61ca0e80 100644 --- a/rclcpp/executors/cbg_executor/src/pong.cpp +++ b/rclcpp/executors/cbg_executor/src/pong.cpp @@ -13,21 +13,15 @@ // limitations under the License. #include -#include -#include #include -#include -#include -#include #include -#include -#include #include -#include -#include "rclcpp/executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/utilities.hpp" #include "examples_rclcpp_cbg_executor/pong_node.hpp" #include "examples_rclcpp_cbg_executor/utilities.hpp" diff --git a/rclcpp/executors/multithreaded_executor/multithreaded_executor.cpp b/rclcpp/executors/multithreaded_executor/multithreaded_executor.cpp index f14de5675..de37f89ea 100644 --- a/rclcpp/executors/multithreaded_executor/multithreaded_executor.cpp +++ b/rclcpp/executors/multithreaded_executor/multithreaded_executor.cpp @@ -13,13 +13,25 @@ #include #include +#include #include +#include #include #include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/executors/multi_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/time.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/services/async_client/main.cpp b/rclcpp/services/async_client/main.cpp index 8922dd7d9..498a654ed 100644 --- a/rclcpp/services/async_client/main.cpp +++ b/rclcpp/services/async_client/main.cpp @@ -14,14 +14,27 @@ #include #include +#include +#include +#include +#include #include #include +#include #include +#include #include #include #include "example_interfaces/srv/add_two_ints.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" using AddTwoInts = example_interfaces::srv::AddTwoInts; using namespace std::chrono_literals; diff --git a/rclcpp/services/minimal_client/main.cpp b/rclcpp/services/minimal_client/main.cpp index 34b0ed2f5..b5243e2ff 100644 --- a/rclcpp/services/minimal_client/main.cpp +++ b/rclcpp/services/minimal_client/main.cpp @@ -17,7 +17,12 @@ #include #include "example_interfaces/srv/add_two_ints.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" using AddTwoInts = example_interfaces::srv::AddTwoInts; diff --git a/rclcpp/services/minimal_service/main.cpp b/rclcpp/services/minimal_service/main.cpp index 3cf38fb33..49fb5d559 100644 --- a/rclcpp/services/minimal_service/main.cpp +++ b/rclcpp/services/minimal_service/main.cpp @@ -16,7 +16,11 @@ #include #include "example_interfaces/srv/add_two_ints.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" using AddTwoInts = example_interfaces::srv::AddTwoInts; rclcpp::Node::SharedPtr g_node = nullptr; diff --git a/rclcpp/timers/minimal_timer/lambda.cpp b/rclcpp/timers/minimal_timer/lambda.cpp index 604a1b715..469ac844b 100644 --- a/rclcpp/timers/minimal_timer/lambda.cpp +++ b/rclcpp/timers/minimal_timer/lambda.cpp @@ -15,7 +15,11 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/timers/minimal_timer/member_function.cpp b/rclcpp/timers/minimal_timer/member_function.cpp index 6167616d9..382469042 100644 --- a/rclcpp/timers/minimal_timer/member_function.cpp +++ b/rclcpp/timers/minimal_timer/member_function.cpp @@ -13,9 +13,14 @@ // limitations under the License. #include +#include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_publisher/lambda.cpp b/rclcpp/topics/minimal_publisher/lambda.cpp index 324eb96e9..bb51aa779 100644 --- a/rclcpp/topics/minimal_publisher/lambda.cpp +++ b/rclcpp/topics/minimal_publisher/lambda.cpp @@ -13,10 +13,16 @@ // limitations under the License. #include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_publisher/member_function.cpp b/rclcpp/topics/minimal_publisher/member_function.cpp index b211a5eb7..8d01a24c9 100644 --- a/rclcpp/topics/minimal_publisher/member_function.cpp +++ b/rclcpp/topics/minimal_publisher/member_function.cpp @@ -13,11 +13,17 @@ // limitations under the License. #include +#include #include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_publisher/member_function_with_type_adapter.cpp b/rclcpp/topics/minimal_publisher/member_function_with_type_adapter.cpp index 39c1007a0..7d0c921c2 100644 --- a/rclcpp/topics/minimal_publisher/member_function_with_type_adapter.cpp +++ b/rclcpp/topics/minimal_publisher/member_function_with_type_adapter.cpp @@ -13,12 +13,18 @@ // limitations under the License. #include +#include #include #include #include +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" #include "rclcpp/type_adapter.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" diff --git a/rclcpp/topics/minimal_publisher/member_function_with_unique_network_flow_endpoints.cpp b/rclcpp/topics/minimal_publisher/member_function_with_unique_network_flow_endpoints.cpp index 71437e9e0..7a9dd1ae0 100644 --- a/rclcpp/topics/minimal_publisher/member_function_with_unique_network_flow_endpoints.cpp +++ b/rclcpp/topics/minimal_publisher/member_function_with_unique_network_flow_endpoints.cpp @@ -13,14 +13,22 @@ // limitations under the License. #include +#include #include #include #include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/network_flow_endpoint.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" #include "rclcpp/publisher_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_publisher/member_function_with_wait_for_all_acked.cpp b/rclcpp/topics/minimal_publisher/member_function_with_wait_for_all_acked.cpp index cde4e43e1..ceb5a2131 100644 --- a/rclcpp/topics/minimal_publisher/member_function_with_wait_for_all_acked.cpp +++ b/rclcpp/topics/minimal_publisher/member_function_with_wait_for_all_acked.cpp @@ -12,12 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. #include -#include #include +#include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/contexts/default_context.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_publisher/not_composable.cpp b/rclcpp/topics/minimal_publisher/not_composable.cpp index f75ead23f..96338bbd2 100644 --- a/rclcpp/topics/minimal_publisher/not_composable.cpp +++ b/rclcpp/topics/minimal_publisher/not_composable.cpp @@ -15,7 +15,13 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/rate.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_subscriber/content_filtering.cpp b/rclcpp/topics/minimal_subscriber/content_filtering.cpp index 74de76e4e..f2be129d8 100644 --- a/rclcpp/topics/minimal_subscriber/content_filtering.cpp +++ b/rclcpp/topics/minimal_subscriber/content_filtering.cpp @@ -12,11 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include #include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_content_filter_options.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using std::placeholders::_1; diff --git a/rclcpp/topics/minimal_subscriber/lambda.cpp b/rclcpp/topics/minimal_subscriber/lambda.cpp index 16b9083dd..68c860559 100644 --- a/rclcpp/topics/minimal_subscriber/lambda.cpp +++ b/rclcpp/topics/minimal_subscriber/lambda.cpp @@ -14,7 +14,11 @@ #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" class MinimalSubscriber : public rclcpp::Node diff --git a/rclcpp/topics/minimal_subscriber/member_function.cpp b/rclcpp/topics/minimal_subscriber/member_function.cpp index 40f27f7d6..53248f3c7 100644 --- a/rclcpp/topics/minimal_subscriber/member_function.cpp +++ b/rclcpp/topics/minimal_subscriber/member_function.cpp @@ -15,7 +15,11 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using std::placeholders::_1; diff --git a/rclcpp/topics/minimal_subscriber/member_function_with_topic_statistics.cpp b/rclcpp/topics/minimal_subscriber/member_function_with_topic_statistics.cpp index c7523ba1b..c01464a27 100644 --- a/rclcpp/topics/minimal_subscriber/member_function_with_topic_statistics.cpp +++ b/rclcpp/topics/minimal_subscriber/member_function_with_topic_statistics.cpp @@ -15,8 +15,13 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" #include "rclcpp/subscription_options.hpp" +#include "rclcpp/topic_statistics_state.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" diff --git a/rclcpp/topics/minimal_subscriber/member_function_with_type_adapter.cpp b/rclcpp/topics/minimal_subscriber/member_function_with_type_adapter.cpp index bb9c8925b..e98fa0fe7 100644 --- a/rclcpp/topics/minimal_subscriber/member_function_with_type_adapter.cpp +++ b/rclcpp/topics/minimal_subscriber/member_function_with_type_adapter.cpp @@ -16,8 +16,12 @@ #include #include +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" #include "rclcpp/type_adapter.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" diff --git a/rclcpp/topics/minimal_subscriber/member_function_with_unique_network_flow_endpoints.cpp b/rclcpp/topics/minimal_subscriber/member_function_with_unique_network_flow_endpoints.cpp index 2ee425b90..5ad4f5622 100644 --- a/rclcpp/topics/minimal_subscriber/member_function_with_unique_network_flow_endpoints.cpp +++ b/rclcpp/topics/minimal_subscriber/member_function_with_unique_network_flow_endpoints.cpp @@ -19,8 +19,14 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/network_flow_endpoint.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" #include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" using std::placeholders::_1; diff --git a/rclcpp/topics/minimal_subscriber/not_composable.cpp b/rclcpp/topics/minimal_subscriber/not_composable.cpp index 176f83a77..9ec400d87 100644 --- a/rclcpp/topics/minimal_subscriber/not_composable.cpp +++ b/rclcpp/topics/minimal_subscriber/not_composable.cpp @@ -12,7 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "std_msgs/msg/string.hpp" rclcpp::Node::SharedPtr g_node = nullptr; diff --git a/rclcpp/topics/minimal_subscriber/static_wait_set_subscriber.cpp b/rclcpp/topics/minimal_subscriber/static_wait_set_subscriber.cpp index d72c7ab3f..10029f6e4 100644 --- a/rclcpp/topics/minimal_subscriber/static_wait_set_subscriber.cpp +++ b/rclcpp/topics/minimal_subscriber/static_wait_set_subscriber.cpp @@ -12,10 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include +#include #include +#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" /* This example creates a subclass of Node and uses static a wait-set based loop to wait on diff --git a/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp b/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp index 47e4dc785..2c6ab8e36 100644 --- a/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp +++ b/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp @@ -12,10 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include +#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/topics/minimal_subscriber/wait_set_subscriber.cpp b/rclcpp/topics/minimal_subscriber/wait_set_subscriber.cpp index 79dddce2b..3eb2b9de3 100644 --- a/rclcpp/topics/minimal_subscriber/wait_set_subscriber.cpp +++ b/rclcpp/topics/minimal_subscriber/wait_set_subscriber.cpp @@ -12,10 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include +#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" /* This example creates a subclass of Node and uses a wait-set based loop to wait on diff --git a/rclcpp/wait_set/include/wait_set/listener.hpp b/rclcpp/wait_set/include/wait_set/listener.hpp index f4d9d7c5d..1463218ba 100644 --- a/rclcpp/wait_set/include/wait_set/listener.hpp +++ b/rclcpp/wait_set/include/wait_set/listener.hpp @@ -15,7 +15,12 @@ #ifndef WAIT_SET__LISTENER_HPP_ #define WAIT_SET__LISTENER_HPP_ -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" #include "wait_set/visibility.h" diff --git a/rclcpp/wait_set/include/wait_set/random_listener.hpp b/rclcpp/wait_set/include/wait_set/random_listener.hpp index 79589ad71..e520daec4 100644 --- a/rclcpp/wait_set/include/wait_set/random_listener.hpp +++ b/rclcpp/wait_set/include/wait_set/random_listener.hpp @@ -16,9 +16,10 @@ #define WAIT_SET__RANDOM_LISTENER_HPP_ #include -#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription.hpp" #include "std_msgs/msg/string.hpp" class RandomListener : public rclcpp::Node diff --git a/rclcpp/wait_set/include/wait_set/random_talker.hpp b/rclcpp/wait_set/include/wait_set/random_talker.hpp index 0b58db7bd..6544ce2a8 100644 --- a/rclcpp/wait_set/include/wait_set/random_talker.hpp +++ b/rclcpp/wait_set/include/wait_set/random_talker.hpp @@ -15,11 +15,17 @@ #ifndef WAIT_SET__RANDOM_TALKER_HPP_ #define WAIT_SET__RANDOM_TALKER_HPP_ +#include +#include #include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" #include "std_msgs/msg/string.hpp" class RandomTalker : public rclcpp::Node diff --git a/rclcpp/wait_set/include/wait_set/talker.hpp b/rclcpp/wait_set/include/wait_set/talker.hpp index 09c912a7e..fbb04b0e3 100644 --- a/rclcpp/wait_set/include/wait_set/talker.hpp +++ b/rclcpp/wait_set/include/wait_set/talker.hpp @@ -15,7 +15,12 @@ #ifndef WAIT_SET__TALKER_HPP_ #define WAIT_SET__TALKER_HPP_ -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/timer.hpp" #include "std_msgs/msg/string.hpp" #include "wait_set/visibility.h" diff --git a/rclcpp/wait_set/src/executor_random_order.cpp b/rclcpp/wait_set/src/executor_random_order.cpp index c2dfb9075..f242f0b82 100644 --- a/rclcpp/wait_set/src/executor_random_order.cpp +++ b/rclcpp/wait_set/src/executor_random_order.cpp @@ -13,9 +13,10 @@ // limitations under the License. #include +#include -#include "rclcpp/rclcpp.hpp" -#include "std_msgs/msg/string.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/utilities.hpp" #include "wait_set/random_listener.hpp" #include "wait_set/random_talker.hpp" diff --git a/rclcpp/wait_set/src/listener.cpp b/rclcpp/wait_set/src/listener.cpp index e56bda068..cfb1d5021 100644 --- a/rclcpp/wait_set/src/listener.cpp +++ b/rclcpp/wait_set/src/listener.cpp @@ -12,11 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include +#include #include "wait_set/listener.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/wait_set/src/static_wait_set.cpp b/rclcpp/wait_set/src/static_wait_set.cpp index 79ba4d1a4..743160024 100644 --- a/rclcpp/wait_set/src/static_wait_set.cpp +++ b/rclcpp/wait_set/src/static_wait_set.cpp @@ -12,10 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" int main(int argc, char * argv[]) diff --git a/rclcpp/wait_set/src/talker.cpp b/rclcpp/wait_set/src/talker.cpp index 86a7aa2be..e97e833d5 100644 --- a/rclcpp/wait_set/src/talker.cpp +++ b/rclcpp/wait_set/src/talker.cpp @@ -13,9 +13,11 @@ // limitations under the License. #include +#include #include "wait_set/talker.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node_options.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/wait_set/src/thread_safe_wait_set.cpp b/rclcpp/wait_set/src/thread_safe_wait_set.cpp index b0543e116..8ef5ece71 100644 --- a/rclcpp/wait_set/src/thread_safe_wait_set.cpp +++ b/rclcpp/wait_set/src/thread_safe_wait_set.cpp @@ -13,10 +13,20 @@ // limitations under the License. #include +#include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" int main(int argc, char * argv[]) diff --git a/rclcpp/wait_set/src/wait_set.cpp b/rclcpp/wait_set/src/wait_set.cpp index b64229257..288e7f61a 100644 --- a/rclcpp/wait_set/src/wait_set.cpp +++ b/rclcpp/wait_set/src/wait_set.cpp @@ -13,10 +13,20 @@ // limitations under the License. #include +#include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" int main(int argc, char * argv[]) diff --git a/rclcpp/wait_set/src/wait_set_composed.cpp b/rclcpp/wait_set/src/wait_set_composed.cpp index a248b960a..cb1152585 100644 --- a/rclcpp/wait_set/src/wait_set_composed.cpp +++ b/rclcpp/wait_set/src/wait_set_composed.cpp @@ -15,7 +15,9 @@ #include #include "wait_set/talker.hpp" #include "wait_set/listener.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" int main(int argc, char * argv[]) { diff --git a/rclcpp/wait_set/src/wait_set_random_order.cpp b/rclcpp/wait_set/src/wait_set_random_order.cpp index a71d5a824..e699278b6 100644 --- a/rclcpp/wait_set/src/wait_set_random_order.cpp +++ b/rclcpp/wait_set/src/wait_set_random_order.cpp @@ -12,9 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include #include +#include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" #include "wait_set/random_listener.hpp" diff --git a/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp b/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp index fca6c37ca..e7f193593 100644 --- a/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp +++ b/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp @@ -12,9 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/wait_set/src/wait_set_topics_with_different_rates.cpp b/rclcpp/wait_set/src/wait_set_topics_with_different_rates.cpp index 3a4f42a08..70f5f1eaf 100644 --- a/rclcpp/wait_set/src/wait_set_topics_with_different_rates.cpp +++ b/rclcpp/wait_set/src/wait_set_topics_with_different_rates.cpp @@ -12,10 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include +#include #include - -#include "rclcpp/rclcpp.hpp" +#include +#include + +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "std_msgs/msg/string.hpp" using namespace std::chrono_literals;