diff --git a/rcl_logging_interface/test/test_get_logging_directory.cpp b/rcl_logging_interface/test/test_get_logging_directory.cpp
index ea58092..971b020 100644
--- a/rcl_logging_interface/test/test_get_logging_directory.cpp
+++ b/rcl_logging_interface/test/test_get_logging_directory.cpp
@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rcpputils/filesystem_helper.hpp>
-#include <rcpputils/env.hpp>
-#include <rcutils/allocator.h>
-#include <rcutils/env.h>
-#include <rcutils/error_handling.h>
-
 #include <iostream>
 #include <string>
 
 #include "gtest/gtest.h"
+
+#include "rcpputils/filesystem_helper.hpp"
+#include "rcpputils/env.hpp"
+#include "rcutils/allocator.h"
+#include "rcutils/env.h"
+#include "rcutils/error_handling.h"
+
 #include "rcl_logging_interface/rcl_logging_interface.h"
 
 // This is a helper class that resets an environment
diff --git a/rcl_logging_spdlog/src/rcl_logging_spdlog.cpp b/rcl_logging_spdlog/src/rcl_logging_spdlog.cpp
index 5eccab3..2295b5f 100644
--- a/rcl_logging_spdlog/src/rcl_logging_spdlog.cpp
+++ b/rcl_logging_spdlog/src/rcl_logging_spdlog.cpp
@@ -12,13 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rcpputils/filesystem_helper.hpp>
-#include <rcutils/allocator.h>
-#include <rcutils/logging.h>
-#include <rcutils/process.h>
-#include <rcutils/snprintf.h>
-#include <rcutils/time.h>
-
 #include <cerrno>
 #include <cinttypes>
 #include <memory>
@@ -26,6 +19,13 @@
 #include <string>
 #include <utility>
 
+#include "rcpputils/filesystem_helper.hpp"
+#include "rcutils/allocator.h"
+#include "rcutils/logging.h"
+#include "rcutils/process.h"
+#include "rcutils/snprintf.h"
+#include "rcutils/time.h"
+
 #include "spdlog/spdlog.h"
 #include "spdlog/sinks/basic_file_sink.h"
 
diff --git a/rcl_logging_spdlog/test/fixtures.hpp b/rcl_logging_spdlog/test/fixtures.hpp
index ecdc627..85697f9 100644
--- a/rcl_logging_spdlog/test/fixtures.hpp
+++ b/rcl_logging_spdlog/test/fixtures.hpp
@@ -15,13 +15,6 @@
 #ifndef FIXTURES_HPP_
 #define FIXTURES_HPP_
 
-#include <rcpputils/filesystem_helper.hpp>
-#include <rcutils/allocator.h>
-#include <rcutils/env.h>
-#include <rcutils/error_handling.h>
-#include <rcutils/process.h>
-#include <rcutils/types/string_array.h>
-
 #include <limits.h>
 #ifdef _WIN32
 # include <windows.h>  // MAX_PATH
@@ -30,6 +23,13 @@
 
 #include "gtest/gtest.h"
 
+#include "rcpputils/filesystem_helper.hpp"
+#include "rcutils/allocator.h"
+#include "rcutils/env.h"
+#include "rcutils/error_handling.h"
+#include "rcutils/process.h"
+#include "rcutils/types/string_array.h"
+
 #ifdef _WIN32
 #define popen _popen
 #define pclose _pclose
diff --git a/rcl_logging_spdlog/test/test_logging_interface.cpp b/rcl_logging_spdlog/test/test_logging_interface.cpp
index 8f97458..17be297 100644
--- a/rcl_logging_spdlog/test/test_logging_interface.cpp
+++ b/rcl_logging_spdlog/test/test_logging_interface.cpp
@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rcpputils/filesystem_helper.hpp>
-#include <rcpputils/env.hpp>
-#include <rcutils/allocator.h>
-#include <rcutils/env.h>
-#include <rcutils/error_handling.h>
-#include <rcutils/logging.h>
-#include <rcutils/testing/fault_injection.h>
-
 #include <limits.h>
 #include <fstream>
 #include <string>
 
-#include "fixtures.hpp"
 #include "gtest/gtest.h"
+
+#include "rcpputils/filesystem_helper.hpp"
+#include "rcpputils/env.hpp"
+#include "rcutils/allocator.h"
+#include "rcutils/env.h"
+#include "rcutils/error_handling.h"
+#include "rcutils/logging.h"
+#include "rcutils/testing/fault_injection.h"
+
+#include "fixtures.hpp"
 #include "rcl_logging_interface/rcl_logging_interface.h"
 
 const int logger_levels[] =