diff --git a/rqt_gui_cpp/include/rqt_gui_cpp/plugin.h b/rqt_gui_cpp/include/rqt_gui_cpp/plugin.h
index 348fb1df..1cc66608 100644
--- a/rqt_gui_cpp/include/rqt_gui_cpp/plugin.h
+++ b/rqt_gui_cpp/include/rqt_gui_cpp/plugin.h
@@ -33,9 +33,9 @@
 #ifndef rqt_gui_cpp__Plugin_H
 #define rqt_gui_cpp__Plugin_H
 
-#include <qt_gui_cpp/plugin.h>
-#include <qt_gui_cpp/plugin_context.h>
-#include <qt_gui_cpp/settings.h>
+#include <qt_gui_cpp/plugin.hpp>
+#include <qt_gui_cpp/plugin_context.hpp>
+#include <qt_gui_cpp/settings.hpp>
 
 #include <rclcpp/rclcpp.hpp>
 
diff --git a/rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.h b/rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.h
index 45aff639..68f2e854 100644
--- a/rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.h
+++ b/rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.h
@@ -33,7 +33,7 @@
 #ifndef rqt_gui_cpp__NodeletPluginProvider_H
 #define rqt_gui_cpp__NodeletPluginProvider_H
 
-#include <qt_gui_cpp/ros_pluginlib_plugin_provider.h>
+#include <qt_gui_cpp/ros_pluginlib_plugin_provider.hpp>
 
 #include <rqt_gui_cpp/plugin.h>
 
diff --git a/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp b/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp
index 6053b749..42af03fb 100644
--- a/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp
+++ b/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp
@@ -35,7 +35,7 @@
 #include "nodelet_plugin_provider.h"
 #include <rqt_gui_cpp/plugin.h>
 
-#include <qt_gui_cpp/plugin_provider.h>
+#include <qt_gui_cpp/plugin_provider.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <pluginlib/class_list_macros.hpp>
diff --git a/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.h b/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.h
index 627f2e38..b6e9edb7 100644
--- a/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.h
+++ b/rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.h
@@ -33,7 +33,7 @@
 #ifndef rqt_gui_cpp__RosCppPluginProvider_H
 #define rqt_gui_cpp__RosCppPluginProvider_H
 
-#include <qt_gui_cpp/composite_plugin_provider.h>
+#include <qt_gui_cpp/composite_plugin_provider.hpp>
 
 #include <QMessageBox>
 #include <QThread>