From 0df4def326ed562ed428d6685c25b464758a2210 Mon Sep 17 00:00:00 2001
From: Andrea <realeandrea@yahoo.it>
Date: Fri, 22 Aug 2025 15:15:20 +0200
Subject: [PATCH 01/10] Fix compile warning (tf2*.h  is deprecated)

*.h headers is deprecated into tf2 libs . -> switch to *.hpp headers
---
 .../include/moveit/local_planner/local_planner_component.hpp  | 4 ++--
 moveit_ros/move_group/src/move_group.cpp                      | 2 +-
 moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp     | 2 +-
 moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp    | 2 +-
 moveit_ros/moveit_servo/include/moveit_servo/servo.hpp        | 2 +-
 .../moveit/occupancy_map_monitor/occupancy_map_monitor.hpp    | 2 +-
 moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp | 2 +-
 .../test/occupancy_map_monitor_tests.cpp                      | 2 +-
 .../depth_image_octomap_updater.hpp                           | 2 +-
 moveit_ros/perception/mesh_filter/src/transform_provider.cpp  | 4 ++--
 .../pointcloud_octomap_updater/pointcloud_octomap_updater.hpp | 4 ++--
 .../src/pointcloud_octomap_updater.cpp                        | 2 +-
 .../moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp       | 2 +-
 .../moveit/planning_scene_monitor/current_state_monitor.hpp   | 2 +-
 .../moveit/planning_scene_monitor/planning_scene_monitor.hpp  | 4 ++--
 .../test/current_state_monitor_tests.cpp                      | 2 +-
 .../planning_scene_monitor/test/trajectory_monitor_tests.cpp  | 2 +-
 .../common_planning_interface_objects/common_objects.hpp      | 2 +-
 .../moveit/move_group_interface/move_group_interface.hpp      | 2 +-
 .../move_group_interface/src/move_group_interface.cpp         | 2 +-
 .../include/moveit/robot_interaction/interaction_handler.hpp  | 3 +--
 .../include/moveit/trajectory_cache/utils/utils.hpp           | 2 +-
 moveit_ros/trajectory_cache/src/utils/utils.cpp               | 2 +-
 moveit_ros/trajectory_cache/test/utils/test_utils.cpp         | 2 +-
 .../motion_planning_rviz_plugin/src/motion_planning_frame.cpp | 2 +-
 .../planning_scene_rviz_plugin/src/planning_scene_display.cpp | 2 +-
 moveit_ros/warehouse/src/save_to_warehouse.cpp                | 2 +-
 27 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
index 164cd231a7..f3b92769a7 100644
--- a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
+++ b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
@@ -58,8 +58,8 @@
 #include <moveit/local_planner/local_constraint_solver_interface.hpp>
 #include <moveit/local_planner/trajectory_operator_interface.hpp>
 
-#include <tf2_ros/buffer.h>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/buffer.hpp>
+#include <tf2_ros/transform_listener.hpp>
 
 // Forward declaration of parameter class allows users to implement custom parameters
 namespace local_planner_parameters
diff --git a/moveit_ros/move_group/src/move_group.cpp b/moveit_ros/move_group/src/move_group.cpp
index 2389100756..ec561f0c22 100644
--- a/moveit_ros/move_group/src/move_group.cpp
+++ b/moveit_ros/move_group/src/move_group.cpp
@@ -36,7 +36,7 @@
 
 #include <moveit/moveit_cpp/moveit_cpp.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <moveit/move_group/move_group_capability.hpp>
 #include <moveit/trajectory_execution_manager/trajectory_execution_manager.hpp>
 #include <boost/tokenizer.hpp>
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
index 4c713fd8b6..24e9bc33a3 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
@@ -45,7 +45,7 @@
 #include <mutex>
 #include <rclcpp/rclcpp.hpp>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <moveit/utils/logger.hpp>
 
 using namespace moveit_servo;
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
index 8c92fa4cfc..a73f319b3c 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
@@ -44,7 +44,7 @@
 #include <moveit_servo/utils/common.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <moveit/utils/logger.hpp>
 
 using namespace moveit_servo;
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
index 88a8f91665..986c0b872c 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -51,7 +51,7 @@
 #include <pluginlib/class_loader.hpp>
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <variant>
 #include <rclcpp/logger.hpp>
 #include <queue>
diff --git a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
index 7f58505143..1a50ab64f5 100644
--- a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
+++ b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
@@ -42,7 +42,7 @@
 #include <moveit_msgs/srv/save_map.hpp>
 
 #include <rclcpp/rclcpp.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <functional>
 #include <memory>
diff --git a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
index 7cd0dbb9bc..2ed8a6cc39 100644
--- a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
+++ b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
@@ -37,7 +37,7 @@
 #include <moveit/occupancy_map_monitor/occupancy_map_monitor.hpp>
 
 #include <octomap_msgs/conversions.h>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <rclcpp/clock.hpp>
 #include <rclcpp/executors.hpp>
 #include <rclcpp/experimental/buffers/intra_process_buffer.hpp>
diff --git a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
index 207480e531..77ab5aba7c 100644
--- a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
+++ b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
@@ -38,7 +38,7 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <memory>
 #include <string>
diff --git a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
index 13d22bcfc9..c76f88d46a 100644
--- a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
+++ b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
@@ -37,7 +37,7 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 #include <moveit/occupancy_map_monitor/occupancy_map_updater.hpp>
 #include <moveit/mesh_filter/mesh_filter.hpp>
 #include <moveit/mesh_filter/stereo_camera_model.hpp>
diff --git a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
index a21695ed70..ab939ef534 100644
--- a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
+++ b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
@@ -35,8 +35,8 @@
 /* Author: Suat Gedikli */
 
 #include <moveit/mesh_filter/transform_provider.hpp>
-#include <tf2_ros/transform_listener.h>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/transform_listener.hpp>
+#include <tf2_ros/buffer.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
 
 TransformProvider::TransformProvider(double update_rate) : stop_(true), update_rate_(update_rate)
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
index cfe085e8c0..3e84809f48 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
@@ -39,8 +39,8 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/callback_group.hpp>
 #include <rclcpp/version.h>
-#include <tf2_ros/transform_listener.h>
-#include <tf2_ros/message_filter.h>
+#include <tf2_ros/transform_listener.hpp>
+#include <tf2_ros/message_filter.hpp>
 #if RCLCPP_VERSION_GTE(28, 3, 3)  // Rolling
 #include <message_filters/subscriber.hpp>
 #else
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
index 87e539eac9..87ece33ba5 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@@ -51,7 +51,7 @@
 #endif
 #include <sensor_msgs/point_cloud2_iterator.hpp>
 #include <tf2_ros/create_timer_interface.h>
-#include <tf2_ros/create_timer_ros.h>
+#include <tf2_ros/create_timer_ros.hpp>
 #include <moveit/utils/logger.hpp>
 #include <rclcpp/version.h>
 
diff --git a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
index eeaf4ab415..e6821fae90 100644
--- a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
+++ b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
@@ -45,7 +45,7 @@
 #include <moveit/planning_pipeline/planning_pipeline.hpp>
 #include <moveit/trajectory_execution_manager/trajectory_execution_manager.hpp>
 #include <moveit/robot_state/robot_state.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 namespace moveit_cpp
 {
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
index 273d4b1049..34fa5f092d 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
@@ -48,7 +48,7 @@
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_msgs/msg/tf_message.hpp>
 
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <moveit/robot_state/robot_state.hpp>
 
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
index fc965680e5..3d9b9fb097 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
@@ -37,8 +37,8 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
-#include <tf2_ros/buffer.h>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/buffer.hpp>
+#include <tf2_ros/transform_listener.hpp>
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/planning_scene/planning_scene.hpp>
 #include <moveit/robot_model_loader/robot_model_loader.hpp>
diff --git a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
index 2977b0f76c..46d25dfa94 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
@@ -43,7 +43,7 @@
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 struct MockMiddlewareHandle : public planning_scene_monitor::CurrentStateMonitor::MiddlewareHandle
 {
diff --git a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
index 0b957fdf43..a263c2e5c6 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
@@ -44,7 +44,7 @@
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 using namespace std::chrono_literals;
 
diff --git a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
index 0295e3216b..121d3a5a16 100644
--- a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
+++ b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
@@ -37,7 +37,7 @@
 #pragma once
 
 #include <memory>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/robot_model_loader/robot_model_loader.hpp>
 
diff --git a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
index 7692dc4f6a..3d3b220fe1 100644
--- a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
+++ b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
@@ -56,7 +56,7 @@
 
 #include <memory>
 #include <utility>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <moveit_move_group_interface_export.h>
 
diff --git a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
index 37c2471c2a..94e97803fb 100644
--- a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
+++ b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
@@ -68,7 +68,7 @@
 #include <tf2/utils.h>
 #endif
 #include <tf2_eigen/tf2_eigen.hpp>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
 
diff --git a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
index 1221ffb3d4..6f1fa1282b 100644
--- a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
+++ b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
@@ -39,10 +39,9 @@
 #include <geometry_msgs/msg/pose_stamped.hpp>
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/robot_interaction/locked_robot_state.hpp>
-//#include <moveit/robot_interaction/robot_interaction.hpp>
 #include <visualization_msgs/msg/interactive_marker_feedback.hpp>
 #include <interactive_markers/menu_handler.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 namespace robot_interaction
 {
diff --git a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
index f754754b04..08bec94e15 100644
--- a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
+++ b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
@@ -27,7 +27,7 @@
 #include <moveit_msgs/msg/robot_trajectory.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <warehouse_ros/message_collection.h>
 
diff --git a/moveit_ros/trajectory_cache/src/utils/utils.cpp b/moveit_ros/trajectory_cache/src/utils/utils.cpp
index 5d3a293408..6be28158ad 100644
--- a/moveit_ros/trajectory_cache/src/utils/utils.cpp
+++ b/moveit_ros/trajectory_cache/src/utils/utils.cpp
@@ -28,7 +28,7 @@
 #include <moveit_msgs/msg/constraints.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <warehouse_ros/message_collection.h>
 
diff --git a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
index 835b1de2af..b6c6e89d1d 100644
--- a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
+++ b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
@@ -25,7 +25,7 @@
 #include <moveit_msgs/msg/orientation_constraint.hpp>
 #include <moveit_msgs/msg/position_constraint.hpp>
 
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include "../fixtures/warehouse_fixture.hpp"
 
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
index 074545f324..afd8cd2f28 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -47,7 +47,7 @@
 
 #include <rviz_common/display_context.hpp>
 #include <rviz_common/frame_manager_iface.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <std_srvs/srv/empty.hpp>
 
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index 4bce580a25..3d9f3ad927 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -50,7 +50,7 @@
 #include <rviz_common/properties/color_property.hpp>
 #include <rviz_common/properties/enum_property.hpp>
 #include <rviz_common/display_context.hpp>
-#include <tf2_ros/buffer.h>
+#include <tf2_ros/buffer.hpp>
 
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
diff --git a/moveit_ros/warehouse/src/save_to_warehouse.cpp b/moveit_ros/warehouse/src/save_to_warehouse.cpp
index b837cec649..7521331f35 100644
--- a/moveit_ros/warehouse/src/save_to_warehouse.cpp
+++ b/moveit_ros/warehouse/src/save_to_warehouse.cpp
@@ -44,7 +44,7 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <fmt/format.h>
-#include <tf2_ros/transform_listener.h>
+#include <tf2_ros/transform_listener.hpp>
 #include <rclcpp/executors.hpp>
 #include <rclcpp/experimental/buffers/intra_process_buffer.hpp>
 #include <rclcpp/logger.hpp>

From ab275365c6f15808a6b2d61598a7f0df6ca3014c Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Sun, 7 Sep 2025 22:16:20 -0600
Subject: [PATCH 02/10] Update tf2_ros includes to hpp for Rolling

---
 .../local_planner/local_planner_component.hpp |  8 +++++
 .../test/test_basic_integration.cpp           |  7 +++++
 .../tf_publisher_capability.cpp               |  9 ++++++
 moveit_ros/move_group/src/move_group.cpp      |  8 +++++
 .../demos/cpp_interface/demo_pose.cpp         |  7 +++++
 .../demos/cpp_interface/demo_twist.cpp        |  7 +++++
 .../include/moveit_servo/servo.hpp            | 10 ++++++-
 .../occupancy_map_monitor.hpp                 |  7 +++++
 .../src/occupancy_map_server.cpp              |  8 +++++
 .../test/occupancy_map_monitor_tests.cpp      |  7 +++++
 .../depth_image_octomap_updater.hpp           |  7 +++++
 .../mesh_filter/src/transform_provider.cpp    | 10 ++++++-
 .../pointcloud_octomap_updater.hpp            |  9 +++++-
 .../src/pointcloud_octomap_updater.cpp        |  9 +++++-
 .../include/moveit/moveit_cpp/moveit_cpp.hpp  |  7 +++++
 .../current_state_monitor.hpp                 |  7 +++++
 .../planning_scene_monitor.hpp                |  8 +++++
 ...urrent_state_monitor_middleware_handle.cpp |  1 -
 .../test/current_state_monitor_tests.cpp      |  7 +++++
 .../test/trajectory_monitor_tests.cpp         |  7 +++++
 .../common_objects.hpp                        |  7 +++++
 .../move_group_interface.hpp                  |  7 +++++
 .../src/move_group_interface.cpp              | 12 ++++++--
 .../robot_interaction/interaction_handler.hpp |  7 +++++
 .../moveit/trajectory_cache/utils/utils.hpp   |  8 +++++
 .../trajectory_cache/src/utils/utils.cpp      |  8 +++++
 .../test/utils/test_utils.cpp                 |  6 ++++
 .../src/motion_planning_frame.cpp             |  8 +++++
 .../src/planning_scene_display.cpp            |  8 +++++
 .../warehouse/src/save_to_warehouse.cpp       | 29 ++++++++++++-------
 30 files changed, 232 insertions(+), 18 deletions(-)

diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
index f3b92769a7..8377324fb5 100644
--- a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
+++ b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
@@ -40,6 +40,7 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <rclcpp_action/rclcpp_action.hpp>
 
 #include <pluginlib/class_loader.hpp>
@@ -58,8 +59,15 @@
 #include <moveit/local_planner/local_constraint_solver_interface.hpp>
 #include <moveit/local_planner/trajectory_operator_interface.hpp>
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#include <tf2_ros/transform_listener.h>
+#endif
 
 // Forward declaration of parameter class allows users to implement custom parameters
 namespace local_planner_parameters
diff --git a/moveit_ros/hybrid_planning/test/test_basic_integration.cpp b/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
index 97399f272a..0a7b4591d0 100644
--- a/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
+++ b/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
@@ -41,8 +41,15 @@
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/robot_state/conversions.hpp>
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <rclcpp_action/rclcpp_action.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <moveit_msgs/action/hybrid_planner.hpp>
 #include <moveit_msgs/msg/display_robot_state.hpp>
diff --git a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
index f6035e52ca..9e5b579795 100644
--- a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
+++ b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
@@ -35,10 +35,19 @@
 /* Author: Jonas Tietz */
 
 #include "tf_publisher_capability.hpp"
+
+#include <rclcpp/version.h>
+
 #include <moveit/moveit_cpp/moveit_cpp.hpp>
 #include <moveit/utils/message_checks.hpp>
 #include <moveit/move_group/capability_names.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+#include <tf2_ros/transform_broadcaster.hpp>
+// For Kilted and older
+#else
 #include <tf2_ros/transform_broadcaster.h>
+#endif
 #include <tf2_eigen/tf2_eigen.hpp>
 #include <moveit/robot_state/robot_state.hpp>
 #include <moveit/robot_state/attached_body.hpp>
diff --git a/moveit_ros/move_group/src/move_group.cpp b/moveit_ros/move_group/src/move_group.cpp
index ec561f0c22..eed1feec3e 100644
--- a/moveit_ros/move_group/src/move_group.cpp
+++ b/moveit_ros/move_group/src/move_group.cpp
@@ -34,9 +34,17 @@
 
 /* Author: Ioan Sucan */
 
+#include <rclcpp/version.h>
+
 #include <moveit/moveit_cpp/moveit_cpp.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <moveit/move_group/move_group_capability.hpp>
 #include <moveit/trajectory_execution_manager/trajectory_execution_manager.hpp>
 #include <boost/tokenizer.hpp>
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
index 24e9bc33a3..3a11ef7215 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
@@ -44,8 +44,15 @@
 #include <moveit_servo/utils/common.hpp>
 #include <mutex>
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <moveit/utils/logger.hpp>
 
 using namespace moveit_servo;
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
index a73f319b3c..b1439e4571 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
@@ -43,8 +43,15 @@
 #include <moveit_servo/servo.hpp>
 #include <moveit_servo/utils/common.hpp>
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <moveit/utils/logger.hpp>
 
 using namespace moveit_servo;
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
index 986c0b872c..ceb8eb1916 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -41,6 +41,9 @@
 
 #pragma once
 
+#include <rclcpp/logger.hpp>
+#include <rclcpp/version.h>
+
 #include <moveit_servo/collision_monitor.hpp>
 #include <moveit_servo/moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/utils/command.hpp>
@@ -51,9 +54,14 @@
 #include <pluginlib/class_loader.hpp>
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <variant>
-#include <rclcpp/logger.hpp>
 #include <queue>
 
 namespace moveit_servo
diff --git a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
index 1a50ab64f5..1020243e60 100644
--- a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
+++ b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
@@ -42,7 +42,14 @@
 #include <moveit_msgs/srv/save_map.hpp>
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <functional>
 #include <memory>
diff --git a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
index 2ed8a6cc39..5e929aea6d 100644
--- a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
+++ b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
@@ -34,10 +34,18 @@
 
 /* Author: Jon Binney, Ioan Sucan */
 
+#include <rclcpp/version.h>
+
 #include <moveit/occupancy_map_monitor/occupancy_map_monitor.hpp>
 
 #include <octomap_msgs/conversions.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <rclcpp/clock.hpp>
 #include <rclcpp/executors.hpp>
 #include <rclcpp/experimental/buffers/intra_process_buffer.hpp>
diff --git a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
index 77ab5aba7c..b9fc9d82c2 100644
--- a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
+++ b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
@@ -38,7 +38,14 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <memory>
 #include <string>
diff --git a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
index c76f88d46a..d791ef63f0 100644
--- a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
+++ b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
@@ -37,7 +37,14 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 #include <moveit/occupancy_map_monitor/occupancy_map_updater.hpp>
 #include <moveit/mesh_filter/mesh_filter.hpp>
 #include <moveit/mesh_filter/stereo_camera_model.hpp>
diff --git a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
index ab939ef534..75b7cb49ca 100644
--- a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
+++ b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
@@ -35,8 +35,16 @@
 /* Author: Suat Gedikli */
 
 #include <moveit/mesh_filter/transform_provider.hpp>
-#include <tf2_ros/transform_listener.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+#include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <tf2_eigen/tf2_eigen.hpp>
 
 TransformProvider::TransformProvider(double update_rate) : stop_(true), update_rate_(update_rate)
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
index 3e84809f48..2b81fd4b61 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
@@ -39,8 +39,15 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/callback_group.hpp>
 #include <rclcpp/version.h>
-#include <tf2_ros/transform_listener.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/message_filter.hpp>
+#include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/message_filter.h>
+#include <tf2_ros/transform_listener.h>
+#endif
 #if RCLCPP_VERSION_GTE(28, 3, 3)  // Rolling
 #include <message_filters/subscriber.hpp>
 #else
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
index 87ece33ba5..7b54dd03e2 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@@ -50,8 +50,15 @@
 #include <tf2/LinearMath/Transform.h>
 #endif
 #include <sensor_msgs/point_cloud2_iterator.hpp>
-#include <tf2_ros/create_timer_interface.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+#include <tf2_ros/create_timer_interface.hpp>
 #include <tf2_ros/create_timer_ros.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/create_timer_interface.h>
+#include <tf2_ros/create_timer_ros.h>
+#endif
 #include <moveit/utils/logger.hpp>
 #include <rclcpp/version.h>
 
diff --git a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
index e6821fae90..9c81fd20c4 100644
--- a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
+++ b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
@@ -40,12 +40,19 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <moveit/controller_manager/controller_manager.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/planning_pipeline/planning_pipeline.hpp>
 #include <moveit/trajectory_execution_manager/trajectory_execution_manager.hpp>
 #include <moveit/robot_state/robot_state.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 namespace moveit_cpp
 {
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
index 34fa5f092d..f06c3b6da1 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
@@ -45,10 +45,17 @@
 #include <boost/signals2.hpp>
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_msgs/msg/tf_message.hpp>
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <moveit/robot_state/robot_state.hpp>
 
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
index 3d9b9fb097..b050c4db4d 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
@@ -37,8 +37,16 @@
 #pragma once
 
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
 #include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#include <tf2_ros/transform_listener.h>
+#endif
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/planning_scene/planning_scene.hpp>
 #include <moveit/robot_model_loader/robot_model_loader.hpp>
diff --git a/moveit_ros/planning/planning_scene_monitor/src/current_state_monitor_middleware_handle.cpp b/moveit_ros/planning/planning_scene_monitor/src/current_state_monitor_middleware_handle.cpp
index 33f18180de..5ce64bfb47 100644
--- a/moveit_ros/planning/planning_scene_monitor/src/current_state_monitor_middleware_handle.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/src/current_state_monitor_middleware_handle.cpp
@@ -50,7 +50,6 @@
 #include <rclcpp/utilities.hpp>
 #include <chrono>
 #include <string>
-#include <tf2_ros/qos.hpp>
 
 #include <moveit/planning_scene_monitor/current_state_monitor_middleware_handle.hpp>
 
diff --git a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
index 46d25dfa94..ed5a8db799 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
@@ -43,7 +43,14 @@
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 struct MockMiddlewareHandle : public planning_scene_monitor::CurrentStateMonitor::MiddlewareHandle
 {
diff --git a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
index a263c2e5c6..319d4f02a9 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
@@ -44,7 +44,14 @@
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 using namespace std::chrono_literals;
 
diff --git a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
index 121d3a5a16..184283e3df 100644
--- a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
+++ b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
@@ -37,7 +37,14 @@
 #pragma once
 
 #include <memory>
+#include <rclcpp/version.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 #include <moveit/planning_scene_monitor/current_state_monitor.hpp>
 #include <moveit/robot_model_loader/robot_model_loader.hpp>
 
diff --git a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
index 3d3b220fe1..60ea248c50 100644
--- a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
+++ b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
@@ -48,6 +48,7 @@
 #include <moveit_msgs/action/move_group.hpp>
 #include <moveit_msgs/action/execute_trajectory.hpp>
 #include <rclcpp/logger.hpp>
+#include <rclcpp/version.h>
 
 #include <moveit_msgs/msg/motion_plan_request.hpp>
 #include <geometry_msgs/msg/pose_stamped.hpp>
@@ -56,7 +57,13 @@
 
 #include <memory>
 #include <utility>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <moveit_move_group_interface_export.h>
 
diff --git a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
index 94e97803fb..a9d69e9885 100644
--- a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
+++ b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
@@ -39,6 +39,10 @@
 #include <stdexcept>
 #include <sstream>
 #include <memory>
+
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #include <moveit/warehouse/constraints_storage.hpp>
 #include <moveit/kinematic_constraints/utils.hpp>
@@ -68,9 +72,13 @@
 #include <tf2/utils.h>
 #endif
 #include <tf2_eigen/tf2_eigen.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/transform_listener.hpp>
-#include <rclcpp/rclcpp.hpp>
-#include <rclcpp/version.h>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
 
 namespace moveit
 {
diff --git a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
index 6f1fa1282b..c87a36dcd9 100644
--- a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
+++ b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
@@ -36,12 +36,19 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
 #include <geometry_msgs/msg/pose_stamped.hpp>
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/robot_interaction/locked_robot_state.hpp>
 #include <visualization_msgs/msg/interactive_marker_feedback.hpp>
 #include <interactive_markers/menu_handler.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 namespace robot_interaction
 {
diff --git a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
index 08bec94e15..c8cc8458b2 100644
--- a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
+++ b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
@@ -22,12 +22,20 @@
 #include <string>
 #include <vector>
 
+#include <rclcpp/version.h>
+
 #include <moveit/move_group_interface/move_group_interface.hpp>
 #include <moveit_msgs/msg/constraints.hpp>
 #include <moveit_msgs/msg/robot_trajectory.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <warehouse_ros/message_collection.h>
 
diff --git a/moveit_ros/trajectory_cache/src/utils/utils.cpp b/moveit_ros/trajectory_cache/src/utils/utils.cpp
index 6be28158ad..d47107dba5 100644
--- a/moveit_ros/trajectory_cache/src/utils/utils.cpp
+++ b/moveit_ros/trajectory_cache/src/utils/utils.cpp
@@ -21,6 +21,8 @@
 #include <string>
 #include <vector>
 
+#include <rclcpp/version.h>
+
 #include <moveit/move_group_interface/move_group_interface.hpp>
 #include <moveit/robot_state/conversions.hpp>
 #include <moveit_msgs/msg/robot_state.hpp>
@@ -28,7 +30,13 @@
 #include <moveit_msgs/msg/constraints.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <warehouse_ros/message_collection.h>
 
diff --git a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
index b6c6e89d1d..0e55736f2b 100644
--- a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
+++ b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
@@ -25,7 +25,13 @@
 #include <moveit_msgs/msg/orientation_constraint.hpp>
 #include <moveit_msgs/msg/position_constraint.hpp>
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include "../fixtures/warehouse_fixture.hpp"
 
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
index afd8cd2f28..5571ed664c 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -36,6 +36,8 @@
 
 #include <functional>
 
+#include <rclcpp/version.h>
+
 #include <moveit/common_planning_interface_objects/common_objects.hpp>
 #include <moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp>
 #include <moveit/motion_planning_rviz_plugin/motion_planning_frame_joints_widget.hpp>
@@ -47,7 +49,13 @@
 
 #include <rviz_common/display_context.hpp>
 #include <rviz_common/frame_manager_iface.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <std_srvs/srv/empty.hpp>
 
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index 3d9f3ad927..624c93a48b 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -35,6 +35,8 @@
 
 /* Author: Ioan Sucan */
 
+#include <rclcpp/version.h>
+
 #include <moveit/common_planning_interface_objects/common_objects.hpp>
 #include <moveit/planning_scene_rviz_plugin/planning_scene_display.hpp>
 #include <moveit/rviz_plugin_render_tools/robot_state_visualization.hpp>
@@ -50,7 +52,13 @@
 #include <rviz_common/properties/color_property.hpp>
 #include <rviz_common/properties/enum_property.hpp>
 #include <rviz_common/display_context.hpp>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
 #include <tf2_ros/buffer.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/buffer.h>
+#endif
 
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
diff --git a/moveit_ros/warehouse/src/save_to_warehouse.cpp b/moveit_ros/warehouse/src/save_to_warehouse.cpp
index 7521331f35..2d7e5af70d 100644
--- a/moveit_ros/warehouse/src/save_to_warehouse.cpp
+++ b/moveit_ros/warehouse/src/save_to_warehouse.cpp
@@ -34,17 +34,6 @@
 
 /* Author: Ioan Sucan */
 
-#include <moveit/warehouse/planning_scene_storage.hpp>
-#include <moveit/warehouse/constraints_storage.hpp>
-#include <moveit/warehouse/state_storage.hpp>
-#include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
-#include <moveit/utils/logger.hpp>
-#include <boost/program_options/cmdline.hpp>
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/parsers.hpp>
-#include <boost/program_options/variables_map.hpp>
-#include <fmt/format.h>
-#include <tf2_ros/transform_listener.hpp>
 #include <rclcpp/executors.hpp>
 #include <rclcpp/experimental/buffers/intra_process_buffer.hpp>
 #include <rclcpp/logger.hpp>
@@ -60,6 +49,24 @@
 #include <rclcpp/subscription.hpp>
 #include <rclcpp/utilities.hpp>
 
+#include <moveit/warehouse/planning_scene_storage.hpp>
+#include <moveit/warehouse/constraints_storage.hpp>
+#include <moveit/warehouse/state_storage.hpp>
+#include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
+#include <moveit/utils/logger.hpp>
+#include <boost/program_options/cmdline.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <fmt/format.h>
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+#include <tf2_ros/transform_listener.hpp>
+// For Kilted and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
+
 rclcpp::Logger getLogger()
 {
   return moveit::getLogger("moveit.ros.save_to_warehouse");

From 31be25b55d612dc70e25bea5009d1d5f011aabb7 Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Sun, 7 Sep 2025 22:17:45 -0600
Subject: [PATCH 03/10] Update image_common use to new lifecycle node and QOS
 API

---
 .../src/depth_image_octomap_updater.cpp       | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/moveit_ros/perception/depth_image_octomap_updater/src/depth_image_octomap_updater.cpp b/moveit_ros/perception/depth_image_octomap_updater/src/depth_image_octomap_updater.cpp
index be57f380b0..b3f4cdae0f 100644
--- a/moveit_ros/perception/depth_image_octomap_updater/src/depth_image_octomap_updater.cpp
+++ b/moveit_ros/perception/depth_image_octomap_updater/src/depth_image_octomap_updater.cpp
@@ -37,6 +37,8 @@
 #include <moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp>
 #include <moveit/occupancy_map_monitor/occupancy_map_monitor.hpp>
 #include <cmath>
+#include <rclcpp/qos.hpp>
+#include <rclcpp/version.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 // TODO: Remove conditional includes when released to all active distros.
 #if __has_include(<tf2/LinearMath/Vector3.hpp>)
@@ -158,13 +160,26 @@ void DepthImageOctomapUpdater::start()
 
   pub_filtered_label_image_ = filtered_label_transport_->advertiseCamera(prefix + "filtered_label", 1);
 
-  sub_depth_image_ = image_transport::create_camera_subscription(
-      node_.get(), image_topic_,
-      [this](const sensor_msgs::msg::Image::ConstSharedPtr& depth_msg,
-             const sensor_msgs::msg::CameraInfo::ConstSharedPtr& info_msg) {
-        return depthImageCallback(depth_msg, info_msg);
-      },
-      "raw", rmw_qos_profile_sensor_data);
+  sub_depth_image_ =
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+      image_transport::create_camera_subscription(
+          *node_, image_topic_,
+          [this](const sensor_msgs::msg::Image::ConstSharedPtr& depth_msg,
+                 const sensor_msgs::msg::CameraInfo::ConstSharedPtr& info_msg) {
+            return depthImageCallback(depth_msg, info_msg);
+          },
+          "raw", rclcpp::SensorDataQoS());
+// For Kilted and older
+#else
+      image_transport::create_camera_subscription(
+          node_.get(), image_topic_,
+          [this](const sensor_msgs::msg::Image::ConstSharedPtr& depth_msg,
+                 const sensor_msgs::msg::CameraInfo::ConstSharedPtr& info_msg) {
+            return depthImageCallback(depth_msg, info_msg);
+          },
+          "raw", rmw_qos_profile_sensor_data);
+#endif
 }
 
 void DepthImageOctomapUpdater::stop()

From bc69ae24881c387817e2578aa0c565048685a123 Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Mon, 8 Sep 2025 10:42:27 -0600
Subject: [PATCH 04/10] Update moveit_ros_visualization to use rviz update
 std::chrono::nanoseconds API

---
 .../motion_planning_display.hpp               | 23 ++++++++++-
 .../motion_planning_frame.hpp                 | 10 +++++
 .../src/motion_planning_display.cpp           | 38 ++++++++++++++++++-
 .../src/motion_planning_frame.cpp             |  8 +++-
 .../planning_scene_display.hpp                | 21 ++++++++++
 .../src/planning_scene_display.cpp            | 34 +++++++++++++++--
 .../robot_state_display.hpp                   | 14 +++++++
 .../src/robot_state_display.cpp               | 22 +++++++++++
 .../trajectory_visualization.hpp              | 12 +++++-
 .../src/trajectory_visualization.cpp          | 12 ++++--
 .../trajectory_display.hpp                    | 14 +++++++
 .../src/trajectory_display.cpp                | 16 ++++++++
 12 files changed, 212 insertions(+), 12 deletions(-)

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
index 4f5a2b9242..2e54a0e7e8 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
@@ -36,6 +36,9 @@
 
 #pragma once
 
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp/version.h>
+
 #include <rviz_common/display.hpp>
 #include <rviz_common/panel_dock_widget.hpp>
 #include <moveit/planning_scene_rviz_plugin/planning_scene_display.hpp>
@@ -50,12 +53,11 @@
 #include <moveit/kinematics_metrics/kinematics_metrics.hpp>
 #include <moveit/dynamics_solver/dynamics_solver.hpp>
 
-#include <rclcpp/rclcpp.hpp>
-
 #include <std_msgs/msg/string.hpp>
 #include <moveit_msgs/msg/display_trajectory.hpp>
 #endif
 
+#include <chrono>
 #include <memory>
 
 namespace Ogre
@@ -106,7 +108,16 @@ class MotionPlanningDisplay : public PlanningSceneDisplay
   void load(const rviz_common::Config& config) override;
   void save(rviz_common::Config config) const override;
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
+  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  update(float wall_dt, float ros_dt) override;
+// For Kilted and older
+#else
   void update(float wall_dt, float ros_dt) override;
+#endif
+
   void reset() override;
 
   moveit::core::RobotStateConstPtr getQueryStartState() const
@@ -213,7 +224,15 @@ private Q_SLOTS:
   void onRobotModelLoaded() override;
   void onNewPlanningSceneState() override;
   void onSceneMonitorReceivedUpdate(planning_scene_monitor::PlanningSceneMonitor::SceneUpdateType update_type) override;
+  void updateInternal(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  [[deprecated("Use updateInternal(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  updateInternal(double wall_dt, double ros_dt) override;
+// For Kilted and older
+#else
   void updateInternal(double wall_dt, double ros_dt) override;
+#endif
 
   void renderWorkspaceBox();
   void updateLinkColors();
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp
index 67e44bb40a..e591cc96f7 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
+
 #include <QWidget>
 #include <QTreeWidgetItem>
 #include <QListWidgetItem>
@@ -122,7 +124,15 @@ class MotionPlanningFrame : public QWidget
   void initFromMoveGroupNS();
   void constructPlanningRequest(moveit_msgs::msg::MotionPlanRequest& mreq);
 
+  void updateSceneMarkers(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt);
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  [[deprecated("Use updateSceneMarkers(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  updateSceneMarkers(double wall_dt, double ros_dt);
+// For Kilted and older
+#else
   void updateSceneMarkers(double wall_dt, double ros_dt);
+#endif
 
   void updateExternalCommunication();
 
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
index e279a23e5d..0507782fdc 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
@@ -1337,6 +1337,35 @@ void MotionPlanningDisplay::onDisable()
 // ******************************************************************************************
 // Update
 // ******************************************************************************************
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+void MotionPlanningDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
+{
+  if (int_marker_display_)
+    int_marker_display_->update(wall_dt, ros_dt);
+  if (frame_)
+    frame_->updateSceneMarkers(wall_dt, ros_dt);
+
+  PlanningSceneDisplay::update(wall_dt, ros_dt);
+}
+
+void MotionPlanningDisplay::update(float wall_dt, float ros_dt)
+{
+  if (int_marker_display_)
+    int_marker_display_->update(
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+  if (frame_)
+    frame_->updateSceneMarkers(
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+
+  PlanningSceneDisplay::update(
+      std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+      std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+}
+// For Kilted and older
+#else
 void MotionPlanningDisplay::update(float wall_dt, float ros_dt)
 {
   if (int_marker_display_)
@@ -1346,8 +1375,9 @@ void MotionPlanningDisplay::update(float wall_dt, float ros_dt)
 
   PlanningSceneDisplay::update(wall_dt, ros_dt);
 }
+#endif
 
-void MotionPlanningDisplay::updateInternal(double wall_dt, double ros_dt)
+void MotionPlanningDisplay::updateInternal(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
 {
   PlanningSceneDisplay::updateInternal(wall_dt, ros_dt);
 
@@ -1357,6 +1387,12 @@ void MotionPlanningDisplay::updateInternal(double wall_dt, double ros_dt)
   renderWorkspaceBox();
 }
 
+void MotionPlanningDisplay::updateInternal(double wall_dt, double ros_dt)
+{
+  updateInternal(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+                 std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+}
+
 void MotionPlanningDisplay::load(const rviz_common::Config& config)
 {
   PlanningSceneDisplay::load(config);
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
index 5571ed664c..a5934552f4 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -686,12 +686,18 @@ void MotionPlanningFrame::tabChanged(int index)
   }
 }
 
-void MotionPlanningFrame::updateSceneMarkers(double /*wall_dt*/, double /*ros_dt*/)
+void MotionPlanningFrame::updateSceneMarkers(std::chrono::nanoseconds /*wall_dt*/, std::chrono::nanoseconds /*ros_dt*/)
 {
   if (scene_marker_)
     scene_marker_->update();
 }
 
+void MotionPlanningFrame::updateSceneMarkers(double wall_dt, double ros_dt)
+{
+  updateSceneMarkers(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+                     std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+}
+
 void MotionPlanningFrame::updateExternalCommunication()
 {
   if (ui_->allow_external_program->isChecked())
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp b/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
index 1c0aa57c77..bdc9ecc516 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
+
 #include <rviz_common/display.hpp>
 #include <rviz_default_plugins/robot/robot.hpp>
 #include <rviz_common/properties/string_property.hpp>
@@ -49,6 +51,8 @@
 
 #include <moveit_planning_scene_rviz_plugin_core_export.h>
 
+#include <chrono>
+
 namespace Ogre
 {
 class SceneNode;
@@ -79,7 +83,16 @@ class MOVEIT_PLANNING_SCENE_RVIZ_PLUGIN_CORE_EXPORT PlanningSceneDisplay : publi
   void load(const rviz_common::Config& config) override;
   void save(rviz_common::Config config) const override;
 
+  // For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
+  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  update(float wall_dt, float ros_dt) override;
+// For Kilted and older
+#else
   void update(float wall_dt, float ros_dt) override;
+#endif
+
   void reset() override;
 
   void setLinkColor(const std::string& link_name, const QColor& color);
@@ -178,7 +191,15 @@ protected Q_SLOTS:
   void fixedFrameChanged() override;
 
   // new virtual functions added by this plugin
+  virtual void updateInternal(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt);
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  [[deprecated("Use updateInternal(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] virtual void
+  updateInternal(double wall_dt, double ros_dt);
+// For Kilted and older
+#else
   virtual void updateInternal(double wall_dt, double ros_dt);
+#endif
   virtual void onSceneMonitorReceivedUpdate(planning_scene_monitor::PlanningSceneMonitor::SceneUpdateType update_type);
 
   planning_scene_monitor::PlanningSceneMonitorPtr planning_scene_monitor_;
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index 624c93a48b..d011498db5 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -35,8 +35,6 @@
 
 /* Author: Ioan Sucan */
 
-#include <rclcpp/version.h>
-
 #include <moveit/common_planning_interface_objects/common_objects.hpp>
 #include <moveit/planning_scene_rviz_plugin/planning_scene_display.hpp>
 #include <moveit/rviz_plugin_render_tools/robot_state_visualization.hpp>
@@ -669,6 +667,27 @@ void PlanningSceneDisplay::queueRenderSceneGeometry()
   planning_scene_needs_render_ = true;
 }
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+void PlanningSceneDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
+{
+  Display::update(wall_dt, ros_dt);
+
+  executeMainLoopJobs();
+
+  calculateOffsetPosition();
+
+  if (planning_scene_monitor_)
+    updateInternal(wall_dt, ros_dt);
+}
+
+void PlanningSceneDisplay::update(float wall_dt, float ros_dt)
+{
+  PlanningSceneDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
+                               std::chrono::nanoseconds(std::lround(ros_dt)));
+}
+// For Kilted and older
+#else
 void PlanningSceneDisplay::update(float wall_dt, float ros_dt)
 {
   Display::update(wall_dt, ros_dt);
@@ -680,10 +699,11 @@ void PlanningSceneDisplay::update(float wall_dt, float ros_dt)
   if (planning_scene_monitor_)
     updateInternal(wall_dt, ros_dt);
 }
+#endif
 
-void PlanningSceneDisplay::updateInternal(double wall_dt, double /*ros_dt*/)
+void PlanningSceneDisplay::updateInternal(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds /*ros_dt*/)
 {
-  current_scene_time_ += wall_dt;
+  current_scene_time_ += std::chrono::duration_cast<std::chrono::duration<double>>(wall_dt).count();
   if (planning_scene_render_ &&
       ((current_scene_time_ > scene_display_time_property_->getFloat() && robot_state_needs_render_) ||
        planning_scene_needs_render_))
@@ -695,6 +715,12 @@ void PlanningSceneDisplay::updateInternal(double wall_dt, double /*ros_dt*/)
   }
 }
 
+void PlanningSceneDisplay::updateInternal(double wall_dt, double ros_dt)
+{
+  updateInternal(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+                 std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+}
+
 void PlanningSceneDisplay::load(const rviz_common::Config& config)
 {
   Display::load(config);
diff --git a/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp b/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
index 19e4c48920..6cdfdcc07b 100644
--- a/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
+++ b/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
+
 #include <rviz_common/display.hpp>
 
 #ifndef Q_MOC_RUN
@@ -45,6 +47,8 @@
 #include <rclcpp/rclcpp.hpp>
 #endif
 
+#include <chrono>
+
 namespace rviz_common
 {
 namespace properties
@@ -71,7 +75,17 @@ class RobotStateDisplay : public rviz_common::Display
   ~RobotStateDisplay() override;
 
   void load(const rviz_common::Config& config) override;
+
+  // For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
+  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  update(float wall_dt, float ros_dt) override;
+// For Kilted and older
+#else
   void update(float wall_dt, float ros_dt) override;
+#endif
+
   void reset() override;
 
   const moveit::core::RobotModelConstPtr& getRobotModel() const
diff --git a/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp b/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
index 960215e33a..3f27d0339c 100644
--- a/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
+++ b/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
@@ -459,6 +459,27 @@ void RobotStateDisplay::onDisable()
   Display::onDisable();
 }
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+void RobotStateDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
+{
+  Display::update(wall_dt, ros_dt);
+  calculateOffsetPosition();
+  if (robot_ && update_state_ && robot_state_)
+  {
+    update_state_ = false;
+    robot_state_->update();
+    robot_->update(robot_state_);
+  }
+}
+
+void RobotStateDisplay::update(float wall_dt, float ros_dt)
+{
+  RobotStateDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
+                            std::chrono::nanoseconds(std::lround(ros_dt)));
+}
+// For Kilted and older
+#else
 void RobotStateDisplay::update(float wall_dt, float ros_dt)
 {
   Display::update(wall_dt, ros_dt);
@@ -470,6 +491,7 @@ void RobotStateDisplay::update(float wall_dt, float ros_dt)
     robot_->update(robot_state_);
   }
 }
+#endif
 
 // ******************************************************************************************
 // Calculate Offset Position
diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/trajectory_visualization.hpp b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/trajectory_visualization.hpp
index 9a52e96e65..1831a0a2b5 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/trajectory_visualization.hpp
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/trajectory_visualization.hpp
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
+
 #include <moveit/macros/class_forward.hpp>
 #include <rviz_common/display.hpp>
 #include <rviz_common/panel_dock_widget.hpp>
@@ -88,7 +90,15 @@ class TrajectoryVisualization : public QObject
 
   ~TrajectoryVisualization() override;
 
-  virtual void update(double wall_dt, double sim_dt);
+  virtual void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds sim_dt);
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] virtual void
+  update(double wall_dt, double ros_dt);
+// For Kilted and older
+#else
+  virtual void update(double wall_dt, double ros_dt);
+#endif
   virtual void reset();
 
   void onInitialize(const rclcpp::Node::SharedPtr& node, Ogre::SceneNode* scene_node,
diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp b/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
index 2876aed004..6d648dc8f8 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
@@ -419,7 +419,7 @@ void TrajectoryVisualization::dropTrajectory()
   drop_displaying_trajectory_ = true;
 }
 
-void TrajectoryVisualization::update(double wall_dt, double sim_dt)
+void TrajectoryVisualization::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds sim_dt)
 {
   if (drop_displaying_trajectory_)
   {
@@ -475,11 +475,11 @@ void TrajectoryVisualization::update(double wall_dt, double sim_dt)
     int waypoint_count = displaying_trajectory_message_->getWayPointCount();
     if (use_sim_time_property_->getBool())
     {
-      current_state_time_ += sim_dt;
+      current_state_time_ += std::chrono::duration_cast<std::chrono::duration<double>>(sim_dt).count();
     }
     else
     {
-      current_state_time_ += wall_dt;
+      current_state_time_ += std::chrono::duration_cast<std::chrono::duration<double>>(wall_dt).count();
     }
     double tm = getStateDisplayTime();
 
@@ -549,6 +549,12 @@ void TrajectoryVisualization::update(double wall_dt, double sim_dt)
   display_path_robot_->updateAttachedObjectColors(default_attached_object_color_);
 }
 
+void TrajectoryVisualization::update(double wall_dt, double sim_dt)
+{
+  update(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
+         std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(sim_dt)));
+}
+
 void TrajectoryVisualization::incomingDisplayTrajectory(const moveit_msgs::msg::DisplayTrajectory::ConstSharedPtr& msg)
 {
   // Error check
diff --git a/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp b/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
index 3949bbb084..dd79184737 100644
--- a/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
+++ b/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
@@ -38,6 +38,8 @@
 
 #pragma once
 
+#include <rclcpp/version.h>
+
 #include <rviz_common/display.hpp>
 #include <rviz_common/display_context.hpp>
 #include <rviz_common/ros_integration/ros_node_abstraction_iface.hpp>
@@ -48,6 +50,8 @@
 #include <moveit/rdf_loader/rdf_loader.hpp>
 #endif
 
+#include <chrono>
+
 namespace rviz_common
 {
 class DisplayContext;
@@ -68,7 +72,17 @@ class TrajectoryDisplay : public rviz_common::Display
   void loadRobotModel();
 
   void load(const rviz_common::Config& config) override;
+
+  // For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
+  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
+  update(float wall_dt, float ros_dt) override;
+// For Kilted and older
+#else
   void update(float wall_dt, float ros_dt) override;
+#endif
+
   void reset() override;
 
   // overrides from Display
diff --git a/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp b/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
index 78a13c718f..c851c4f37c 100644
--- a/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
+++ b/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
@@ -129,11 +129,27 @@ void TrajectoryDisplay::onDisable()
   trajectory_visual_->onDisable();
 }
 
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+void TrajectoryDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
+{
+  Display::update(wall_dt, ros_dt);
+  trajectory_visual_->update(wall_dt, ros_dt);
+}
+
+void TrajectoryDisplay::update(float wall_dt, float ros_dt)
+{
+  TrajectoryDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
+                            std::chrono::nanoseconds(std::lround(ros_dt)));
+}
+// For Kilted and older
+#else
 void TrajectoryDisplay::update(float wall_dt, float ros_dt)
 {
   Display::update(wall_dt, ros_dt);
   trajectory_visual_->update(wall_dt, ros_dt);
 }
+#endif
 
 void TrajectoryDisplay::changedRobotDescription()
 {

From a2789a4ada1e5dda586b15c2dadaea4f5579bb81 Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Fri, 12 Sep 2025 07:38:50 -0600
Subject: [PATCH 05/10] Adjust preprecessor includes to account for backport of
 tf2_ros hpp files to Kilted

---
 .../moveit/local_planner/local_planner_component.hpp      | 6 +++---
 .../hybrid_planning/test/test_basic_integration.cpp       | 7 ++++---
 .../src/default_capabilities/tf_publisher_capability.cpp  | 6 +++---
 moveit_ros/move_group/src/move_group.cpp                  | 6 ++++--
 moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp | 6 +++---
 .../moveit_servo/demos/cpp_interface/demo_twist.cpp       | 6 +++---
 moveit_ros/moveit_servo/include/moveit_servo/servo.hpp    | 6 +++---
 .../occupancy_map_monitor/occupancy_map_monitor.hpp       | 6 +++---
 .../occupancy_map_monitor/src/occupancy_map_server.cpp    | 6 +++---
 .../test/occupancy_map_monitor_tests.cpp                  | 6 +++---
 .../depth_image_octomap_updater.hpp                       | 6 +++---
 .../perception/mesh_filter/src/transform_provider.cpp     | 6 +++---
 .../pointcloud_octomap_updater.hpp                        | 6 +++---
 .../src/pointcloud_octomap_updater.cpp                    | 8 ++++----
 .../moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp   | 6 +++---
 .../planning_scene_monitor/current_state_monitor.hpp      | 6 +++---
 .../planning_scene_monitor/planning_scene_monitor.hpp     | 6 +++---
 .../test/current_state_monitor_tests.cpp                  | 6 +++---
 .../test/trajectory_monitor_tests.cpp                     | 6 +++---
 .../common_planning_interface_objects/common_objects.hpp  | 6 +++---
 .../moveit/move_group_interface/move_group_interface.hpp  | 6 +++---
 .../move_group_interface/src/move_group_interface.cpp     | 6 +++---
 .../moveit/robot_interaction/interaction_handler.hpp      | 6 +++---
 .../include/moveit/trajectory_cache/utils/utils.hpp       | 6 +++---
 moveit_ros/trajectory_cache/src/utils/utils.cpp           | 6 +++---
 moveit_ros/trajectory_cache/test/utils/test_utils.cpp     | 6 +++---
 .../src/motion_planning_frame.cpp                         | 6 +++---
 .../src/planning_scene_display.cpp                        | 6 +++---
 moveit_ros/warehouse/src/save_to_warehouse.cpp            | 6 +++---
 29 files changed, 90 insertions(+), 87 deletions(-)

diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
index 8377324fb5..0687c05240 100644
--- a/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
+++ b/moveit_ros/hybrid_planning/local_planner/local_planner_component/include/moveit/local_planner/local_planner_component.hpp
@@ -59,11 +59,11 @@
 #include <moveit/local_planner/local_constraint_solver_interface.hpp>
 #include <moveit/local_planner/trajectory_operator_interface.hpp>
 
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
diff --git a/moveit_ros/hybrid_planning/test/test_basic_integration.cpp b/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
index 0a7b4591d0..859d1792b0 100644
--- a/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
+++ b/moveit_ros/hybrid_planning/test/test_basic_integration.cpp
@@ -43,10 +43,11 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
 #include <rclcpp_action/rclcpp_action.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
index 9e5b579795..e153ce1ab3 100644
--- a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
+++ b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
@@ -41,10 +41,10 @@
 #include <moveit/moveit_cpp/moveit_cpp.hpp>
 #include <moveit/utils/message_checks.hpp>
 #include <moveit/move_group/capability_names.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_broadcaster.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_broadcaster.h>
 #endif
diff --git a/moveit_ros/move_group/src/move_group.cpp b/moveit_ros/move_group/src/move_group.cpp
index eed1feec3e..e071d7648c 100644
--- a/moveit_ros/move_group/src/move_group.cpp
+++ b/moveit_ros/move_group/src/move_group.cpp
@@ -39,9 +39,11 @@
 #include <moveit/moveit_cpp/moveit_cpp.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 // For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
index 3a11ef7215..f7e96bc31b 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_pose.cpp
@@ -46,10 +46,10 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
index b1439e4571..c2f4f8d236 100644
--- a/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
+++ b/moveit_ros/moveit_servo/demos/cpp_interface/demo_twist.cpp
@@ -45,10 +45,10 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
index ceb8eb1916..667c64d332 100644
--- a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
+++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -54,10 +54,10 @@
 #include <pluginlib/class_loader.hpp>
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
index 1020243e60..d30741a6cb 100644
--- a/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
+++ b/moveit_ros/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.hpp
@@ -43,10 +43,10 @@
 
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
index 5e929aea6d..4f993a8950 100644
--- a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
+++ b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
@@ -39,10 +39,10 @@
 #include <moveit/occupancy_map_monitor/occupancy_map_monitor.hpp>
 
 #include <octomap_msgs/conversions.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
index b9fc9d82c2..f4328ad974 100644
--- a/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
+++ b/moveit_ros/occupancy_map_monitor/test/occupancy_map_monitor_tests.cpp
@@ -39,10 +39,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
index d791ef63f0..dbbfd2d431 100644
--- a/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
+++ b/moveit_ros/perception/depth_image_octomap_updater/include/moveit/depth_image_octomap_updater/depth_image_octomap_updater.hpp
@@ -38,10 +38,10 @@
 
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
index 75b7cb49ca..18a9cd898a 100644
--- a/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
+++ b/moveit_ros/perception/mesh_filter/src/transform_provider.cpp
@@ -36,11 +36,11 @@
 
 #include <moveit/mesh_filter/transform_provider.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
index 2b81fd4b61..65c7f090b9 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
@@ -39,11 +39,11 @@
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/callback_group.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/message_filter.hpp>
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/message_filter.h>
 #include <tf2_ros/transform_listener.h>
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
index 7b54dd03e2..d405b6e972 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@@ -50,11 +50,11 @@
 #include <tf2/LinearMath/Transform.h>
 #endif
 #include <sensor_msgs/point_cloud2_iterator.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/create_timer_interface.hpp>
-#include <tf2_ros/create_timer_ros.hpp>
-// For Kilted and older
+#include <tf2_ros/create_timer_Ros.hpp>
+// For Jazzy and older
 #else
 #include <tf2_ros/create_timer_interface.h>
 #include <tf2_ros/create_timer_ros.h>
diff --git a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
index 9c81fd20c4..245c9c1354 100644
--- a/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
+++ b/moveit_ros/planning/moveit_cpp/include/moveit/moveit_cpp/moveit_cpp.hpp
@@ -46,10 +46,10 @@
 #include <moveit/planning_pipeline/planning_pipeline.hpp>
 #include <moveit/trajectory_execution_manager/trajectory_execution_manager.hpp>
 #include <moveit/robot_state/robot_state.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
index f06c3b6da1..19b56f0b26 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/current_state_monitor.hpp
@@ -49,10 +49,10 @@
 #include <sensor_msgs/msg/joint_state.hpp>
 #include <tf2_msgs/msg/tf_message.hpp>
 
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
index b050c4db4d..8ed8bd8fb8 100644
--- a/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
+++ b/moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
@@ -38,11 +38,11 @@
 
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
diff --git a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
index ed5a8db799..affffce9d4 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/current_state_monitor_tests.cpp
@@ -44,10 +44,10 @@
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
index 319d4f02a9..427ea1a919 100644
--- a/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
+++ b/moveit_ros/planning/planning_scene_monitor/test/trajectory_monitor_tests.cpp
@@ -45,10 +45,10 @@
 #include <moveit/utils/robot_model_test_utils.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
index 184283e3df..28534fc72c 100644
--- a/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
+++ b/moveit_ros/planning_interface/common_planning_interface_objects/include/moveit/common_planning_interface_objects/common_objects.hpp
@@ -38,10 +38,10 @@
 
 #include <memory>
 #include <rclcpp/version.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
index 60ea248c50..c68b02bb53 100644
--- a/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
+++ b/moveit_ros/planning_interface/move_group_interface/include/moveit/move_group_interface/move_group_interface.hpp
@@ -57,10 +57,10 @@
 
 #include <memory>
 #include <utility>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
index a9d69e9885..40e3fbdeed 100644
--- a/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
+++ b/moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
@@ -72,10 +72,10 @@
 #include <tf2/utils.h>
 #endif
 #include <tf2_eigen/tf2_eigen.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif
diff --git a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
index c87a36dcd9..227f135542 100644
--- a/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
+++ b/moveit_ros/robot_interaction/include/moveit/robot_interaction/interaction_handler.hpp
@@ -42,10 +42,10 @@
 #include <moveit/robot_interaction/locked_robot_state.hpp>
 #include <visualization_msgs/msg/interactive_marker_feedback.hpp>
 #include <interactive_markers/menu_handler.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
index c8cc8458b2..1ab1b6786a 100644
--- a/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
+++ b/moveit_ros/trajectory_cache/include/moveit/trajectory_cache/utils/utils.hpp
@@ -29,10 +29,10 @@
 #include <moveit_msgs/msg/robot_trajectory.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/trajectory_cache/src/utils/utils.cpp b/moveit_ros/trajectory_cache/src/utils/utils.cpp
index d47107dba5..bb9895995d 100644
--- a/moveit_ros/trajectory_cache/src/utils/utils.cpp
+++ b/moveit_ros/trajectory_cache/src/utils/utils.cpp
@@ -30,10 +30,10 @@
 #include <moveit_msgs/msg/constraints.hpp>
 #include <moveit_msgs/srv/get_cartesian_path.hpp>
 
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
index 0e55736f2b..44698b49dd 100644
--- a/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
+++ b/moveit_ros/trajectory_cache/test/utils/test_utils.cpp
@@ -25,10 +25,10 @@
 #include <moveit_msgs/msg/orientation_constraint.hpp>
 #include <moveit_msgs/msg/position_constraint.hpp>
 
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
index a5934552f4..40bcbdddca 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -49,10 +49,10 @@
 
 #include <rviz_common/display_context.hpp>
 #include <rviz_common/frame_manager_iface.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index d011498db5..86a9819ce3 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -50,10 +50,10 @@
 #include <rviz_common/properties/color_property.hpp>
 #include <rviz_common/properties/enum_property.hpp>
 #include <rviz_common/display_context.hpp>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/buffer.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/buffer.h>
 #endif
diff --git a/moveit_ros/warehouse/src/save_to_warehouse.cpp b/moveit_ros/warehouse/src/save_to_warehouse.cpp
index 2d7e5af70d..c54f86e385 100644
--- a/moveit_ros/warehouse/src/save_to_warehouse.cpp
+++ b/moveit_ros/warehouse/src/save_to_warehouse.cpp
@@ -59,10 +59,10 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <fmt/format.h>
-// For Rolling, L-turtle, and newer
-#if RCLCPP_VERSION_GTE(30, 0, 0)
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/transform_listener.hpp>
-// For Kilted and older
+// For Jazzy and older
 #else
 #include <tf2_ros/transform_listener.h>
 #endif

From 2eeff3af716dadec8e81f09e33ad0b5bb629b9f2 Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Fri, 12 Sep 2025 07:55:10 -0600
Subject: [PATCH 06/10] Test use of  to simplify float -> chrono API redirect

---
 .../motion_planning_display.hpp                  |  4 ++--
 .../src/motion_planning_display.cpp              | 16 ----------------
 .../planning_scene_display.hpp                   |  4 ++--
 .../src/planning_scene_display.cpp               |  6 ------
 .../robot_state_display.hpp                      |  4 ++--
 .../src/robot_state_display.cpp                  |  6 ------
 .../trajectory_display.hpp                       |  4 ++--
 .../src/trajectory_display.cpp                   |  6 ------
 8 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
index 2e54a0e7e8..deed6a6727 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
@@ -110,9 +110,9 @@ class MotionPlanningDisplay : public PlanningSceneDisplay
 
 // For Rolling, L-turtle, and newer
 #if RCLCPP_VERSION_GTE(30, 0, 0)
+  using rviz_common::Display::update;
+  // `using` handles update(float, float) deprecation warning and redirect
   void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
-  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
-  update(float wall_dt, float ros_dt) override;
 // For Kilted and older
 #else
   void update(float wall_dt, float ros_dt) override;
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
index 0507782fdc..fb9e2e2d8c 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
@@ -1348,22 +1348,6 @@ void MotionPlanningDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono
 
   PlanningSceneDisplay::update(wall_dt, ros_dt);
 }
-
-void MotionPlanningDisplay::update(float wall_dt, float ros_dt)
-{
-  if (int_marker_display_)
-    int_marker_display_->update(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
-  if (frame_)
-    frame_->updateSceneMarkers(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
-
-  PlanningSceneDisplay::update(
-      std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-      std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
-}
 // For Kilted and older
 #else
 void MotionPlanningDisplay::update(float wall_dt, float ros_dt)
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp b/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
index bdc9ecc516..9778246fb8 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp
@@ -85,9 +85,9 @@ class MOVEIT_PLANNING_SCENE_RVIZ_PLUGIN_CORE_EXPORT PlanningSceneDisplay : publi
 
   // For Rolling, L-turtle, and newer
 #if RCLCPP_VERSION_GTE(30, 0, 0)
+  using rviz_common::Display::update;
+  // `using` handles update(float, float) deprecation warning and redirect
   void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
-  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
-  update(float wall_dt, float ros_dt) override;
 // For Kilted and older
 #else
   void update(float wall_dt, float ros_dt) override;
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index 86a9819ce3..6c5e1e1608 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -680,12 +680,6 @@ void PlanningSceneDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono:
   if (planning_scene_monitor_)
     updateInternal(wall_dt, ros_dt);
 }
-
-void PlanningSceneDisplay::update(float wall_dt, float ros_dt)
-{
-  PlanningSceneDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
-                               std::chrono::nanoseconds(std::lround(ros_dt)));
-}
 // For Kilted and older
 #else
 void PlanningSceneDisplay::update(float wall_dt, float ros_dt)
diff --git a/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp b/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
index 6cdfdcc07b..c55a7cc009 100644
--- a/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
+++ b/moveit_ros/visualization/robot_state_rviz_plugin/include/moveit/robot_state_rviz_plugin/robot_state_display.hpp
@@ -78,9 +78,9 @@ class RobotStateDisplay : public rviz_common::Display
 
   // For Rolling, L-turtle, and newer
 #if RCLCPP_VERSION_GTE(30, 0, 0)
+  using rviz_common::Display::update;
+  // `using` handles update(float, float) deprecation warning and redirect
   void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
-  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
-  update(float wall_dt, float ros_dt) override;
 // For Kilted and older
 #else
   void update(float wall_dt, float ros_dt) override;
diff --git a/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp b/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
index 3f27d0339c..483b10d9ed 100644
--- a/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
+++ b/moveit_ros/visualization/robot_state_rviz_plugin/src/robot_state_display.cpp
@@ -472,12 +472,6 @@ void RobotStateDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::na
     robot_->update(robot_state_);
   }
 }
-
-void RobotStateDisplay::update(float wall_dt, float ros_dt)
-{
-  RobotStateDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
-                            std::chrono::nanoseconds(std::lround(ros_dt)));
-}
 // For Kilted and older
 #else
 void RobotStateDisplay::update(float wall_dt, float ros_dt)
diff --git a/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp b/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
index dd79184737..83f40524d5 100644
--- a/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
+++ b/moveit_ros/visualization/trajectory_rviz_plugin/include/moveit/trajectory_rviz_plugin/trajectory_display.hpp
@@ -75,9 +75,9 @@ class TrajectoryDisplay : public rviz_common::Display
 
   // For Rolling, L-turtle, and newer
 #if RCLCPP_VERSION_GTE(30, 0, 0)
+  using rviz_common::Display::update;
+  // `using` handles update(float, float) deprecation warning and redirect
   void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;
-  [[deprecated("Use update(std::chrono::nanoseconds, std::chrono::nanoseconds) instead")]] void
-  update(float wall_dt, float ros_dt) override;
 // For Kilted and older
 #else
   void update(float wall_dt, float ros_dt) override;
diff --git a/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp b/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
index c851c4f37c..a66e5d965c 100644
--- a/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
+++ b/moveit_ros/visualization/trajectory_rviz_plugin/src/trajectory_display.cpp
@@ -136,12 +136,6 @@ void TrajectoryDisplay::update(std::chrono::nanoseconds wall_dt, std::chrono::na
   Display::update(wall_dt, ros_dt);
   trajectory_visual_->update(wall_dt, ros_dt);
 }
-
-void TrajectoryDisplay::update(float wall_dt, float ros_dt)
-{
-  TrajectoryDisplay::update(std::chrono::nanoseconds(std::lround(wall_dt)),
-                            std::chrono::nanoseconds(std::lround(ros_dt)));
-}
 // For Kilted and older
 #else
 void TrajectoryDisplay::update(float wall_dt, float ros_dt)

From 61510af1855396263ccc6dfefcc4c36c0e8c7e8b Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Fri, 12 Sep 2025 08:02:35 -0600
Subject: [PATCH 07/10] Revert some changes which assumed update took in sec
 not ns

---
 .../src/motion_planning_display.cpp                          | 3 +--
 .../src/motion_planning_frame.cpp                            | 5 +++--
 .../src/planning_scene_display.cpp                           | 5 +++--
 .../src/trajectory_visualization.cpp                         | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
index fb9e2e2d8c..dfad31931d 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
@@ -1373,8 +1373,7 @@ void MotionPlanningDisplay::updateInternal(std::chrono::nanoseconds wall_dt, std
 
 void MotionPlanningDisplay::updateInternal(double wall_dt, double ros_dt)
 {
-  updateInternal(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-                 std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+  updateInternal(std::chrono::nanoseconds(std::lround(wall_dt)), std::chrono::nanoseconds(std::lround(ros_dt)));
 }
 
 void MotionPlanningDisplay::load(const rviz_common::Config& config)
diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
index 40bcbdddca..7e2bb78b6f 100644
--- a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
+++ b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -67,6 +67,8 @@
 
 #include "ui_motion_planning_rviz_plugin_frame.h"
 
+#include <cmath>
+
 namespace moveit_rviz_plugin
 {
 
@@ -694,8 +696,7 @@ void MotionPlanningFrame::updateSceneMarkers(std::chrono::nanoseconds /*wall_dt*
 
 void MotionPlanningFrame::updateSceneMarkers(double wall_dt, double ros_dt)
 {
-  updateSceneMarkers(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-                     std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+  updateSceneMarkers(std::chrono::nanoseconds(std::lround(wall_dt)), std::chrono::nanoseconds(std::lround(ros_dt)));
 }
 
 void MotionPlanningFrame::updateExternalCommunication()
diff --git a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
index 6c5e1e1608..074df1accb 100644
--- a/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
+++ b/moveit_ros/visualization/planning_scene_rviz_plugin/src/planning_scene_display.cpp
@@ -64,6 +64,8 @@
 #include <moveit/utils/rclcpp_utils.hpp>
 #include <moveit/utils/logger.hpp>
 
+#include <cmath>
+
 namespace moveit_rviz_plugin
 {
 // ******************************************************************************************
@@ -711,8 +713,7 @@ void PlanningSceneDisplay::updateInternal(std::chrono::nanoseconds wall_dt, std:
 
 void PlanningSceneDisplay::updateInternal(double wall_dt, double ros_dt)
 {
-  updateInternal(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-                 std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(ros_dt)));
+  updateInternal(std::chrono::nanoseconds(std::lround(wall_dt)), std::chrono::nanoseconds(std::lround(ros_dt)));
 }
 
 void PlanningSceneDisplay::load(const rviz_common::Config& config)
diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp b/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
index 6d648dc8f8..05fabc60fe 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/src/trajectory_visualization.cpp
@@ -58,6 +58,7 @@
 
 #include <rclcpp/qos.hpp>
 
+#include <cmath>
 #include <string>
 
 using namespace std::placeholders;
@@ -551,8 +552,7 @@ void TrajectoryVisualization::update(std::chrono::nanoseconds wall_dt, std::chro
 
 void TrajectoryVisualization::update(double wall_dt, double sim_dt)
 {
-  update(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(wall_dt)),
-         std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(sim_dt)));
+  update(std::chrono::nanoseconds(std::lround(wall_dt)), std::chrono::nanoseconds(std::lround(sim_dt)));
 }
 
 void TrajectoryVisualization::incomingDisplayTrajectory(const moveit_msgs::msg::DisplayTrajectory::ConstSharedPtr& msg)

From ab48a85252e1ee7d004d0ab8f2aaceb691b62dae Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Fri, 12 Sep 2025 10:36:32 -0600
Subject: [PATCH 08/10] Fix fat finger

---
 .../src/pointcloud_octomap_updater.cpp                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
index d405b6e972..4cd351afa2 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@@ -53,7 +53,7 @@
 // For Rolling, Kilted, and newer
 #if RCLCPP_VERSION_GTE(29, 6, 0)
 #include <tf2_ros/create_timer_interface.hpp>
-#include <tf2_ros/create_timer_Ros.hpp>
+#include <tf2_ros/create_timer_ros.hpp>
 // For Jazzy and older
 #else
 #include <tf2_ros/create_timer_interface.h>

From 12c176b8b1232f975ec9809467674b7e60d8142b Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Sat, 11 Oct 2025 11:32:07 -0600
Subject: [PATCH 09/10] Fix tf2_ros deprecation warnings by migrating from
 NodeT to NodeInterfaces API

---
 .../default_capabilities/tf_publisher_capability.cpp  |  7 +++++++
 .../src/occupancy_map_server.cpp                      | 10 ++++++++++
 .../src/pointcloud_octomap_updater.cpp                | 11 +++++++++++
 3 files changed, 28 insertions(+)

diff --git a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
index e153ce1ab3..d17693c548 100644
--- a/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
+++ b/moveit_ros/move_group/src/default_capabilities/tf_publisher_capability.cpp
@@ -85,7 +85,14 @@ void publishSubframes(tf2_ros::TransformBroadcaster& broadcaster, const moveit::
 
 void TfPublisher::publishPlanningSceneFrames()
 {
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  tf2_ros::TransformBroadcaster broadcaster(tf2_ros::TransformBroadcaster::RequiredInterfaces{
+      context_->moveit_cpp_->getNode()->get_node_parameters_interface(),
+      context_->moveit_cpp_->getNode()->get_node_topics_interface() });
+#else
   tf2_ros::TransformBroadcaster broadcaster(context_->moveit_cpp_->getNode());
+#endif
   geometry_msgs::msg::TransformStamped transform;
   rclcpp::Rate rate(rate_);
 
diff --git a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
index 4f993a8950..4976eb473e 100644
--- a/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
+++ b/moveit_ros/occupancy_map_monitor/src/occupancy_map_server.cpp
@@ -107,7 +107,17 @@ int main(int argc, char** argv)
       node->create_publisher<octomap_msgs::msg::Octomap>("octomap_binary", RMW_QOS_POLICY_HISTORY_KEEP_LAST);
   auto clock_ptr = std::make_shared<rclcpp::Clock>(RCL_ROS_TIME);
   std::shared_ptr<tf2_ros::Buffer> buffer = std::make_shared<tf2_ros::Buffer>(clock_ptr, tf2::durationFromSec(5.0));
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+  tf2_ros::TransformListener listener(*buffer,
+                                      tf2_ros::TransformListener::RequiredInterfaces{
+                                          node->get_node_base_interface(), node->get_node_logging_interface(),
+                                          node->get_node_parameters_interface(), node->get_node_topics_interface() },
+                                      false  // spin_thread
+  );
+#else
   tf2_ros::TransformListener listener(*buffer, node, false /* spin_thread - disables executor */);
+#endif
   occupancy_map_monitor::OccupancyMapMonitor server(node, buffer);
   server.setUpdateCallback(
       [&octree_binary_pub, &server, logger = node->get_logger()] { return publishOctomap(octree_binary_pub, server); });
diff --git a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
index 4cd351afa2..7ab437a75a 100644
--- a/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
+++ b/moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@@ -158,8 +158,19 @@ void PointCloudOctomapUpdater::start()
       new message_filters::Subscriber<sensor_msgs::msg::PointCloud2>(node_, point_cloud_topic_, qos_profile, options);
   if (tf_listener_ && tf_buffer_ && !monitor_->getMapFrame().empty())
   {
+// For Rolling, L-turtle, and newer
+#if RCLCPP_VERSION_GTE(30, 0, 0)
+    using MessageFilterPointCloud2 = tf2_ros::MessageFilter<sensor_msgs::msg::PointCloud2>;
+
+    MessageFilterPointCloud2::RequiredInterfaces required_interfaces{ node_->get_node_logging_interface(),
+                                                                      node_->get_node_clock_interface() };
+
+    point_cloud_filter_ = new tf2_ros::MessageFilter<sensor_msgs::msg::PointCloud2>(
+        *point_cloud_subscriber_, *tf_buffer_, monitor_->getMapFrame(), 5, std::move(required_interfaces));
+#else
     point_cloud_filter_ = new tf2_ros::MessageFilter<sensor_msgs::msg::PointCloud2>(
         *point_cloud_subscriber_, *tf_buffer_, monitor_->getMapFrame(), 5, node_);
+#endif
     point_cloud_filter_->registerCallback(
         [this](const sensor_msgs::msg::PointCloud2::ConstSharedPtr& cloud) { cloudMsgCallback(cloud); });
     RCLCPP_INFO(logger_, "Listening to '%s' using message filter with target frame '%s'", point_cloud_topic_.c_str(),

From 5e3086ec7921358ec634ee50e8a88b24240567da Mon Sep 17 00:00:00 2001
From: Nathan Brooks <nathanbrooks@picknik.ai>
Date: Sat, 11 Oct 2025 11:33:58 -0600
Subject: [PATCH 10/10] Fix rclcpp deprecation warnings by migrating from
 spin_some(rclcpp::node_interfaces::NodeBaseInterface::SharedPtr node_ptr) to
 SingleThreadedExecutor::spin_some() API

---
 moveit_kinematics/test/test_kinematics_plugin.cpp          | 5 ++++-
 moveit_ros/moveit_servo/demos/servo_keyboard_input.cpp     | 5 ++++-
 .../trajectory_cache/test/fixtures/move_group_fixture.cpp  | 5 ++++-
 .../trajectory_cache/test/fixtures/warehouse_fixture.cpp   | 5 ++++-
 moveit_ros/trajectory_cache/test/test_trajectory_cache.cpp | 7 +++++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/moveit_kinematics/test/test_kinematics_plugin.cpp b/moveit_kinematics/test/test_kinematics_plugin.cpp
index 54a082b329..fd39bab192 100644
--- a/moveit_kinematics/test/test_kinematics_plugin.cpp
+++ b/moveit_kinematics/test/test_kinematics_plugin.cpp
@@ -39,6 +39,7 @@
 #include <memory>
 #include <functional>
 #include <pluginlib/class_loader.hpp>
+#include <rclcpp/executors/single_threaded_executor.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
 
@@ -403,7 +404,9 @@ TEST_F(KinematicsTest, randomWalkIK)
     auto pub = node_->create_publisher<moveit_msgs::msg::DisplayTrajectory>("display_random_walk", 1);
     traj.getRobotTrajectoryMsg(msg.trajectory[0]);
     pub->publish(msg);
-    rclcpp::spin_some(node_);
+    rclcpp::executors::SingleThreadedExecutor executor;
+    executor.add_node(node_);
+    executor.spin_some();
   }
 }
 
diff --git a/moveit_ros/moveit_servo/demos/servo_keyboard_input.cpp b/moveit_ros/moveit_servo/demos/servo_keyboard_input.cpp
index 9c5d0805a6..b7e45bc227 100644
--- a/moveit_ros/moveit_servo/demos/servo_keyboard_input.cpp
+++ b/moveit_ros/moveit_servo/demos/servo_keyboard_input.cpp
@@ -42,6 +42,7 @@
 #include <control_msgs/msg/joint_jog.hpp>
 #include <geometry_msgs/msg/twist_stamped.hpp>
 #include <moveit_msgs/srv/servo_command_type.hpp>
+#include <rclcpp/executors/single_threaded_executor.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <signal.h>
 #include <stdio.h>
@@ -188,9 +189,11 @@ int main(int argc, char** argv)
 
 void KeyboardServo::spin()
 {
+  rclcpp::executors::SingleThreadedExecutor executor;
+  executor.add_node(nh_);
   while (rclcpp::ok())
   {
-    rclcpp::spin_some(nh_);
+    executor.spin_some();
   }
 }
 
diff --git a/moveit_ros/trajectory_cache/test/fixtures/move_group_fixture.cpp b/moveit_ros/trajectory_cache/test/fixtures/move_group_fixture.cpp
index f9a6882d1b..fe6c40fdde 100644
--- a/moveit_ros/trajectory_cache/test/fixtures/move_group_fixture.cpp
+++ b/moveit_ros/trajectory_cache/test/fixtures/move_group_fixture.cpp
@@ -21,6 +21,7 @@
 #include <gtest/gtest.h>
 #include <moveit/move_group_interface/move_group_interface.hpp>
 #include <moveit/warehouse/moveit_message_storage.hpp>
+#include <rclcpp/executors/single_threaded_executor.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include "move_group_fixture.hpp"
@@ -60,8 +61,10 @@ void MoveGroupFixture::TearDown()
 
 void MoveGroupFixture::spinNode()
 {
+  rclcpp::executors::SingleThreadedExecutor executor;
+  executor.add_node(node_);
   while (is_spinning_ && rclcpp::ok())
   {
-    rclcpp::spin_some(node_);
+    executor.spin_some();
   }
 }
diff --git a/moveit_ros/trajectory_cache/test/fixtures/warehouse_fixture.cpp b/moveit_ros/trajectory_cache/test/fixtures/warehouse_fixture.cpp
index 3d362b0106..f1ae851836 100644
--- a/moveit_ros/trajectory_cache/test/fixtures/warehouse_fixture.cpp
+++ b/moveit_ros/trajectory_cache/test/fixtures/warehouse_fixture.cpp
@@ -19,6 +19,7 @@
 #include <thread>
 
 #include <gtest/gtest.h>
+#include <rclcpp/executors/single_threaded_executor.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <moveit/warehouse/moveit_message_storage.hpp>
 
@@ -57,8 +58,10 @@ void WarehouseFixture::TearDown()
 
 void WarehouseFixture::spinNode()
 {
+  rclcpp::executors::SingleThreadedExecutor executor;
+  executor.add_node(node_);
   while (is_spinning_ && rclcpp::ok())
   {
-    rclcpp::spin_some(node_);
+    executor.spin_some();
   }
 }
diff --git a/moveit_ros/trajectory_cache/test/test_trajectory_cache.cpp b/moveit_ros/trajectory_cache/test/test_trajectory_cache.cpp
index 69131bc52a..5b2c27393c 100644
--- a/moveit_ros/trajectory_cache/test/test_trajectory_cache.cpp
+++ b/moveit_ros/trajectory_cache/test/test_trajectory_cache.cpp
@@ -16,6 +16,7 @@
  * @author methylDragon
  */
 
+#include <rclcpp/executors/single_threaded_executor.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <moveit/robot_state/conversions.hpp>
@@ -1044,10 +1045,12 @@ int main(int argc, char** argv)
   std::atomic<bool> running = true;
 
   std::thread spin_thread([&]() {
+    rclcpp::executors::SingleThreadedExecutor executor;
+    executor.add_node(test_node);
+    executor.add_node(move_group_node);
     while (rclcpp::ok() && running)
     {
-      rclcpp::spin_some(test_node);
-      rclcpp::spin_some(move_group_node);
+      executor.spin_some();
     }
   });