diff --git a/plansys2_tools/include/rqt_plansys2_knowledge/RQTKnowledge.hpp b/plansys2_tools/include/rqt_plansys2_knowledge/RQTKnowledge.hpp
index 791b4b0a..67602fbb 100644
--- a/plansys2_tools/include/rqt_plansys2_knowledge/RQTKnowledge.hpp
+++ b/plansys2_tools/include/rqt_plansys2_knowledge/RQTKnowledge.hpp
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 #ifndef RQT_PLANSYS2_KNOWLEDGE__RQTKNOWLEDGE_HPP_
 #define RQT_PLANSYS2_KNOWLEDGE__RQTKNOWLEDGE_HPP_
 
 #include <ui_rqt_plansys2_knowledge.h>
-#include <rqt_gui_cpp/plugin.h>
-
 
 #include <QAction>
 #include <QImage>
@@ -30,6 +29,8 @@
 #include <map>
 #include <memory>
 
+#include "rqt_gui_cpp/plugin.hpp"
+
 #include "rqt_plansys2_knowledge/KnowledgeTree.hpp"
 #include "plansys2_problem_expert/ProblemExpertClient.hpp"
 
diff --git a/plansys2_tools/include/rqt_plansys2_performers/RQTPerformers.hpp b/plansys2_tools/include/rqt_plansys2_performers/RQTPerformers.hpp
index 04504861..aefdc147 100644
--- a/plansys2_tools/include/rqt_plansys2_performers/RQTPerformers.hpp
+++ b/plansys2_tools/include/rqt_plansys2_performers/RQTPerformers.hpp
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 #ifndef RQT_PLANSYS2_PERFORMERS__RQTPERFORMERS_HPP_
 #define RQT_PLANSYS2_PERFORMERS__RQTPERFORMERS_HPP_
 
 #include <ui_rqt_plansys2_performers.h>
-#include <rqt_gui_cpp/plugin.h>
-
 
 #include <QAction>
 #include <QImage>
@@ -31,6 +30,8 @@
 #include <memory>
 #include <string>
 
+#include "rqt_gui_cpp/plugin.hpp"
+
 #include "rqt_plansys2_performers/PerformersTree.hpp"
 #include "plansys2_problem_expert/ProblemExpertClient.hpp"
 
diff --git a/plansys2_tools/include/rqt_plansys2_plan/RQTPlan.hpp b/plansys2_tools/include/rqt_plansys2_plan/RQTPlan.hpp
index 48f22e2e..4bba7bde 100644
--- a/plansys2_tools/include/rqt_plansys2_plan/RQTPlan.hpp
+++ b/plansys2_tools/include/rqt_plansys2_plan/RQTPlan.hpp
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 #ifndef RQT_PLANSYS2_PLAN__RQTPLAN_HPP_
 #define RQT_PLANSYS2_PLAN__RQTPLAN_HPP_
 
 #include <ui_rqt_plansys2_plan.h>
-#include <rqt_gui_cpp/plugin.h>
-
 
 #include <QAction>
 #include <QImage>
@@ -31,6 +30,8 @@
 #include <memory>
 #include <string>
 
+#include "rqt_gui_cpp/plugin.hpp"
+
 #include "rqt_plansys2_plan/PlanTree.hpp"
 
 #include "plansys2_msgs/msg/plan.hpp"