From 0ac68106885f170ab5ba30d7ba96e6ba5a048253 Mon Sep 17 00:00:00 2001
From: Sean Kelly <sean@seankelly.dev>
Date: Thu, 6 Aug 2020 14:13:01 -0400
Subject: [PATCH] Rename headers from .h to .hpp (#296)

* Rename headers from .h to .hpp per ROS2 guidelines

This change is the result of the following command run from pcl_ros dir:

$ find -name *.h | xargs -I {} mv {} {}pp

Signed-off-by: Sean Kelly <sean@seankelly.dev>

* Update internal includes for the renamed headers

This change was the result of the following bash script:

$ find -name *.h -o -name *.cpp -o -name *.hpp | xargs -I {} sed -i 's/\(pcl_ros\/.*\)\(h\)\([">]\)$/\1\2pp\3/g' {}

Signed-off-by: Sean Kelly <sean@seankelly.dev>
---
 .../include/pcl_ros/features/{boundary.h => boundary.hpp}   | 2 +-
 pcl_ros/include/pcl_ros/features/{feature.h => feature.hpp} | 4 ++--
 pcl_ros/include/pcl_ros/features/{fpfh.h => fpfh.hpp}       | 2 +-
 .../include/pcl_ros/features/{fpfh_omp.h => fpfh_omp.hpp}   | 2 +-
 .../features/{moment_invariants.h => moment_invariants.hpp} | 2 +-
 .../include/pcl_ros/features/{normal_3d.h => normal_3d.hpp} | 2 +-
 .../pcl_ros/features/{normal_3d_omp.h => normal_3d_omp.hpp} | 2 +-
 .../pcl_ros/features/{normal_3d_tbb.h => normal_3d_tbb.hpp} | 4 ++--
 pcl_ros/include/pcl_ros/features/{pfh.h => pfh.hpp}         | 2 +-
 .../{principal_curvatures.h => principal_curvatures.hpp}    | 2 +-
 pcl_ros/include/pcl_ros/features/{shot.h => shot.hpp}       | 2 +-
 .../include/pcl_ros/features/{shot_omp.h => shot_omp.hpp}   | 2 +-
 pcl_ros/include/pcl_ros/features/{vfh.h => vfh.hpp}         | 2 +-
 .../include/pcl_ros/filters/{crop_box.h => crop_box.hpp}    | 4 ++--
 .../filters/{extract_indices.h => extract_indices.hpp}      | 4 ++--
 pcl_ros/include/pcl_ros/filters/{filter.h => filter.hpp}    | 4 ++--
 .../pcl_ros/filters/{passthrough.h => passthrough.hpp}      | 2 +-
 .../filters/{project_inliers.h => project_inliers.hpp}      | 2 +-
 ...{radius_outlier_removal.h => radius_outlier_removal.hpp} | 4 ++--
 ...al_outlier_removal.h => statistical_outlier_removal.hpp} | 4 ++--
 .../pcl_ros/filters/{voxel_grid.h => voxel_grid.hpp}        | 4 ++--
 pcl_ros/include/pcl_ros/impl/transforms.hpp                 | 2 +-
 pcl_ros/include/pcl_ros/io/{bag_io.h => bag_io.hpp}         | 2 +-
 .../pcl_ros/io/{concatenate_data.h => concatenate_data.hpp} | 0
 .../io/{concatenate_fields.h => concatenate_fields.hpp}     | 0
 pcl_ros/include/pcl_ros/io/{pcd_io.h => pcd_io.hpp}         | 2 +-
 pcl_ros/include/pcl_ros/{pcl_nodelet.h => pcl_nodelet.hpp}  | 2 +-
 pcl_ros/include/pcl_ros/{point_cloud.h => point_cloud.hpp}  | 0
 pcl_ros/include/pcl_ros/{publisher.h => publisher.hpp}      | 0
 .../{extract_clusters.h => extract_clusters.hpp}            | 4 ++--
 ...ygonal_prism_data.h => extract_polygonal_prism_data.hpp} | 4 ++--
 .../{sac_segmentation.h => sac_segmentation.hpp}            | 6 +++---
 .../{segment_differences.h => segment_differences.hpp}      | 4 ++--
 .../pcl_ros/surface/{convex_hull.h => convex_hull.hpp}      | 2 +-
 .../{moving_least_squares.h => moving_least_squares.hpp}    | 2 +-
 pcl_ros/include/pcl_ros/{transforms.h => transforms.hpp}    | 0
 pcl_ros/src/pcl_ros/features/boundary.cpp                   | 2 +-
 pcl_ros/src/pcl_ros/features/feature.cpp                    | 2 +-
 pcl_ros/src/pcl_ros/features/fpfh.cpp                       | 2 +-
 pcl_ros/src/pcl_ros/features/fpfh_omp.cpp                   | 2 +-
 pcl_ros/src/pcl_ros/features/moment_invariants.cpp          | 2 +-
 pcl_ros/src/pcl_ros/features/normal_3d.cpp                  | 2 +-
 pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp              | 2 +-
 pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp              | 2 +-
 pcl_ros/src/pcl_ros/features/pfh.cpp                        | 2 +-
 pcl_ros/src/pcl_ros/features/principal_curvatures.cpp       | 2 +-
 pcl_ros/src/pcl_ros/features/shot.cpp                       | 2 +-
 pcl_ros/src/pcl_ros/features/shot_omp.cpp                   | 2 +-
 pcl_ros/src/pcl_ros/features/vfh.cpp                        | 2 +-
 pcl_ros/src/pcl_ros/filters/crop_box.cpp                    | 2 +-
 pcl_ros/src/pcl_ros/filters/extract_indices.cpp             | 2 +-
 pcl_ros/src/pcl_ros/filters/features/boundary.cpp           | 2 +-
 pcl_ros/src/pcl_ros/filters/features/feature.cpp            | 2 +-
 pcl_ros/src/pcl_ros/filters/features/fpfh.cpp               | 2 +-
 pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp           | 2 +-
 pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp  | 2 +-
 pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp          | 2 +-
 pcl_ros/src/pcl_ros/filters/features/normal_3d_omp.cpp      | 2 +-
 pcl_ros/src/pcl_ros/filters/features/normal_3d_tbb.cpp      | 2 +-
 pcl_ros/src/pcl_ros/filters/features/pfh.cpp                | 2 +-
 .../src/pcl_ros/filters/features/principal_curvatures.cpp   | 2 +-
 pcl_ros/src/pcl_ros/filters/features/vfh.cpp                | 2 +-
 pcl_ros/src/pcl_ros/filters/filter.cpp                      | 4 ++--
 pcl_ros/src/pcl_ros/filters/passthrough.cpp                 | 2 +-
 pcl_ros/src/pcl_ros/filters/project_inliers.cpp             | 2 +-
 pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp      | 2 +-
 pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp | 2 +-
 pcl_ros/src/pcl_ros/filters/voxel_grid.cpp                  | 2 +-
 pcl_ros/src/pcl_ros/io/bag_io.cpp                           | 2 +-
 pcl_ros/src/pcl_ros/io/concatenate_data.cpp                 | 4 ++--
 pcl_ros/src/pcl_ros/io/concatenate_fields.cpp               | 2 +-
 pcl_ros/src/pcl_ros/io/io.cpp                               | 2 +-
 pcl_ros/src/pcl_ros/io/pcd_io.cpp                           | 2 +-
 pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp       | 2 +-
 .../pcl_ros/segmentation/extract_polygonal_prism_data.cpp   | 4 ++--
 pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp       | 2 +-
 pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp    | 2 +-
 pcl_ros/src/pcl_ros/surface/convex_hull.cpp                 | 2 +-
 pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp        | 2 +-
 pcl_ros/src/test/test_tf_message_filter_pcl.cpp             | 2 +-
 pcl_ros/src/transforms.cpp                                  | 2 +-
 pcl_ros/tools/bag_to_pcd.cpp                                | 2 +-
 pcl_ros/tools/pcd_to_pointcloud.cpp                         | 2 +-
 83 files changed, 94 insertions(+), 94 deletions(-)
 rename pcl_ros/include/pcl_ros/features/{boundary.h => boundary.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{feature.h => feature.hpp} (99%)
 rename pcl_ros/include/pcl_ros/features/{fpfh.h => fpfh.hpp} (99%)
 rename pcl_ros/include/pcl_ros/features/{fpfh_omp.h => fpfh_omp.hpp} (99%)
 rename pcl_ros/include/pcl_ros/features/{moment_invariants.h => moment_invariants.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{normal_3d.h => normal_3d.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{normal_3d_omp.h => normal_3d_omp.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{normal_3d_tbb.h => normal_3d_tbb.hpp} (97%)
 rename pcl_ros/include/pcl_ros/features/{pfh.h => pfh.hpp} (99%)
 rename pcl_ros/include/pcl_ros/features/{principal_curvatures.h => principal_curvatures.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{shot.h => shot.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{shot_omp.h => shot_omp.hpp} (98%)
 rename pcl_ros/include/pcl_ros/features/{vfh.h => vfh.hpp} (98%)
 rename pcl_ros/include/pcl_ros/filters/{crop_box.h => crop_box.hpp} (98%)
 rename pcl_ros/include/pcl_ros/filters/{extract_indices.h => extract_indices.hpp} (97%)
 rename pcl_ros/include/pcl_ros/filters/{filter.h => filter.hpp} (98%)
 rename pcl_ros/include/pcl_ros/filters/{passthrough.h => passthrough.hpp} (99%)
 rename pcl_ros/include/pcl_ros/filters/{project_inliers.h => project_inliers.hpp} (99%)
 rename pcl_ros/include/pcl_ros/filters/{radius_outlier_removal.h => radius_outlier_removal.hpp} (97%)
 rename pcl_ros/include/pcl_ros/filters/{statistical_outlier_removal.h => statistical_outlier_removal.hpp} (97%)
 rename pcl_ros/include/pcl_ros/filters/{voxel_grid.h => voxel_grid.hpp} (97%)
 rename pcl_ros/include/pcl_ros/io/{bag_io.h => bag_io.hpp} (99%)
 rename pcl_ros/include/pcl_ros/io/{concatenate_data.h => concatenate_data.hpp} (100%)
 rename pcl_ros/include/pcl_ros/io/{concatenate_fields.h => concatenate_fields.hpp} (100%)
 rename pcl_ros/include/pcl_ros/io/{pcd_io.h => pcd_io.hpp} (99%)
 rename pcl_ros/include/pcl_ros/{pcl_nodelet.h => pcl_nodelet.hpp} (99%)
 rename pcl_ros/include/pcl_ros/{point_cloud.h => point_cloud.hpp} (100%)
 rename pcl_ros/include/pcl_ros/{publisher.h => publisher.hpp} (100%)
 rename pcl_ros/include/pcl_ros/segmentation/{extract_clusters.h => extract_clusters.hpp} (97%)
 rename pcl_ros/include/pcl_ros/segmentation/{extract_polygonal_prism_data.h => extract_polygonal_prism_data.hpp} (98%)
 rename pcl_ros/include/pcl_ros/segmentation/{sac_segmentation.h => sac_segmentation.hpp} (98%)
 rename pcl_ros/include/pcl_ros/segmentation/{segment_differences.h => segment_differences.hpp} (98%)
 rename pcl_ros/include/pcl_ros/surface/{convex_hull.h => convex_hull.hpp} (99%)
 rename pcl_ros/include/pcl_ros/surface/{moving_least_squares.h => moving_least_squares.hpp} (99%)
 rename pcl_ros/include/pcl_ros/{transforms.h => transforms.hpp} (100%)

diff --git a/pcl_ros/include/pcl_ros/features/boundary.h b/pcl_ros/include/pcl_ros/features/boundary.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/boundary.h
rename to pcl_ros/include/pcl_ros/features/boundary.hpp
index 84a92d80..350426e8 100644
--- a/pcl_ros/include/pcl_ros/features/boundary.h
+++ b/pcl_ros/include/pcl_ros/features/boundary.hpp
@@ -41,7 +41,7 @@
 #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET true
 
 #include <pcl/features/boundary.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/feature.h b/pcl_ros/include/pcl_ros/features/feature.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/features/feature.h
rename to pcl_ros/include/pcl_ros/features/feature.hpp
index 85118b20..155e6b61 100644
--- a/pcl_ros/include/pcl_ros/features/feature.h
+++ b/pcl_ros/include/pcl_ros/features/feature.hpp
@@ -42,12 +42,12 @@
 #include <pcl/features/feature.h>
 #include <pcl_msgs/PointIndices.h>
 
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 #include <message_filters/pass_through.h>
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/FeatureConfig.h"
+#include "pcl_ros/FeatureConfig.hpp"
 
 // PCL conversions
 #include <pcl_conversions/pcl_conversions.h>
diff --git a/pcl_ros/include/pcl_ros/features/fpfh.h b/pcl_ros/include/pcl_ros/features/fpfh.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/features/fpfh.h
rename to pcl_ros/include/pcl_ros/features/fpfh.hpp
index 9f7800b5..8e3647a0 100644
--- a/pcl_ros/include/pcl_ros/features/fpfh.h
+++ b/pcl_ros/include/pcl_ros/features/fpfh.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_FPFH_H_
 
 #include <pcl/features/fpfh.h>
-#include "pcl_ros/features/pfh.h"
+#include "pcl_ros/features/pfh.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/fpfh_omp.h b/pcl_ros/include/pcl_ros/features/fpfh_omp.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/features/fpfh_omp.h
rename to pcl_ros/include/pcl_ros/features/fpfh_omp.hpp
index c024bbef..5710120a 100644
--- a/pcl_ros/include/pcl_ros/features/fpfh_omp.h
+++ b/pcl_ros/include/pcl_ros/features/fpfh_omp.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_FPFH_OMP_H_
 
 #include <pcl/features/fpfh_omp.h>
-#include "pcl_ros/features/fpfh.h"
+#include "pcl_ros/features/fpfh.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/moment_invariants.h b/pcl_ros/include/pcl_ros/features/moment_invariants.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/moment_invariants.h
rename to pcl_ros/include/pcl_ros/features/moment_invariants.hpp
index 3915bc92..c5b255c6 100644
--- a/pcl_ros/include/pcl_ros/features/moment_invariants.h
+++ b/pcl_ros/include/pcl_ros/features/moment_invariants.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_MOMENT_INVARIANTS_H_
 
 #include <pcl/features/moment_invariants.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/normal_3d.h b/pcl_ros/include/pcl_ros/features/normal_3d.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/normal_3d.h
rename to pcl_ros/include/pcl_ros/features/normal_3d.hpp
index 468a069c..82ff188a 100644
--- a/pcl_ros/include/pcl_ros/features/normal_3d.h
+++ b/pcl_ros/include/pcl_ros/features/normal_3d.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_NORMAL_3D_H_
 
 #include <pcl/features/normal_3d.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/normal_3d_omp.h b/pcl_ros/include/pcl_ros/features/normal_3d_omp.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/normal_3d_omp.h
rename to pcl_ros/include/pcl_ros/features/normal_3d_omp.hpp
index 0cfe81fb..624d780f 100644
--- a/pcl_ros/include/pcl_ros/features/normal_3d_omp.h
+++ b/pcl_ros/include/pcl_ros/features/normal_3d_omp.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_NORMAL_3D_OMP_H_
 
 #include <pcl/features/normal_3d_omp.h>
-#include "pcl_ros/features/normal_3d.h"
+#include "pcl_ros/features/normal_3d.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/normal_3d_tbb.h b/pcl_ros/include/pcl_ros/features/normal_3d_tbb.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/features/normal_3d_tbb.h
rename to pcl_ros/include/pcl_ros/features/normal_3d_tbb.hpp
index 7c2b8050..15282141 100644
--- a/pcl_ros/include/pcl_ros/features/normal_3d_tbb.h
+++ b/pcl_ros/include/pcl_ros/features/normal_3d_tbb.hpp
@@ -38,11 +38,11 @@
 #ifndef PCL_ROS_NORMAL_3D_TBB_H_
 #define PCL_ROS_NORMAL_3D_TBB_H_
 
-//#include "pcl_ros/pcl_ros_config.h"
+//#include "pcl_ros/pcl_ros_config.hpp"
 //#if defined(HAVE_TBB)
 
 #include <pcl/features/normal_3d_tbb.h>
-#include "pcl_ros/features/normal_3d.h"
+#include "pcl_ros/features/normal_3d.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/pfh.h b/pcl_ros/include/pcl_ros/features/pfh.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/features/pfh.h
rename to pcl_ros/include/pcl_ros/features/pfh.hpp
index faef1bc9..9ce4d101 100644
--- a/pcl_ros/include/pcl_ros/features/pfh.h
+++ b/pcl_ros/include/pcl_ros/features/pfh.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_PFH_H_
 
 #include <pcl/features/pfh.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/principal_curvatures.h b/pcl_ros/include/pcl_ros/features/principal_curvatures.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/principal_curvatures.h
rename to pcl_ros/include/pcl_ros/features/principal_curvatures.hpp
index 0ffc0722..98cd4134 100644
--- a/pcl_ros/include/pcl_ros/features/principal_curvatures.h
+++ b/pcl_ros/include/pcl_ros/features/principal_curvatures.hpp
@@ -40,7 +40,7 @@
 
 #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET true
 #include <pcl/features/principal_curvatures.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/shot.h b/pcl_ros/include/pcl_ros/features/shot.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/shot.h
rename to pcl_ros/include/pcl_ros/features/shot.hpp
index a3a3eea9..214736be 100644
--- a/pcl_ros/include/pcl_ros/features/shot.h
+++ b/pcl_ros/include/pcl_ros/features/shot.hpp
@@ -38,7 +38,7 @@
 #define PCL_ROS_SHOT_H_
 
 #include <pcl/features/shot.h>
-#include "pcl_ros/features/pfh.h"
+#include "pcl_ros/features/pfh.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/shot_omp.h b/pcl_ros/include/pcl_ros/features/shot_omp.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/shot_omp.h
rename to pcl_ros/include/pcl_ros/features/shot_omp.hpp
index 409f6b79..c02ca498 100644
--- a/pcl_ros/include/pcl_ros/features/shot_omp.h
+++ b/pcl_ros/include/pcl_ros/features/shot_omp.hpp
@@ -38,7 +38,7 @@
 #define PCL_ROS_SHOT_OMP_H_
 
 #include <pcl/features/shot_omp.h>
-#include "pcl_ros/features/shot.h"
+#include "pcl_ros/features/shot.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/features/vfh.h b/pcl_ros/include/pcl_ros/features/vfh.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/features/vfh.h
rename to pcl_ros/include/pcl_ros/features/vfh.hpp
index 0bc6fae6..526cdcdf 100644
--- a/pcl_ros/include/pcl_ros/features/vfh.h
+++ b/pcl_ros/include/pcl_ros/features/vfh.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_FEATURES_VFH_H_
 
 #include <pcl/features/vfh.h>
-#include "pcl_ros/features/fpfh.h"
+#include "pcl_ros/features/fpfh.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/crop_box.h b/pcl_ros/include/pcl_ros/filters/crop_box.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/filters/crop_box.h
rename to pcl_ros/include/pcl_ros/filters/crop_box.hpp
index 7fa08c99..cb376caf 100644
--- a/pcl_ros/include/pcl_ros/filters/crop_box.h
+++ b/pcl_ros/include/pcl_ros/filters/crop_box.hpp
@@ -41,10 +41,10 @@
 
 // PCL includes
 #include <pcl/filters/crop_box.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 // Dynamic reconfigure
-#include "pcl_ros/CropBoxConfig.h"
+#include "pcl_ros/CropBoxConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/extract_indices.h b/pcl_ros/include/pcl_ros/filters/extract_indices.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/filters/extract_indices.h
rename to pcl_ros/include/pcl_ros/filters/extract_indices.hpp
index 1ae0d1a9..a3b12678 100644
--- a/pcl_ros/include/pcl_ros/filters/extract_indices.h
+++ b/pcl_ros/include/pcl_ros/filters/extract_indices.hpp
@@ -41,8 +41,8 @@
 // PCL includes
 #include <pcl/filters/extract_indices.h>
 
-#include "pcl_ros/filters/filter.h"
-#include "pcl_ros/ExtractIndicesConfig.h"
+#include "pcl_ros/filters/filter.hpp"
+#include "pcl_ros/ExtractIndicesConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/filter.h b/pcl_ros/include/pcl_ros/filters/filter.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/filters/filter.h
rename to pcl_ros/include/pcl_ros/filters/filter.hpp
index f43edca0..cd622991 100644
--- a/pcl_ros/include/pcl_ros/filters/filter.h
+++ b/pcl_ros/include/pcl_ros/filters/filter.hpp
@@ -40,11 +40,11 @@
 
 // PCL includes
 #include <pcl/filters/filter.h>
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/FilterConfig.h"
+#include "pcl_ros/FilterConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/passthrough.h b/pcl_ros/include/pcl_ros/filters/passthrough.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/filters/passthrough.h
rename to pcl_ros/include/pcl_ros/filters/passthrough.hpp
index 4dad5f2d..1be1ef97 100644
--- a/pcl_ros/include/pcl_ros/filters/passthrough.h
+++ b/pcl_ros/include/pcl_ros/filters/passthrough.hpp
@@ -40,7 +40,7 @@
 
 // PCL includes
 #include <pcl/filters/passthrough.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/project_inliers.h b/pcl_ros/include/pcl_ros/filters/project_inliers.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/filters/project_inliers.h
rename to pcl_ros/include/pcl_ros/filters/project_inliers.hpp
index 1245e1c3..f72a8c2d 100644
--- a/pcl_ros/include/pcl_ros/filters/project_inliers.h
+++ b/pcl_ros/include/pcl_ros/filters/project_inliers.hpp
@@ -40,7 +40,7 @@
 
 // PCL includes
 #include <pcl/filters/project_inliers.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 #include <message_filters/subscriber.h>
 
diff --git a/pcl_ros/include/pcl_ros/filters/radius_outlier_removal.h b/pcl_ros/include/pcl_ros/filters/radius_outlier_removal.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/filters/radius_outlier_removal.h
rename to pcl_ros/include/pcl_ros/filters/radius_outlier_removal.hpp
index 6120f9e5..3b1120ad 100644
--- a/pcl_ros/include/pcl_ros/filters/radius_outlier_removal.h
+++ b/pcl_ros/include/pcl_ros/filters/radius_outlier_removal.hpp
@@ -40,10 +40,10 @@
 
 // PCL includes
 #include <pcl/filters/radius_outlier_removal.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 // Dynamic reconfigure
-#include "pcl_ros/RadiusOutlierRemovalConfig.h"
+#include "pcl_ros/RadiusOutlierRemovalConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.h b/pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.h
rename to pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.hpp
index b3d17e35..6776cc19 100644
--- a/pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.h
+++ b/pcl_ros/include/pcl_ros/filters/statistical_outlier_removal.hpp
@@ -40,10 +40,10 @@
 
 // PCL includes
 #include <pcl/filters/statistical_outlier_removal.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 // Dynamic reconfigure
-#include "pcl_ros/StatisticalOutlierRemovalConfig.h"
+#include "pcl_ros/StatisticalOutlierRemovalConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/filters/voxel_grid.h b/pcl_ros/include/pcl_ros/filters/voxel_grid.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/filters/voxel_grid.h
rename to pcl_ros/include/pcl_ros/filters/voxel_grid.hpp
index 1d887f7e..6f900f23 100644
--- a/pcl_ros/include/pcl_ros/filters/voxel_grid.h
+++ b/pcl_ros/include/pcl_ros/filters/voxel_grid.hpp
@@ -40,10 +40,10 @@
 
 // PCL includes
 #include <pcl/filters/voxel_grid.h>
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/filters/filter.hpp"
 
 // Dynamic reconfigure
-#include "pcl_ros/VoxelGridConfig.h"
+#include "pcl_ros/VoxelGridConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/impl/transforms.hpp b/pcl_ros/include/pcl_ros/impl/transforms.hpp
index 52b49e25..a4ab2121 100644
--- a/pcl_ros/include/pcl_ros/impl/transforms.hpp
+++ b/pcl_ros/include/pcl_ros/impl/transforms.hpp
@@ -38,7 +38,7 @@
 #define pcl_ros_IMPL_TRANSFORMS_H_
 
 #include <pcl_conversions/pcl_conversions.h>
-#include "pcl_ros/transforms.h"
+#include "pcl_ros/transforms.hpp"
 
 using pcl_conversions::fromPCL;
 using pcl_conversions::toPCL;
diff --git a/pcl_ros/include/pcl_ros/io/bag_io.h b/pcl_ros/include/pcl_ros/io/bag_io.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/io/bag_io.h
rename to pcl_ros/include/pcl_ros/io/bag_io.hpp
index 18f53de2..f526f2ea 100644
--- a/pcl_ros/include/pcl_ros/io/bag_io.h
+++ b/pcl_ros/include/pcl_ros/io/bag_io.hpp
@@ -38,7 +38,7 @@
 #ifndef PCL_ROS_IO_BAG_IO_H_
 #define PCL_ROS_IO_BAG_IO_H_
 
-#include <pcl_ros/pcl_nodelet.h>
+#include <pcl_ros/pcl_nodelet.hpp>
 #include <sensor_msgs/PointCloud2.h>
 #include <rosbag/bag.h>
 #include <rosbag/view.h>
diff --git a/pcl_ros/include/pcl_ros/io/concatenate_data.h b/pcl_ros/include/pcl_ros/io/concatenate_data.hpp
similarity index 100%
rename from pcl_ros/include/pcl_ros/io/concatenate_data.h
rename to pcl_ros/include/pcl_ros/io/concatenate_data.hpp
diff --git a/pcl_ros/include/pcl_ros/io/concatenate_fields.h b/pcl_ros/include/pcl_ros/io/concatenate_fields.hpp
similarity index 100%
rename from pcl_ros/include/pcl_ros/io/concatenate_fields.h
rename to pcl_ros/include/pcl_ros/io/concatenate_fields.hpp
diff --git a/pcl_ros/include/pcl_ros/io/pcd_io.h b/pcl_ros/include/pcl_ros/io/pcd_io.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/io/pcd_io.h
rename to pcl_ros/include/pcl_ros/io/pcd_io.hpp
index 89663451..f551817b 100644
--- a/pcl_ros/include/pcl_ros/io/pcd_io.h
+++ b/pcl_ros/include/pcl_ros/io/pcd_io.hpp
@@ -39,7 +39,7 @@
 #define PCL_ROS_IO_PCD_IO_H_
 
 #include <pcl/io/pcd_io.h>
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/pcl_nodelet.h b/pcl_ros/include/pcl_ros/pcl_nodelet.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/pcl_nodelet.h
rename to pcl_ros/include/pcl_ros/pcl_nodelet.hpp
index 4b9839d5..fc4b64c8 100644
--- a/pcl_ros/include/pcl_ros/pcl_nodelet.h
+++ b/pcl_ros/include/pcl_ros/pcl_nodelet.hpp
@@ -51,7 +51,7 @@
 #include <pcl/pcl_base.h>
 #include <pcl/point_types.h>
 #include <pcl_conversions/pcl_conversions.h>
-#include "pcl_ros/point_cloud.h"
+#include "pcl_ros/point_cloud.hpp"
 // ROS Nodelet includes
 #include <nodelet_topic_tools/nodelet_lazy.h>
 #include <message_filters/subscriber.h>
diff --git a/pcl_ros/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.hpp
similarity index 100%
rename from pcl_ros/include/pcl_ros/point_cloud.h
rename to pcl_ros/include/pcl_ros/point_cloud.hpp
diff --git a/pcl_ros/include/pcl_ros/publisher.h b/pcl_ros/include/pcl_ros/publisher.hpp
similarity index 100%
rename from pcl_ros/include/pcl_ros/publisher.h
rename to pcl_ros/include/pcl_ros/publisher.hpp
diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_clusters.h b/pcl_ros/include/pcl_ros/segmentation/extract_clusters.hpp
similarity index 97%
rename from pcl_ros/include/pcl_ros/segmentation/extract_clusters.h
rename to pcl_ros/include/pcl_ros/segmentation/extract_clusters.hpp
index dc79f796..b9c48425 100644
--- a/pcl_ros/include/pcl_ros/segmentation/extract_clusters.h
+++ b/pcl_ros/include/pcl_ros/segmentation/extract_clusters.hpp
@@ -39,11 +39,11 @@
 #define PCL_ROS_EXTRACT_CLUSTERS_H_
 
 #include <pcl/segmentation/extract_clusters.h>
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/EuclideanClusterExtractionConfig.h"
+#include "pcl_ros/EuclideanClusterExtractionConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
rename to pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.hpp
index 13b85316..458e565d 100644
--- a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
+++ b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.hpp
@@ -38,7 +38,7 @@
 #ifndef PCL_ROS_EXTRACT_POLYGONAL_PRISM_DATA_H_
 #define PCL_ROS_EXTRACT_POLYGONAL_PRISM_DATA_H_
 
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 #include <message_filters/sync_policies/exact_time.h>
 #include <message_filters/sync_policies/approximate_time.h>
 #include <message_filters/pass_through.h>
@@ -48,7 +48,7 @@
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/ExtractPolygonalPrismDataConfig.h"
+#include "pcl_ros/ExtractPolygonalPrismDataConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
rename to pcl_ros/include/pcl_ros/segmentation/sac_segmentation.hpp
index 9243e363..e0f68690 100644
--- a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
+++ b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.hpp
@@ -38,7 +38,7 @@
 #ifndef PCL_ROS_SAC_SEGMENTATION_H_
 #define PCL_ROS_SAC_SEGMENTATION_H_
 
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 #include <message_filters/pass_through.h>
 
 // PCL includes
@@ -46,8 +46,8 @@
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/SACSegmentationConfig.h"
-#include "pcl_ros/SACSegmentationFromNormalsConfig.h"
+#include "pcl_ros/SACSegmentationConfig.hpp"
+#include "pcl_ros/SACSegmentationFromNormalsConfig.hpp"
 
 namespace pcl_ros
 {
diff --git a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h b/pcl_ros/include/pcl_ros/segmentation/segment_differences.hpp
similarity index 98%
rename from pcl_ros/include/pcl_ros/segmentation/segment_differences.h
rename to pcl_ros/include/pcl_ros/segmentation/segment_differences.hpp
index da767ab3..ee7fb28c 100644
--- a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
+++ b/pcl_ros/include/pcl_ros/segmentation/segment_differences.hpp
@@ -39,11 +39,11 @@
 #define PCL_ROS_SEGMENT_DIFFERENCES_H_
 
 #include <pcl/segmentation/segment_differences.h>
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 // Dynamic reconfigure
 #include <dynamic_reconfigure/server.h>
-#include "pcl_ros/SegmentDifferencesConfig.h"
+#include "pcl_ros/SegmentDifferencesConfig.hpp"
 
 
 namespace pcl_ros
diff --git a/pcl_ros/include/pcl_ros/surface/convex_hull.h b/pcl_ros/include/pcl_ros/surface/convex_hull.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/surface/convex_hull.h
rename to pcl_ros/include/pcl_ros/surface/convex_hull.hpp
index 50741e10..066d7a16 100644
--- a/pcl_ros/include/pcl_ros/surface/convex_hull.h
+++ b/pcl_ros/include/pcl_ros/surface/convex_hull.hpp
@@ -38,7 +38,7 @@
 #ifndef PCL_ROS_CONVEX_HULL_2D_H_
 #define PCL_ROS_CONVEX_HULL_2D_H_
 
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 // PCL includes
 #include <pcl/surface/convex_hull.h>
diff --git a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h b/pcl_ros/include/pcl_ros/surface/moving_least_squares.hpp
similarity index 99%
rename from pcl_ros/include/pcl_ros/surface/moving_least_squares.h
rename to pcl_ros/include/pcl_ros/surface/moving_least_squares.hpp
index 9486dfc1..36542087 100644
--- a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+++ b/pcl_ros/include/pcl_ros/surface/moving_least_squares.hpp
@@ -38,7 +38,7 @@
 #ifndef PCL_ROS_MOVING_LEAST_SQUARES_H_
 #define PCL_ROS_MOVING_LEAST_SQUARES_H_
 
-#include "pcl_ros/pcl_nodelet.h"
+#include "pcl_ros/pcl_nodelet.hpp"
 
 // PCL includes
 #include <pcl/surface/mls.h>
diff --git a/pcl_ros/include/pcl_ros/transforms.h b/pcl_ros/include/pcl_ros/transforms.hpp
similarity index 100%
rename from pcl_ros/include/pcl_ros/transforms.h
rename to pcl_ros/include/pcl_ros/transforms.hpp
diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
index 26ee07c1..6571ed30 100644
--- a/pcl_ros/src/pcl_ros/features/boundary.cpp
+++ b/pcl_ros/src/pcl_ros/features/boundary.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/boundary.h"
+#include "pcl_ros/features/boundary.hpp"
 
 void
 pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/feature.cpp b/pcl_ros/src/pcl_ros/features/feature.cpp
index b7027c70..fcb9516d 100644
--- a/pcl_ros/src/pcl_ros/features/feature.cpp
+++ b/pcl_ros/src/pcl_ros/features/feature.cpp
@@ -48,7 +48,7 @@
 //#include "principal_curvatures.cpp"
 //#include "vfh.cpp"
 #include <pcl/io/io.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 #include <message_filters/null_types.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
index 53be549c..c1ac221a 100644
--- a/pcl_ros/src/pcl_ros/features/fpfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/fpfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/fpfh.h"
+#include "pcl_ros/features/fpfh.hpp"
 
 void 
 pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
index e4adcabb..8dfaf044 100644
--- a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/fpfh_omp.h"
+#include "pcl_ros/features/fpfh_omp.hpp"
 
 void 
 pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
index a6e2249a..a6652dec 100644
--- a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
+++ b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/moment_invariants.h"
+#include "pcl_ros/features/moment_invariants.hpp"
 
 void 
 pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
index 042186a9..489fa473 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d.h"
+#include "pcl_ros/features/normal_3d.hpp"
 
 void 
 pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
index 3e92d2f2..b5aadc94 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d_omp.h"
+#include "pcl_ros/features/normal_3d_omp.hpp"
 
 void 
 pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
index 680a4a02..b76bf1aa 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d_tbb.h"
+#include "pcl_ros/features/normal_3d_tbb.hpp"
 
 #if defined HAVE_TBB
 
diff --git a/pcl_ros/src/pcl_ros/features/pfh.cpp b/pcl_ros/src/pcl_ros/features/pfh.cpp
index dd8409e2..b7210316 100644
--- a/pcl_ros/src/pcl_ros/features/pfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/pfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/pfh.h"
+#include "pcl_ros/features/pfh.hpp"
 
 void 
 pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
index 501d686e..a5332a62 100644
--- a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
+++ b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/principal_curvatures.h"
+#include "pcl_ros/features/principal_curvatures.hpp"
 
 void 
 pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
index ed6ba44b..eca60020 100644
--- a/pcl_ros/src/pcl_ros/features/shot.cpp
+++ b/pcl_ros/src/pcl_ros/features/shot.cpp
@@ -35,7 +35,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/shot.h"
+#include "pcl_ros/features/shot.hpp"
 
 void 
 pcl_ros::SHOTEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
index 4563f123..70ed3974 100644
--- a/pcl_ros/src/pcl_ros/features/shot_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
@@ -35,7 +35,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/shot_omp.h"
+#include "pcl_ros/features/shot_omp.hpp"
 
 void 
 pcl_ros::SHOTEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
index ece448fd..c7cb6cc3 100644
--- a/pcl_ros/src/pcl_ros/features/vfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/vfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/vfh.h"
+#include "pcl_ros/features/vfh.hpp"
 
 void 
 pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/crop_box.cpp b/pcl_ros/src/pcl_ros/filters/crop_box.cpp
index fc8acdad..c7f1d517 100644
--- a/pcl_ros/src/pcl_ros/filters/crop_box.cpp
+++ b/pcl_ros/src/pcl_ros/filters/crop_box.cpp
@@ -37,7 +37,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/crop_box.h"
+#include "pcl_ros/filters/crop_box.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool
diff --git a/pcl_ros/src/pcl_ros/filters/extract_indices.cpp b/pcl_ros/src/pcl_ros/filters/extract_indices.cpp
index 98419b09..59554f0e 100644
--- a/pcl_ros/src/pcl_ros/filters/extract_indices.cpp
+++ b/pcl_ros/src/pcl_ros/filters/extract_indices.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/extract_indices.h"
+#include "pcl_ros/filters/extract_indices.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool 
diff --git a/pcl_ros/src/pcl_ros/filters/features/boundary.cpp b/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
index d90ac374..13a66c84 100644
--- a/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/boundary.h"
+#include "pcl_ros/features/boundary.hpp"
 
 void 
 pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/feature.cpp b/pcl_ros/src/pcl_ros/filters/features/feature.cpp
index 434707ee..1e36d828 100644
--- a/pcl_ros/src/pcl_ros/filters/features/feature.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/feature.cpp
@@ -48,7 +48,7 @@
 //#include "principal_curvatures.cpp"
 //#include "vfh.cpp"
 #include <pcl/io/io.h>
-#include "pcl_ros/features/feature.h"
+#include "pcl_ros/features/feature.hpp"
 #include <message_filters/null_types.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp b/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
index c7f98f1d..728f0d50 100644
--- a/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/fpfh.h"
+#include "pcl_ros/features/fpfh.hpp"
 
 void 
 pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp
index 57c508c0..822817a2 100644
--- a/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/fpfh_omp.h"
+#include "pcl_ros/features/fpfh_omp.hpp"
 
 void 
 pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp
index 0d1c039a..d8be14ac 100644
--- a/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/moment_invariants.h"
+#include "pcl_ros/features/moment_invariants.hpp"
 
 void 
 pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp
index fbc81abc..4d62f381 100644
--- a/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d.h"
+#include "pcl_ros/features/normal_3d.hpp"
 
 void 
 pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/filters/features/normal_3d_omp.cpp
index 0a257afa..c64e85bd 100644
--- a/pcl_ros/src/pcl_ros/filters/features/normal_3d_omp.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/normal_3d_omp.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d_omp.h"
+#include "pcl_ros/features/normal_3d_omp.hpp"
 
 void 
 pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/filters/features/normal_3d_tbb.cpp
index 330e2de7..5874eea8 100644
--- a/pcl_ros/src/pcl_ros/filters/features/normal_3d_tbb.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/normal_3d_tbb.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/normal_3d_tbb.h"
+#include "pcl_ros/features/normal_3d_tbb.hpp"
 
 #if defined HAVE_TBB
 
diff --git a/pcl_ros/src/pcl_ros/filters/features/pfh.cpp b/pcl_ros/src/pcl_ros/filters/features/pfh.cpp
index b8e3d8d2..01b1c8f2 100644
--- a/pcl_ros/src/pcl_ros/filters/features/pfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/pfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/pfh.h"
+#include "pcl_ros/features/pfh.hpp"
 
 void 
 pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp
index 5e8c10f7..cb7ce548 100644
--- a/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/principal_curvatures.h"
+#include "pcl_ros/features/principal_curvatures.hpp"
 
 void 
 pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/features/vfh.cpp b/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
index 351a8af7..5f77d67a 100644
--- a/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/features/vfh.h"
+#include "pcl_ros/features/vfh.hpp"
 
 void 
 pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
diff --git a/pcl_ros/src/pcl_ros/filters/filter.cpp b/pcl_ros/src/pcl_ros/filters/filter.cpp
index 4fa5731a..2970504a 100644
--- a/pcl_ros/src/pcl_ros/filters/filter.cpp
+++ b/pcl_ros/src/pcl_ros/filters/filter.cpp
@@ -36,8 +36,8 @@
  */
 
 #include <pcl/io/io.h>
-#include "pcl_ros/transforms.h"
-#include "pcl_ros/filters/filter.h"
+#include "pcl_ros/transforms.hpp"
+#include "pcl_ros/filters/filter.hpp"
 
 /*//#include <pcl/filters/pixel_grid.h>
 //#include <pcl/filters/filter_dimension.h>
diff --git a/pcl_ros/src/pcl_ros/filters/passthrough.cpp b/pcl_ros/src/pcl_ros/filters/passthrough.cpp
index e0de5af3..693442e8 100644
--- a/pcl_ros/src/pcl_ros/filters/passthrough.cpp
+++ b/pcl_ros/src/pcl_ros/filters/passthrough.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/passthrough.h"
+#include "pcl_ros/filters/passthrough.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool
diff --git a/pcl_ros/src/pcl_ros/filters/project_inliers.cpp b/pcl_ros/src/pcl_ros/filters/project_inliers.cpp
index 6b7239c3..2065f415 100644
--- a/pcl_ros/src/pcl_ros/filters/project_inliers.cpp
+++ b/pcl_ros/src/pcl_ros/filters/project_inliers.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/project_inliers.h"
+#include "pcl_ros/filters/project_inliers.hpp"
 #include <pcl/io/io.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp b/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp
index 46c00a14..34e0240a 100644
--- a/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp
+++ b/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/radius_outlier_removal.h"
+#include "pcl_ros/filters/radius_outlier_removal.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool
diff --git a/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp b/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp
index 16535b7f..282419c6 100644
--- a/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp
+++ b/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/statistical_outlier_removal.h"
+#include "pcl_ros/filters/statistical_outlier_removal.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool
diff --git a/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp b/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
index db718d5b..be00eaa5 100644
--- a/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
+++ b/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/filters/voxel_grid.h"
+#include "pcl_ros/filters/voxel_grid.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool
diff --git a/pcl_ros/src/pcl_ros/io/bag_io.cpp b/pcl_ros/src/pcl_ros/io/bag_io.cpp
index a17edd14..12930fc2 100644
--- a/pcl_ros/src/pcl_ros/io/bag_io.cpp
+++ b/pcl_ros/src/pcl_ros/io/bag_io.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/io/bag_io.h"
+#include "pcl_ros/io/bag_io.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 bool 
diff --git a/pcl_ros/src/pcl_ros/io/concatenate_data.cpp b/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
index a7a00754..13027d51 100644
--- a/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
+++ b/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
@@ -37,8 +37,8 @@
 
 #include <pluginlib/class_list_macros.h>
 #include <pcl/io/io.h>
-#include "pcl_ros/transforms.h"
-#include "pcl_ros/io/concatenate_data.h"
+#include "pcl_ros/transforms.hpp"
+#include "pcl_ros/io/concatenate_data.hpp"
 
 #include <pcl_conversions/pcl_conversions.h>
 
diff --git a/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp b/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
index 159f531f..35618ea1 100644
--- a/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
+++ b/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
@@ -39,7 +39,7 @@
 
 #include <pluginlib/class_list_macros.h>
 #include <pcl/io/io.h>
-#include "pcl_ros/io/concatenate_fields.h"
+#include "pcl_ros/io/concatenate_fields.hpp"
 
 #include <pcl_conversions/pcl_conversions.h>
 
diff --git a/pcl_ros/src/pcl_ros/io/io.cpp b/pcl_ros/src/pcl_ros/io/io.cpp
index c9887581..48fa54d6 100644
--- a/pcl_ros/src/pcl_ros/io/io.cpp
+++ b/pcl_ros/src/pcl_ros/io/io.cpp
@@ -38,7 +38,7 @@
 #include <pluginlib/class_list_macros.h>
 #include <sensor_msgs/PointCloud2.h>
 #include <message_filters/subscriber.h>
-//#include <pcl_ros/subscriber.h>
+//#include <pcl_ros/subscriber.hpp>
 #include <nodelet_topic_tools/nodelet_mux.h>
 #include <nodelet_topic_tools/nodelet_demux.h>
 
diff --git a/pcl_ros/src/pcl_ros/io/pcd_io.cpp b/pcl_ros/src/pcl_ros/io/pcd_io.cpp
index fe396b5d..df1fc24a 100644
--- a/pcl_ros/src/pcl_ros/io/pcd_io.cpp
+++ b/pcl_ros/src/pcl_ros/io/pcd_io.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include <pcl_ros/io/pcd_io.h>
+#include <pcl_ros/io/pcd_io.hpp>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void
diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
index 266bb4aa..b953497b 100644
--- a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
@@ -38,7 +38,7 @@
 #include <pluginlib/class_list_macros.h>
 #include <pcl/io/io.h>
 #include <pcl/PointIndices.h>
-#include "pcl_ros/segmentation/extract_clusters.h"
+#include "pcl_ros/segmentation/extract_clusters.hpp"
 
 #include <pcl_conversions/pcl_conversions.h>
 
diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
index 67255788..b05770b7 100644
--- a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
@@ -36,8 +36,8 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/transforms.h"
-#include "pcl_ros/segmentation/extract_polygonal_prism_data.h"
+#include "pcl_ros/transforms.hpp"
+#include "pcl_ros/segmentation/extract_polygonal_prism_data.hpp"
 #include <pcl/io/io.h>
 
 #include <pcl_conversions/pcl_conversions.h>
diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
index 9ba87987..cfb46d9b 100644
--- a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/segmentation/sac_segmentation.h"
+#include "pcl_ros/segmentation/sac_segmentation.hpp"
 #include <pcl/io/io.h>
 
 #include <pcl_conversions/pcl_conversions.h>
diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
index d283a059..79d01d12 100644
--- a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/segmentation/segment_differences.h"
+#include "pcl_ros/segmentation/segment_differences.hpp"
 #include <pcl/io/io.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
index 23780325..22cc2b98 100644
--- a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
+++ b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
@@ -37,7 +37,7 @@
 
 #include <pluginlib/class_list_macros.h>
 #include <pcl/common/io.h>
-#include "pcl_ros/surface/convex_hull.h"
+#include "pcl_ros/surface/convex_hull.hpp"
 #include <geometry_msgs/PolygonStamped.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
index 6360cc02..26b6f3f6 100644
--- a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
+++ b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <pluginlib/class_list_macros.h>
-#include "pcl_ros/surface/moving_least_squares.h"
+#include "pcl_ros/surface/moving_least_squares.hpp"
 #include <pcl/io/io.h>
 //////////////////////////////////////////////////////////////////////////////////////////////
 void
diff --git a/pcl_ros/src/test/test_tf_message_filter_pcl.cpp b/pcl_ros/src/test/test_tf_message_filter_pcl.cpp
index 28cfbb63..e3f4930e 100644
--- a/pcl_ros/src/test/test_tf_message_filter_pcl.cpp
+++ b/pcl_ros/src/test/test_tf_message_filter_pcl.cpp
@@ -41,7 +41,7 @@
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include <pcl_ros/point_cloud.h>
+#include <pcl_ros/point_cloud.hpp>
 #include <pcl_conversions/pcl_conversions.h>
 
 #include <ros/ros.h>
diff --git a/pcl_ros/src/transforms.cpp b/pcl_ros/src/transforms.cpp
index 75fc6c4e..76a93c4e 100644
--- a/pcl_ros/src/transforms.cpp
+++ b/pcl_ros/src/transforms.cpp
@@ -38,7 +38,7 @@
 #include <pcl/common/io.h>
 #include <pcl/point_types.h>
 #include <pcl_conversions/pcl_conversions.h>
-#include "pcl_ros/transforms.h"
+#include "pcl_ros/transforms.hpp"
 #include "pcl_ros/impl/transforms.hpp"
 
 namespace pcl_ros
diff --git a/pcl_ros/tools/bag_to_pcd.cpp b/pcl_ros/tools/bag_to_pcd.cpp
index b07f03bb..d48f2c58 100644
--- a/pcl_ros/tools/bag_to_pcd.cpp
+++ b/pcl_ros/tools/bag_to_pcd.cpp
@@ -51,7 +51,7 @@ Cloud Data) format.
 #include <pcl/io/io.h>
 #include <pcl/io/pcd_io.h>
 #include <pcl_conversions/pcl_conversions.h>
-#include "pcl_ros/transforms.h"
+#include "pcl_ros/transforms.hpp"
 #include <tf/transform_listener.h>
 #include <tf/transform_broadcaster.h>
 
diff --git a/pcl_ros/tools/pcd_to_pointcloud.cpp b/pcl_ros/tools/pcd_to_pointcloud.cpp
index 03638183..02ef1bbc 100644
--- a/pcl_ros/tools/pcd_to_pointcloud.cpp
+++ b/pcl_ros/tools/pcd_to_pointcloud.cpp
@@ -54,7 +54,7 @@
 #include <pcl/point_types.h>
 #include <pcl_conversions/pcl_conversions.h>
 
-#include "pcl_ros/publisher.h"
+#include "pcl_ros/publisher.hpp"
 
 using namespace std;