diff --git a/rclcpp_components/include/rclcpp_components/component_manager.hpp b/rclcpp_components/include/rclcpp_components/component_manager.hpp
index 34b2ea4d39..fefd302bbc 100644
--- a/rclcpp_components/include/rclcpp_components/component_manager.hpp
+++ b/rclcpp_components/include/rclcpp_components/component_manager.hpp
@@ -55,8 +55,10 @@
 #include "composition_interfaces/srv/list_nodes.hpp"
 
 #include "rclcpp/executor.hpp"
+#include "rclcpp/executors/multi_threaded_executor.hpp"
+#include "rclcpp/node.hpp"
 #include "rclcpp/node_options.hpp"
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/service.hpp"
 
 #include "rclcpp_components/node_factory.hpp"
 #include "rclcpp_components/node_instance_wrapper.hpp"
diff --git a/rclcpp_components/include/rclcpp_components/component_manager_isolated.hpp b/rclcpp_components/include/rclcpp_components/component_manager_isolated.hpp
index 44d61fe304..c3474ce4ea 100644
--- a/rclcpp_components/include/rclcpp_components/component_manager_isolated.hpp
+++ b/rclcpp_components/include/rclcpp_components/component_manager_isolated.hpp
@@ -29,7 +29,10 @@
 #include <vector>
 
 #include "rclcpp/executor.hpp"
+#include "rclcpp/executor_options.hpp"
 #include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/logger.hpp"
+#include "rclcpp/node_options.hpp"
 #include "rclcpp/utilities.hpp"
 #include "rclcpp_components/component_manager.hpp"
 #include "rcpputils/thread_name.hpp"
diff --git a/rclcpp_components/src/component_container.cpp b/rclcpp_components/src/component_container.cpp
index 3bbc07ab52..e67a1381b7 100644
--- a/rclcpp_components/src/component_container.cpp
+++ b/rclcpp_components/src/component_container.cpp
@@ -19,6 +19,8 @@
 #include <thread>
 
 #include "rcutils/logging_macros.h"
+#include "rclcpp/executor.hpp"
+#include "rclcpp/executor_options.hpp"
 #include "rclcpp/executors/multi_threaded_executor.hpp"
 #include "rclcpp/executors/single_threaded_executor.hpp"
 #include "rclcpp/executors/events_cbg_executor/events_cbg_executor.hpp"
diff --git a/rclcpp_components/src/component_container_isolated.cpp b/rclcpp_components/src/component_container_isolated.cpp
index 67e11d0e55..5fb93bfac7 100644
--- a/rclcpp_components/src/component_container_isolated.cpp
+++ b/rclcpp_components/src/component_container_isolated.cpp
@@ -18,6 +18,7 @@
 
 #include "rclcpp/executors/single_threaded_executor.hpp"
 #include "rclcpp/executors/multi_threaded_executor.hpp"
+#include "rclcpp/node.hpp"
 #include "rclcpp/utilities.hpp"
 
 #include "rclcpp_components/component_manager_isolated.hpp"
diff --git a/rclcpp_components/src/component_container_mt.cpp b/rclcpp_components/src/component_container_mt.cpp
index 3fc9dd9add..bb2efe3e3c 100644
--- a/rclcpp_components/src/component_container_mt.cpp
+++ b/rclcpp_components/src/component_container_mt.cpp
@@ -14,6 +14,7 @@
 
 #include <memory>
 
+#include "rclcpp/executor_options.hpp"
 #include "rclcpp/executors/multi_threaded_executor.hpp"
 #include "rclcpp/utilities.hpp"
 
diff --git a/rclcpp_components/src/component_manager.cpp b/rclcpp_components/src/component_manager.cpp
index ab9bece121..83e8155a11 100644
--- a/rclcpp_components/src/component_manager.cpp
+++ b/rclcpp_components/src/component_manager.cpp
@@ -28,7 +28,11 @@
 
 #include "class_loader/class_loader.hpp"
 
+#include "rclcpp/executor.hpp"
+#include "rclcpp/logger.hpp"
 #include "rclcpp/node_options.hpp"
+#include "rclcpp/parameter.hpp"
+#include "rclcpp/parameter_value.hpp"
 #include "rclcpp/qos.hpp"
 
 #include "rclcpp_components/node_factory.hpp"
diff --git a/rclcpp_components/test/benchmark/benchmark_components.cpp b/rclcpp_components/test/benchmark/benchmark_components.cpp
index 26d607f5fb..b2c6e85ba6 100644
--- a/rclcpp_components/test/benchmark/benchmark_components.cpp
+++ b/rclcpp_components/test/benchmark/benchmark_components.cpp
@@ -20,6 +20,12 @@
 #include <string>
 #include <vector>
 
+#include "rclcpp/context.hpp"
+#include "rclcpp/executor_options.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/init_options.hpp"
+#include "rclcpp/node_options.hpp"
+
 #include "rclcpp_components/component_manager.hpp"
 
 class ComponentTest : public benchmark::Fixture
diff --git a/rclcpp_components/test/components/test_component.cpp b/rclcpp_components/test/components/test_component.cpp
index 7193ed7e1f..1694ed72bc 100644
--- a/rclcpp_components/test/components/test_component.cpp
+++ b/rclcpp_components/test/components/test_component.cpp
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "rclcpp/rclcpp.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/node_interfaces/node_base_interface.hpp"
+#include "rclcpp/node_options.hpp"
 
 namespace test_rclcpp_components
 {
diff --git a/rclcpp_components/test/test_component_manager.cpp b/rclcpp_components/test/test_component_manager.cpp
index c4da20c26c..d055ea5761 100644
--- a/rclcpp_components/test/test_component_manager.cpp
+++ b/rclcpp_components/test/test_component_manager.cpp
@@ -20,6 +20,7 @@
 #include "rclcpp_components/component_manager.hpp"
 
 #include "rcpputils/filesystem_helper.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
 #include "rclcpp/utilities.hpp"
 
 class TestComponentManager : public ::testing::Test
diff --git a/rclcpp_components/test/test_component_manager_api.cpp b/rclcpp_components/test/test_component_manager_api.cpp
index 05c0b069e3..215b0fb232 100644
--- a/rclcpp_components/test/test_component_manager_api.cpp
+++ b/rclcpp_components/test/test_component_manager_api.cpp
@@ -24,6 +24,11 @@
 
 #include "rclcpp/executors/events_cbg_executor/events_cbg_executor.hpp"
 #include "rclcpp/executors/multi_threaded_executor.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/future_return_code.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/parameter.hpp"
+#include "rclcpp/parameter_value.hpp"
 #include "rclcpp/utilities.hpp"
 #include "rclcpp_components/component_manager.hpp"
 #include "rclcpp_components/component_manager_isolated.hpp"