From 6299094cd7fec7f99d590f81a14e2414a4d87ca9 Mon Sep 17 00:00:00 2001
From: verma nakul <nakulverma.py@gmail.com>
Date: Thu, 9 Jan 2025 15:45:46 +0530
Subject: [PATCH] Use urdf/model.hpp for rolling (#1476)

---
 .../joint_state_broadcaster/joint_state_broadcaster.hpp    | 6 ++++++
 joint_state_broadcaster/src/joint_state_broadcaster.cpp    | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp b/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
index da02c5feb8..f0f100d6d0 100644
--- a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
+++ b/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
 {
diff --git a/joint_state_broadcaster/src/joint_state_broadcaster.cpp b/joint_state_broadcaster/src/joint_state_broadcaster.cpp
index 068559d5a3..5b72b9f35a 100644
--- a/joint_state_broadcaster/src/joint_state_broadcaster.cpp
+++ b/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;