From 280ee187565b77081a62794ce389c8ccaec6787a Mon Sep 17 00:00:00 2001
From: Steve Nogar <stephen.m.nogar.civ@army.mil>
Date: Sun, 29 May 2022 12:45:19 -0400
Subject: [PATCH] rename headers for humble

---
 pcl_ros/src/pcl_ros/features/boundary.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/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 +-
 pcl_ros/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/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                     | 2 +-
 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 +-
 .../src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp   | 2 +-
 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/tools/pointcloud_to_pcd.cpp                             | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
index 6ac61f4a9..2d5e02233 100644
--- a/pcl_ros/src/pcl_ros/features/boundary.cpp
+++ b/pcl_ros/src/pcl_ros/features/boundary.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/boundary.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
index e6c05b349..d23a325be 100644
--- a/pcl_ros/src/pcl_ros/features/fpfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/fpfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/fpfh.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
index d3e96fc4c..523f5cb7f 100644
--- a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/fpfh_omp.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
index 5a5c1452b..5f3cc8db6 100644
--- a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
+++ b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/moment_invariants.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
index 7ab774bcd..f90b698aa 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/normal_3d.hpp"
 
 void
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 c7cd21249..194427a13 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/normal_3d_omp.hpp"
 
 void
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 0eea22351..6878f262b 100644
--- a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
+++ b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #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 e55a7fea1..5f691be0e 100644
--- a/pcl_ros/src/pcl_ros/features/pfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/pfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/pfh.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
index ff44b8436..1d8c2c90d 100644
--- a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
+++ b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/principal_curvatures.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
index d06647247..52bf00c07 100644
--- a/pcl_ros/src/pcl_ros/features/shot.cpp
+++ b/pcl_ros/src/pcl_ros/features/shot.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/shot.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
index 0d10be21a..8f44266cd 100644
--- a/pcl_ros/src/pcl_ros/features/shot_omp.cpp
+++ b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/shot_omp.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
index 25c6911b1..e0ceac9c2 100644
--- a/pcl_ros/src/pcl_ros/features/vfh.cpp
+++ b/pcl_ros/src/pcl_ros/features/vfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/vfh.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/filters/crop_box.cpp b/pcl_ros/src/pcl_ros/filters/crop_box.cpp
index bcba2a987..3d106b303 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 "pcl_ros/filters/crop_box.hpp"
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.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 7ee29be0c..f1477e16d 100644
--- a/pcl_ros/src/pcl_ros/filters/extract_indices.cpp
+++ b/pcl_ros/src/pcl_ros/filters/extract_indices.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/filters/extract_indices.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/filters/features/boundary.cpp b/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
index 13a1139ef..ba12ad774 100644
--- a/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/boundary.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/boundary.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp b/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
index dac0f28f0..3f22d0e1c 100644
--- a/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/fpfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/fpfh.hpp"
 
 void
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 80cdde16f..4d47f22d5 100644
--- a/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/fpfh_omp.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/fpfh_omp.hpp"
 
 void
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 7391856b2..71ed9e845 100644
--- a/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/moment_invariants.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/moment_invariants.hpp"
 
 void
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 1e3933586..677ccc521 100644
--- a/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/normal_3d.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/normal_3d.hpp"
 
 void
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 688782bad..1b078e28e 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
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/normal_3d_omp.hpp"
 
 void
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 eb002a47c..f3017f65a 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
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #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 12f4a7c5d..bc9fec762 100644
--- a/pcl_ros/src/pcl_ros/filters/features/pfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/pfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/pfh.hpp"
 
 void
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 0d5fa4e62..89b77dc98 100644
--- a/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/principal_curvatures.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/principal_curvatures.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/filters/features/vfh.cpp b/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
index eb2f58cfd..265598e5f 100644
--- a/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
+++ b/pcl_ros/src/pcl_ros/filters/features/vfh.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/features/vfh.hpp"
 
 void
diff --git a/pcl_ros/src/pcl_ros/filters/passthrough.cpp b/pcl_ros/src/pcl_ros/filters/passthrough.cpp
index 8ee183d26..e9f3a8786 100644
--- a/pcl_ros/src/pcl_ros/filters/passthrough.cpp
+++ b/pcl_ros/src/pcl_ros/filters/passthrough.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "pcl_ros/filters/passthrough.hpp"
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.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 4fc3f70e0..280b4f37b 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 "pcl_ros/filters/project_inliers.hpp"
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <vector>
 
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 0a01b0b10..910e0d4c6 100644
--- a/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp
+++ b/pcl_ros/src/pcl_ros/filters/radius_outlier_removal.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/filters/radius_outlier_removal.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
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 e7a48a9b5..21841cc49 100644
--- a/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp
+++ b/pcl_ros/src/pcl_ros/filters/statistical_outlier_removal.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/filters/statistical_outlier_removal.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp b/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
index 39b797a0a..f094aec9a 100644
--- a/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
+++ b/pcl_ros/src/pcl_ros/filters/voxel_grid.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include "pcl_ros/filters/voxel_grid.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/pcl_ros/src/pcl_ros/io/bag_io.cpp b/pcl_ros/src/pcl_ros/io/bag_io.cpp
index 74ca8d6bb..1aa697ddf 100644
--- a/pcl_ros/src/pcl_ros/io/bag_io.cpp
+++ b/pcl_ros/src/pcl_ros/io/bag_io.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <string>
 #include "pcl_ros/io/bag_io.hpp"
 
diff --git a/pcl_ros/src/pcl_ros/io/concatenate_data.cpp b/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
index fe03b09bd..23092f97f 100644
--- a/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
+++ b/pcl_ros/src/pcl_ros/io/concatenate_data.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <pcl_conversions/pcl_conversions.h>
 #include <string>
diff --git a/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp b/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
index 8d933e25d..8c0127644 100644
--- a/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
+++ b/pcl_ros/src/pcl_ros/io/concatenate_fields.cpp
@@ -37,7 +37,7 @@
 
 /** \author Radu Bogdan Rusu */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <pcl_conversions/pcl_conversions.h>
 #include <vector>
diff --git a/pcl_ros/src/pcl_ros/io/io.cpp b/pcl_ros/src/pcl_ros/io/io.cpp
index 6787b832b..037a16ccf 100644
--- a/pcl_ros/src/pcl_ros/io/io.cpp
+++ b/pcl_ros/src/pcl_ros/io/io.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <sensor_msgs/PointCloud2.h>
 #include <message_filters/subscriber.h>
 // #include <pcl_ros/subscriber.hpp>
diff --git a/pcl_ros/src/pcl_ros/io/pcd_io.cpp b/pcl_ros/src/pcl_ros/io/pcd_io.cpp
index 5f3793429..bb704f1dc 100644
--- a/pcl_ros/src/pcl_ros/io/pcd_io.cpp
+++ b/pcl_ros/src/pcl_ros/io/pcd_io.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl_ros/io/pcd_io.hpp>
 #include <string>
 
diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
index da5e0d7ae..ac7ba33c4 100644
--- a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <pcl/PointIndices.h>
 #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 bfd9fe551..6e8e337cb 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
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <pcl_conversions/pcl_conversions.h>
 #include <vector>
diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
index bcc128c40..dddf78b9f 100644
--- a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <pcl_conversions/pcl_conversions.h>
 #include <vector>
diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
index 0ee82452e..935d1b19e 100644
--- a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
+++ b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include "pcl_ros/segmentation/segment_differences.hpp"
 
diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
index 1edca75a4..3e76c5f4d 100644
--- a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
+++ b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <geometry_msgs/PolygonStamped.h>
 #include <vector>
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 8701935cb..845879ff3 100644
--- a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
+++ b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 #include <pcl/common/io.h>
 #include <vector>
 #include "pcl_ros/surface/moving_least_squares.hpp"
diff --git a/pcl_ros/tools/pointcloud_to_pcd.cpp b/pcl_ros/tools/pointcloud_to_pcd.cpp
index 9f2f9c9a9..456eba55f 100644
--- a/pcl_ros/tools/pointcloud_to_pcd.cpp
+++ b/pcl_ros/tools/pointcloud_to_pcd.cpp
@@ -42,7 +42,7 @@
 
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
-#include <tf2_eigen/tf2_eigen.h>
+#include <tf2_eigen/tf2_eigen.hpp>
 
 // PCL includes
 #include <pcl/common/io.h>