diff --git a/image_tools/src/burger.cpp b/image_tools/src/burger.cpp
index 02b718352..c7951e868 100644
--- a/image_tools/src/burger.cpp
+++ b/image_tools/src/burger.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "./burger.hpp"
+#include "burger.hpp"
 
 #include "opencv2/core.hpp"
 #include "opencv2/core/mat.hpp"
diff --git a/intra_process_demo/src/image_pipeline/camera_node.cpp b/intra_process_demo/src/image_pipeline/camera_node.cpp
index ceefbf071..1d278fff5 100644
--- a/intra_process_demo/src/image_pipeline/camera_node.cpp
+++ b/intra_process_demo/src/image_pipeline/camera_node.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <memory>
+
 #include "image_pipeline/camera_node.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
-#include <memory>
-
 int main(int argc, char ** argv)
 {
   rclcpp::init(argc, argv);
diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp
index 32f91590e..caaca1661 100644
--- a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp
+++ b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rclcpp/rclcpp.hpp>
-
 #include <memory>
 
+#include <rclcpp/rclcpp.hpp>
+
 #include "image_pipeline/camera_node.hpp"
 #include "image_pipeline/image_view_node.hpp"
 #include "image_pipeline/watermark_node.hpp"
diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp
index 255e97e2d..522656e25 100644
--- a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp
+++ b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rclcpp/rclcpp.hpp>
-
 #include <memory>
 
+#include <rclcpp/rclcpp.hpp>
+
 #include "image_pipeline/camera_node.hpp"
 #include "image_pipeline/image_view_node.hpp"
 #include "image_pipeline/watermark_node.hpp"
diff --git a/intra_process_demo/src/image_pipeline/image_view_node.cpp b/intra_process_demo/src/image_pipeline/image_view_node.cpp
index 94e190269..d172ef017 100644
--- a/intra_process_demo/src/image_pipeline/image_view_node.cpp
+++ b/intra_process_demo/src/image_pipeline/image_view_node.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <memory>
+
 #include "image_pipeline/image_view_node.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
-#include <memory>
-
 int main(int argc, char ** argv)
 {
   rclcpp::init(argc, argv);
diff --git a/intra_process_demo/src/image_pipeline/watermark_node.cpp b/intra_process_demo/src/image_pipeline/watermark_node.cpp
index a162bca42..1824f7612 100644
--- a/intra_process_demo/src/image_pipeline/watermark_node.cpp
+++ b/intra_process_demo/src/image_pipeline/watermark_node.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <memory>
+
 #include "image_pipeline/watermark_node.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
-#include <memory>
-
 int main(int argc, char ** argv)
 {
   rclcpp::init(argc, argv);
diff --git a/pendulum_control/src/pendulum_demo.cpp b/pendulum_control/src/pendulum_demo.cpp
index 0653215e7..63b0b19a2 100644
--- a/pendulum_control/src/pendulum_demo.cpp
+++ b/pendulum_control/src/pendulum_demo.cpp
@@ -14,7 +14,11 @@
 
 #include <unistd.h>
 
-#include <rttest/rttest.h>
+#include <chrono>
+#include <cstdio>
+#include <memory>
+
+#include "rttest/rttest.h"
 
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/strategies/message_pool_memory_strategy.hpp>
@@ -26,10 +30,6 @@
 #include <pendulum_msgs/msg/joint_state.hpp>
 #include <pendulum_msgs/msg/rttest_results.hpp>
 
-#include <chrono>
-#include <cstdio>
-#include <memory>
-
 #include "pendulum_control/pendulum_controller.hpp"
 #include "pendulum_control/pendulum_motor.hpp"
 #include "pendulum_control/rtt_executor.hpp"
diff --git a/quality_of_service_demo/rclcpp/src/utils.cpp b/quality_of_service_demo/rclcpp/src/utils.cpp
index 7cf2f33c9..077897956 100644
--- a/quality_of_service_demo/rclcpp/src/utils.cpp
+++ b/quality_of_service_demo/rclcpp/src/utils.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <cctype>
 
-#include "./utils.hpp"
+#include "utils.hpp"
 
 double
 rmw_time_to_seconds(const rmw_time_t & time)