diff --git a/src/rviz_visual_tools.cpp b/src/rviz_visual_tools.cpp
index d261cb2..98e200d 100644
--- a/src/rviz_visual_tools.cpp
+++ b/src/rviz_visual_tools.cpp
@@ -42,13 +42,16 @@
 #include <rviz_visual_tools/rviz_visual_tools.hpp>
 
 // Conversions
-#include <tf2/convert.h>
-#include <tf2/LinearMath/Vector3.h>
-#include <tf2/LinearMath/Quaternion.h>
 #if __has_include(<tf2_eigen/tf2_eigen.hpp>)
+#include <tf2/convert.hpp>
+#include <tf2/LinearMath/Vector3.hpp>
+#include <tf2/LinearMath/Quaternion.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #else
+#include <tf2/convert.h>
+#include <tf2/LinearMath/Vector3.h>
+#include <tf2/LinearMath/Quaternion.h>
 #include <tf2_eigen/tf2_eigen.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>
 #endif
diff --git a/src/tf_visual_tools.cpp b/src/tf_visual_tools.cpp
index 99d7aca..9b3d18b 100644
--- a/src/tf_visual_tools.cpp
+++ b/src/tf_visual_tools.cpp
@@ -34,12 +34,11 @@
 #include <rclcpp/create_timer.hpp>
 #if __has_include(<tf2_eigen/tf2_eigen.hpp>)
 #include <tf2_eigen/tf2_eigen.hpp>
+#include <tf2/convert.hpp>
 #else
 #include <tf2_eigen/tf2_eigen.h>
-#endif
-
-// TF
 #include <tf2/convert.h>
+#endif
 
 // C++
 #include <string>