diff --git a/include/laser_geometry/laser_geometry.hpp b/include/laser_geometry/laser_geometry.hpp
index 21c73ca..b1a6124 100644
--- a/include/laser_geometry/laser_geometry.hpp
+++ b/include/laser_geometry/laser_geometry.hpp
@@ -42,7 +42,7 @@
 #include "tf3/buffer_core.h"
 #include <sensor_msgs/LaserScan.h>
 #include <sensor_msgs/PointCloud2.h>
-#include <geometry_msgs/TransformStamped.h>
+#include <robot_geometry_msgs/TransformStamped.h>
 #include "laser_geometry/visibility_control.hpp"
 
 namespace laser_geometry
diff --git a/src/laser_geometry.cpp b/src/laser_geometry.cpp
index 2fb9aff..cd5fb3e 100644
--- a/src/laser_geometry.cpp
+++ b/src/laser_geometry.cpp
@@ -445,8 +445,8 @@ void LaserProjection::transformLaserScanToPointCloud_(
   tf3::TransformStampedMsg end_transform_msg = tf.lookupTransform(
     target_frame, scan_in.header.frame_id, e);
 
-  geometry_msgs::TransformStamped start_transform = data_convert::convertToTransformStamped(start_transform_msg);
-  geometry_msgs::TransformStamped end_transform = data_convert::convertToTransformStamped(end_transform_msg);
+  robot_geometry_msgs::TransformStamped start_transform = data_convert::convertToTransformStamped(start_transform_msg);
+  robot_geometry_msgs::TransformStamped end_transform = data_convert::convertToTransformStamped(end_transform_msg);
 
   tf3::Quaternion quat_start(start_transform.transform.rotation.x,
     start_transform.transform.rotation.y,