6 files changed, 19 insertions, 17 deletions
diff --git a/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp b/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
index cd8360b..7fa2cb8 100644
--- a/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
+++ b/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
@@ -1,25 +1,26 @@
 #include "kernel/test_support/filesystem/storage_boot_module_fixture.hpp"
 
-#include "kapi/boot_module/boot_module.hpp"
-#include "kapi/boot_modules.hpp"
-#include "kapi/memory.hpp"
-
 #include "kernel/devices/storage/management.hpp"
 #include "kernel/test_support/boot_modules.hpp"
 #include "kernel/test_support/devices/storage/management.hpp"
 
+#include "kapi/boot_module/boot_module.hpp"
+#include "kapi/boot_modules.hpp"
+#include "kapi/memory.hpp"
+
 #include <cstddef>
 #include <fcntl.h>
 #include <filesystem>
 #include <format>
 #include <stdexcept>
 #include <string>
-#include <sys/mman.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <utility>
 #include <vector>
 
+#include <sys/mman.h>
+#include <sys/stat.h>
+
 namespace kernel::tests::filesystem
 {
   storage_boot_module_fixture::mapped_image::mapped_image(std::filesystem::path path)
diff --git a/kernel/src/test_support/kapi/cio.cpp b/kernel/src/test_support/kapi/cio.cpp
index 4a1cd1f..5cdd462 100644
--- a/kernel/src/test_support/kapi/cio.cpp
+++ b/kernel/src/test_support/kapi/cio.cpp
@@ -1,9 +1,9 @@
 #include "kernel/test_support/cio.hpp"
 
-#include <kapi/cio.hpp>
-
 #include "kernel/test_support/log_buffer.hpp"
 
+#include <kapi/cio.hpp>
+
 #include <atomic>
 #include <optional>
 #include <stdexcept>
diff --git a/kernel/src/test_support/kapi/memory.cpp b/kernel/src/test_support/kapi/memory.cpp
index e926ba6..3b4a1bd 100644
--- a/kernel/src/test_support/kapi/memory.cpp
+++ b/kernel/src/test_support/kapi/memory.cpp
@@ -1,10 +1,10 @@
 #include "kapi/memory.hpp"
 
-#include <kapi/memory.hpp>
-
 #include "kernel/test_support/bump_frame_allocator.hpp"
 #include "kernel/test_support/page_mapper.hpp"
 
+#include <kapi/memory.hpp>
+
 #include <kstd/units>
 
 #include <optional>
diff --git a/kernel/src/test_support/output_device.cpp b/kernel/src/test_support/output_device.cpp
index 83dcbcc..505e385 100644
--- a/kernel/src/test_support/output_device.cpp
+++ b/kernel/src/test_support/output_device.cpp
@@ -1,8 +1,8 @@
-#include "kapi/cio.hpp"
-
 #include "kernel/test_support/cio.hpp"
 #include "kernel/test_support/log_buffer.hpp"
 
+#include "kapi/cio.hpp"
+
 #include <iostream>
 #include <string>
 #include <string_view>
diff --git a/kernel/src/test_support/simulated_memory.cpp b/kernel/src/test_support/simulated_memory.cpp
index 03dac1d..2a4f15b 100644
--- a/kernel/src/test_support/simulated_memory.cpp
+++ b/kernel/src/test_support/simulated_memory.cpp
@@ -9,9 +9,10 @@
 #include <cstring>
 #include <format>
 #include <stdexcept>
+#include <unistd.h>
+
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 namespace kernel::tests
 {
diff --git a/kernel/src/test_support/state_reset_listener.cpp b/kernel/src/test_support/state_reset_listener.cpp
index 9120c89..1967743 100644
--- a/kernel/src/test_support/state_reset_listener.cpp
+++ b/kernel/src/test_support/state_reset_listener.cpp
@@ -1,7 +1,3 @@
-#include "kapi/cio.hpp"
-#include "kapi/cpu.hpp"
-#include "kapi/memory.hpp"
-
 #include "kernel/filesystem/file_descriptor_table.hpp"
 #include "kernel/test_support/boot_modules.hpp"
 #include "kernel/test_support/cio.hpp"
@@ -11,6 +7,10 @@
 #include "kernel/test_support/filesystem/vfs.hpp"
 #include "kernel/test_support/memory.hpp"
 
+#include "kapi/cio.hpp"
+#include "kapi/cpu.hpp"
+#include "kapi/memory.hpp"
+
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/reporters/catch_reporter_event_listener.hpp>