diff --git a/rviz_common/src/rviz_common/load_resource.cpp b/rviz_common/src/rviz_common/load_resource.cpp
index 88210c488..a43317fe0 100644
--- a/rviz_common/src/rviz_common/load_resource.cpp
+++ b/rviz_common/src/rviz_common/load_resource.cpp
@@ -38,7 +38,7 @@
 
 #include "ament_index_cpp/get_package_share_directory.hpp"
 #include "ament_index_cpp/get_package_prefix.hpp"
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "rviz_common/logging.hpp"
 
diff --git a/rviz_default_plugins/src/rviz_default_plugins/robot/robot_link.cpp b/rviz_default_plugins/src/rviz_default_plugins/robot/robot_link.cpp
index d47057758..54df1d61f 100644
--- a/rviz_default_plugins/src/rviz_default_plugins/robot/robot_link.cpp
+++ b/rviz_default_plugins/src/rviz_default_plugins/robot/robot_link.cpp
@@ -48,7 +48,7 @@
 
 #include <QFileInfo>  // NOLINT cpplint cannot handle include order here
 
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "rviz_default_plugins/robot/robot_joint.hpp"
 #include "rviz_default_plugins/robot/robot.hpp"
diff --git a/rviz_default_plugins/test/rviz_default_plugins/robot/robot_test.cpp b/rviz_default_plugins/test/rviz_default_plugins/robot/robot_test.cpp
index 55fc90d9c..8a3a54a9f 100644
--- a/rviz_default_plugins/test/rviz_default_plugins/robot/robot_test.cpp
+++ b/rviz_default_plugins/test/rviz_default_plugins/robot/robot_test.cpp
@@ -40,7 +40,7 @@
 #include <OgreRoot.h>
 #include <OgreSceneNode.h>
 
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "rviz_common/properties/property.hpp"
 #include "rviz_rendering/material_manager.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
index 765982943..55ebddc23 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
@@ -62,7 +62,7 @@
 #include <assimp/IOSystem.h>
 #endif
 
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "mesh_loader_helpers/assimp_loader.hpp"
 #include "mesh_loader_helpers/stl_loader.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
index 3cb533a61..34adb38bb 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
@@ -50,7 +50,7 @@
 #include <assimp/aiScene.h>
 #endif
 
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "rviz_rendering/logging.hpp"
 
diff --git a/rviz_rendering_tests/test/mesh_loader_test.cpp b/rviz_rendering_tests/test/mesh_loader_test.cpp
index 52e961bce..ea985af6a 100644
--- a/rviz_rendering_tests/test/mesh_loader_test.cpp
+++ b/rviz_rendering_tests/test/mesh_loader_test.cpp
@@ -37,7 +37,7 @@
 #include <OgreRoot.h>
 #include <OgreSubMesh.h>
 #include <OgreMaterialManager.h>
-#include "resource_retriever/retriever.h"
+#include "resource_retriever/retriever.hpp"
 
 #include "ogre_testing_environment.hpp"
 #include "rviz_rendering/mesh_loader.hpp"