Use urdf/model.hpp for rolling (#1476)

Author: nakul-py

joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp

@@ -26,7 +26,13 @@
 #include "joint_state_broadcaster_parameters.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "sensor_msgs/msg/joint_state.hpp"
+
+#include "rclcpp/version.h"
+#if RCLCPP_VERSION_GTE(29, 0, 0)
+#include "urdf/model.hpp"
+#else
 #include "urdf/model.h"
+#endif
 
 namespace joint_state_broadcaster
 {

joint_state_broadcaster/src/joint_state_broadcaster.cpp

@@ -26,13 +26,6 @@
 #include "rclcpp/time.hpp"
 #include "std_msgs/msg/header.hpp"
 
-#include "rclcpp/version.h"
-#if RCLCPP_VERSION_GTE(29, 0, 0)
-#include "urdf/model.hpp"
-#else
-#include "urdf/model.h"
-#endif
-
 namespace rclcpp_lifecycle
 {
 class State;