diff --git a/rosbag2_transport/include/rosbag2_transport/play_options.hpp b/rosbag2_transport/include/rosbag2_transport/play_options.hpp
index 24dffab58a..37ffc42b22 100644
--- a/rosbag2_transport/include/rosbag2_transport/play_options.hpp
+++ b/rosbag2_transport/include/rosbag2_transport/play_options.hpp
@@ -22,10 +22,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "rcl_interfaces/msg/parameter_descriptor.hpp"
-#include "rcl_interfaces/msg/integer_range.hpp"
-#include "rcl_interfaces/msg/floating_point_range.hpp"
 #include "keyboard_handler/keyboard_handler.hpp"
+#include "rclcpp/node.hpp"
 #include "rclcpp/duration.hpp"
 #include "rclcpp/time.hpp"
 #include "rclcpp/qos.hpp"
diff --git a/rosbag2_transport/src/rosbag2_transport/play_options.cpp b/rosbag2_transport/src/rosbag2_transport/play_options.cpp
index 5b5ccbbaf9..3e1de4c461 100644
--- a/rosbag2_transport/src/rosbag2_transport/play_options.cpp
+++ b/rosbag2_transport/src/rosbag2_transport/play_options.cpp
@@ -16,6 +16,9 @@
 #include <string>
 #include <vector>
 
+#include "rcl_interfaces/msg/parameter_descriptor.hpp"
+#include "rcl_interfaces/msg/integer_range.hpp"
+#include "rcl_interfaces/msg/floating_point_range.hpp"
 #include "rosbag2_transport/qos.hpp"
 #include "rosbag2_transport/play_options.hpp"
 
diff --git a/rosbag2_transport/src/rosbag2_transport/record_options.cpp b/rosbag2_transport/src/rosbag2_transport/record_options.cpp
index 097dd756df..73f6d27e87 100644
--- a/rosbag2_transport/src/rosbag2_transport/record_options.cpp
+++ b/rosbag2_transport/src/rosbag2_transport/record_options.cpp
@@ -16,6 +16,9 @@
 #include <string>
 #include <vector>
 
+#include "rcl_interfaces/msg/parameter_descriptor.hpp"
+#include "rcl_interfaces/msg/integer_range.hpp"
+#include "rcl_interfaces/msg/floating_point_range.hpp"
 #include "rosbag2_transport/qos.hpp"
 #include "rosbag2_transport/record_options.hpp"