diff --git a/sciurus17_examples/src/gripper_control.cpp b/sciurus17_examples/src/gripper_control.cpp
index 5a779376..5d0857cc 100644
--- a/sciurus17_examples/src/gripper_control.cpp
+++ b/sciurus17_examples/src/gripper_control.cpp
@@ -19,7 +19,7 @@
 #include <cmath>
 
 #include "angles/angles.h"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 using MoveGroupInterface = moveit::planning_interface::MoveGroupInterface;
diff --git a/sciurus17_examples/src/neck_control.cpp b/sciurus17_examples/src/neck_control.cpp
index ee3e552e..f11eec7f 100644
--- a/sciurus17_examples/src/neck_control.cpp
+++ b/sciurus17_examples/src/neck_control.cpp
@@ -17,7 +17,7 @@
 // examples/move_group_interface/src/move_group_interface_tutorial.cpp
 
 #include "angles/angles.h"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 using MoveGroupInterface = moveit::planning_interface::MoveGroupInterface;
diff --git a/sciurus17_examples/src/pick_and_place_left_arm.cpp b/sciurus17_examples/src/pick_and_place_left_arm.cpp
index c5c95e83..bd523890 100644
--- a/sciurus17_examples/src/pick_and_place_left_arm.cpp
+++ b/sciurus17_examples/src/pick_and_place_left_arm.cpp
@@ -19,7 +19,7 @@
 #include <cmath>
 
 #include "angles/angles.h"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "pose_presets.hpp"
 
diff --git a/sciurus17_examples/src/pick_and_place_right_arm_waist.cpp b/sciurus17_examples/src/pick_and_place_right_arm_waist.cpp
index ab9d4004..2b4d2d99 100644
--- a/sciurus17_examples/src/pick_and_place_right_arm_waist.cpp
+++ b/sciurus17_examples/src/pick_and_place_right_arm_waist.cpp
@@ -19,7 +19,7 @@
 #include <cmath>
 
 #include "angles/angles.h"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "pose_presets.hpp"
 
diff --git a/sciurus17_examples/src/pick_and_place_tf.cpp b/sciurus17_examples/src/pick_and_place_tf.cpp
index 96d3fe96..b06d3d13 100644
--- a/sciurus17_examples/src/pick_and_place_tf.cpp
+++ b/sciurus17_examples/src/pick_and_place_tf.cpp
@@ -26,12 +26,12 @@
 #include "angles/angles.h"
 #include "geometry_msgs/msg/pose.hpp"
 #include "geometry_msgs/msg/transform_stamped.hpp"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "pose_presets.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
-#include "tf2/convert.h"
-#include "tf2/exceptions.h"
+#include "tf2/convert.hpp"
+#include "tf2/exceptions.hpp"
 #include "tf2_ros/transform_listener.h"
 #include "tf2_ros/buffer.h"
 using namespace std::chrono_literals;
diff --git a/sciurus17_examples/src/waist_control.cpp b/sciurus17_examples/src/waist_control.cpp
index 1774f6d2..941e157e 100644
--- a/sciurus17_examples/src/waist_control.cpp
+++ b/sciurus17_examples/src/waist_control.cpp
@@ -17,7 +17,7 @@
 // examples/move_group_interface/src/move_group_interface_tutorial.cpp
 
 #include "angles/angles.h"
-#include "moveit/move_group_interface/move_group_interface.h"
+#include "moveit/move_group_interface/move_group_interface.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 using MoveGroupInterface = moveit::planning_interface::MoveGroupInterface;