diff --git a/rclcpp/actions/minimal_action_client/member_functions.cpp b/rclcpp/actions/minimal_action_client/member_functions.cpp
index f5c827ee..3a089f34 100644
--- a/rclcpp/actions/minimal_action_client/member_functions.cpp
+++ b/rclcpp/actions/minimal_action_client/member_functions.cpp
@@ -21,7 +21,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.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 406a7d9b..ab083f70 100644
--- a/rclcpp/actions/minimal_action_client/not_composable.cpp
+++ b/rclcpp/actions/minimal_action_client/not_composable.cpp
@@ -17,7 +17,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.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 3b179079..0710dc22 100644
--- a/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp
+++ b/rclcpp/actions/minimal_action_client/not_composable_with_cancel.cpp
@@ -16,7 +16,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.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 52683c79..30c83305 100644
--- a/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp
+++ b/rclcpp/actions/minimal_action_client/not_composable_with_feedback.cpp
@@ -18,7 +18,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.hpp"
 
 using Fibonacci = example_interfaces::action::Fibonacci;
diff --git a/rclcpp/actions/minimal_action_server/member_functions.cpp b/rclcpp/actions/minimal_action_server/member_functions.cpp
index f1266af6..c4af37a2 100644
--- a/rclcpp/actions/minimal_action_server/member_functions.cpp
+++ b/rclcpp/actions/minimal_action_server/member_functions.cpp
@@ -18,7 +18,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.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 b82cbf85..4b0948fb 100644
--- a/rclcpp/actions/minimal_action_server/not_composable.cpp
+++ b/rclcpp/actions/minimal_action_server/not_composable.cpp
@@ -17,7 +17,6 @@
 
 #include "example_interfaces/action/fibonacci.hpp"
 #include "rclcpp/rclcpp.hpp"
-// TODO(jacobperron): Remove this once it is included as part of 'rclcpp.hpp'
 #include "rclcpp_action/rclcpp_action.hpp"
 
 using Fibonacci = example_interfaces::action::Fibonacci;