diff --git a/spot_viz/src/look_at_point_tool.cpp b/spot_viz/src/look_at_point_tool.cpp
index c1582ca5..3c2ec327 100644
--- a/spot_viz/src/look_at_point_tool.cpp
+++ b/spot_viz/src/look_at_point_tool.cpp
@@ -91,5 +91,5 @@ int LookAtPointTool::processMouseEvent(rviz::ViewportMouseEvent &event) {
 
 } // namespace spot_viz
 
-#include <pluginlib/class_list_macros.h>
-PLUGINLIB_EXPORT_CLASS(spot_viz::LookAtPointTool, rviz::Tool)
\ No newline at end of file
+#include <pluginlib/class_list_macros.hpp>
+PLUGINLIB_EXPORT_CLASS(spot_viz::LookAtPointTool, rviz::Tool)
diff --git a/spot_viz/src/spot_panel.cpp b/spot_viz/src/spot_panel.cpp
index b9895238..26a08ce5 100644
--- a/spot_viz/src/spot_panel.cpp
+++ b/spot_viz/src/spot_panel.cpp
@@ -795,6 +795,6 @@ namespace spot_viz
     }
 } // end namespace spot_viz
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 PLUGINLIB_EXPORT_CLASS(spot_viz::ControlPanel, rviz::Panel)
 // END_TUTORIAL