Granular rclcpp includes

test_cli/test/initial_params.cpp

@@ -14,7 +14,10 @@
 
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/node_options.hpp"
+#include "rclcpp/utilities.hpp"
 
 int main(int argc, char ** argv)
 {

test_cli_remapping/test/name_maker.cpp

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <chrono>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_msgs/msg/empty.hpp"
 #include "test_msgs/srv/empty.hpp"

test_communication/test/subscribe_array_types.cpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/arrays.hpp"
 #include "test_msgs/msg/unbounded_sequences.hpp"
 #include "test_msgs/msg/bounded_plain_sequences.hpp"

test_communication/test/subscribe_array_types.hpp

@@ -18,7 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/arrays.hpp"
 #include "test_msgs/msg/unbounded_sequences.hpp"
 #include "test_msgs/msg/bounded_plain_sequences.hpp"

test_communication/test/subscribe_basic_types.cpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/empty.hpp"
 #include "test_msgs/msg/basic_types.hpp"
 #include "test_msgs/msg/builtins.hpp"

test_communication/test/subscribe_basic_types.hpp

@@ -18,7 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/empty.hpp"
 #include "test_msgs/msg/basic_types.hpp"
 #include "test_msgs/msg/builtins.hpp"

test_communication/test/subscribe_helper.hpp

@@ -20,7 +20,10 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/subscription_base.hpp"
+#include "rclcpp/utilities.hpp"
 
 template<typename T>
 rclcpp::SubscriptionBase::SharedPtr subscribe(

test_communication/test/subscribe_key_types.cpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 
 #include "subscribe_helper.hpp"
 #include "subscribe_key_types.hpp"

test_communication/test/subscribe_key_types.hpp

@@ -18,7 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/complex_nested_key.hpp"
 #include "test_msgs/msg/keyed_long.hpp"
 #include "test_msgs/msg/keyed_string.hpp"

test_communication/test/subscribe_string_types.cpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/strings.hpp"
 #include "test_msgs/msg/w_strings.hpp"
 

test_communication/test/subscribe_string_types.hpp

@@ -18,7 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
 #include "test_msgs/msg/strings.hpp"
 #include "test_msgs/msg/w_strings.hpp"
 

test_communication/test/test_action_client.cpp

@@ -19,7 +19,11 @@
 #include <vector>
 
 #include "rclcpp/exceptions.hpp"
-#include "rclcpp/rclcpp.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/rclcpp_action.hpp"
 
 #include "rcpputils/scope_exit.hpp"

test_communication/test/test_action_server.cpp

@@ -14,12 +14,15 @@
 
 #include <chrono>
 #include <memory>
-#include <stdexcept>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "rclcpp/rclcpp.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/rclcpp_action.hpp"
 
 #include "rcpputils/scope_exit.hpp"

test_communication/test/test_messages_c.cpp

@@ -49,7 +49,6 @@
 #define SCOPE_EXIT_HPP_
 
 #include <algorithm>
-#include <functional>
 #include <limits>
 #include <memory>
 

test_communication/test/test_nested_types.cpp

@@ -18,7 +18,10 @@
 #include <limits>
 #include <thread>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/rate.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "rcpputils/scope_exit.hpp"
 

test_communication/test/test_publisher.cpp

@@ -16,7 +16,10 @@
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/rate.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_msgs/message_fixtures.hpp"
 

test_communication/test/test_publisher_subscriber.cpp

@@ -17,7 +17,12 @@
 #include <thread>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/rate.hpp"
+#include "rclcpp/subscription_base.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "rcpputils/scope_exit.hpp"
 

test_communication/test/test_publisher_subscriber_serialized.cpp

@@ -16,8 +16,12 @@
 #include <memory>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/rate.hpp"
 #include "rclcpp/serialization.hpp"
+#include "rclcpp/serialized_message.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "rmw/types.h"
 

test_communication/test/test_replier.cpp

@@ -18,7 +18,10 @@
 #include <utility>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/service.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_msgs/service_fixtures.hpp"
 

test_communication/test/test_requester.cpp

@@ -19,7 +19,10 @@
 #include <vector>
 
 #include "rclcpp/exceptions.hpp"
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/rate.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_msgs/service_fixtures.hpp"
 

test_communication/test/test_subscriber.cpp

@@ -13,11 +13,13 @@
 // limitations under the License.
 
 #include <chrono>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/subscription_base.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_msgs/message_fixtures.hpp"
 

test_communication/test/test_subscription_valid_data.cpp

@@ -14,10 +14,12 @@
 
 #include <chrono>
 #include <memory>
-#include <string>
 #include <utility>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/rate.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_communication/msg/u_int32.hpp"
 

test_quality_of_service/include/test_quality_of_service/qos_test_node.hpp

@@ -19,7 +19,8 @@
 #include <mutex>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/qos.hpp"
 #include "test_quality_of_service/visibility_control.hpp"
 
 /// Base class used for QoS system test nodes

test_quality_of_service/include/test_quality_of_service/qos_test_publisher.hpp

@@ -19,7 +19,10 @@
 #include <memory>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/publisher.hpp"
+#include "rclcpp/publisher_options.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/timer.hpp"
 #include "std_msgs/msg/string.hpp"
 
 #include "test_quality_of_service/qos_test_node.hpp"

test_quality_of_service/include/test_quality_of_service/qos_test_subscriber.hpp

@@ -18,7 +18,9 @@
 #include <memory>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/subscription.hpp"
+#include "rclcpp/subscription_options.hpp"
 #include "std_msgs/msg/string.hpp"
 
 #include "test_quality_of_service/qos_test_node.hpp"

test_quality_of_service/include/test_quality_of_service/qos_utilities.hpp

@@ -25,7 +25,7 @@
 #include "gtest/gtest.h"
 
 #include "rcutils/macros.h"
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
 
 #ifdef RMW_IMPLEMENTATION
 # define CLASSNAME_(NAME, SUFFIX) NAME ## __ ## SUFFIX

test_quality_of_service/test/qos_test_node.cpp

@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <atomic>
 #include <mutex>
 #include <string>
 
 #include "test_quality_of_service/qos_test_node.hpp"
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/qos.hpp"
 
 QosTestNode::QosTestNode(
   const std::string & name,

test_quality_of_service/test/qos_test_publisher.cpp

@@ -16,7 +16,8 @@
 #include <sstream>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/logging.hpp"
+#include "rclcpp/qos.hpp"
 #include "std_msgs/msg/string.hpp"
 
 #include "test_quality_of_service/qos_test_publisher.hpp"

test_quality_of_service/test/qos_test_subscriber.cpp

@@ -16,7 +16,8 @@
 #include <memory>
 #include <string>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/logging.hpp"
+#include "rclcpp/qos.hpp"
 #include "std_msgs/msg/string.hpp"
 
 #include "test_quality_of_service/qos_test_node.hpp"

test_quality_of_service/test/qos_utilities.cpp

@@ -14,12 +14,10 @@
 
 #include <future>
 #include <memory>
-#include <sstream>
-#include <string>
 #include <tuple>
-#include <utility>
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/executors.hpp"
+#include "rclcpp/utilities.hpp"
 
 #include "test_quality_of_service/qos_test_publisher.hpp"
 #include "test_quality_of_service/qos_test_subscriber.hpp"

test_quality_of_service/test/test_best_available.cpp

@@ -13,15 +13,15 @@
 // limitations under the License.
 
 #include <chrono>
-#include <functional>
 #include <memory>
 #include <string>
 
 #include "gtest/gtest.h"
 
 #include "rcl/graph.h"
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/qos.hpp"
 
 #include "test_msgs/srv/empty.hpp"
 

test_quality_of_service/test/test_deadline.cpp

@@ -15,11 +15,13 @@
 #include <chrono>
 #include <memory>
 #include <string>
-#include <tuple>
 
 #include "gtest/gtest.h"
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/event_handler.hpp"
+#include "rclcpp/logging.hpp"
+#include "rclcpp/qos.hpp"
+#include "rclcpp/timer.hpp"
 #include "rclcpp/executors/single_threaded_executor.hpp"
 
 #include "std_msgs/msg/string.hpp"