From 2d8fed40bd0d0f8144783b6b344dc79944291b72 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Thu, 23 Apr 2026 13:31:17 +0200
Subject: chore: organize includes

---
 kernel/src/acpi/manager.cpp                                |  4 ++--
 kernel/src/devices/block_device_utils.cpp                  |  4 ++--
 kernel/src/devices/storage/management.cpp                  |  6 +++---
 kernel/src/devices/storage/ram_disk/controller.cpp         |  4 ++--
 kernel/src/devices/storage/ram_disk/device.cpp             |  4 ++--
 kernel/src/devices/storage/ram_disk/device.tests.cpp       |  5 ++---
 kernel/src/filesystem/dentry.cpp                           |  4 ++--
 kernel/src/filesystem/devfs/filesystem.cpp                 |  4 ++--
 kernel/src/filesystem/device_inode.cpp                     |  6 +++---
 kernel/src/filesystem/ext2/inode.cpp                       |  4 ++--
 kernel/src/filesystem/file_descriptor_table.cpp            |  4 ++--
 kernel/src/filesystem/filesystem.cpp                       |  4 ++--
 kernel/src/filesystem/mount.cpp                            |  8 ++++----
 kernel/src/filesystem/vfs.cpp                              |  4 ++--
 kernel/src/main.cpp                                        | 14 +++++++-------
 kernel/src/memory.cpp                                      |  6 +++---
 kernel/src/memory/bitmap_allocator.tests.cpp               |  1 -
 kernel/src/memory/block_list_allocator.cpp                 |  4 ++--
 kernel/src/memory/block_list_allocator.tests.cpp           |  4 ++--
 kernel/src/memory/operators.cpp                            |  4 ++--
 .../filesystem/storage_boot_module_fixture.cpp             | 13 +++++++------
 kernel/src/test_support/kapi/cio.cpp                       |  4 ++--
 kernel/src/test_support/kapi/memory.cpp                    |  4 ++--
 kernel/src/test_support/output_device.cpp                  |  4 ++--
 kernel/src/test_support/simulated_memory.cpp               |  3 ++-
 kernel/src/test_support/state_reset_listener.cpp           |  8 ++++----
 26 files changed, 67 insertions(+), 67 deletions(-)

(limited to 'kernel/src')

diff --git a/kernel/src/acpi/manager.cpp b/kernel/src/acpi/manager.cpp
index 58767992..f17c9cbc 100644
--- a/kernel/src/acpi/manager.cpp
+++ b/kernel/src/acpi/manager.cpp
@@ -3,11 +3,11 @@
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
+#include <acpi/acpi.hpp>
+
 #include <kstd/memory>
 #include <kstd/print>
 
-#include <acpi/acpi.hpp>
-
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
diff --git a/kernel/src/devices/block_device_utils.cpp b/kernel/src/devices/block_device_utils.cpp
index 59e9b977..3c773086 100644
--- a/kernel/src/devices/block_device_utils.cpp
+++ b/kernel/src/devices/block_device_utils.cpp
@@ -1,10 +1,10 @@
 #include "kernel/devices/block_device_utils.hpp"
 
+#include "kernel/devices/block_device.hpp"
+
 #include "kapi/devices/device.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/block_device.hpp"
-
 #include <kstd/cstring>
 #include <kstd/memory>
 #include <kstd/vector>
diff --git a/kernel/src/devices/storage/management.cpp b/kernel/src/devices/storage/management.cpp
index c9fa0a8d..8ff1b06e 100644
--- a/kernel/src/devices/storage/management.cpp
+++ b/kernel/src/devices/storage/management.cpp
@@ -1,12 +1,12 @@
 #include "kernel/devices/storage/management.hpp"
 
+#include "kernel/devices/storage/controller.hpp"
+#include "kernel/devices/storage/ram_disk/controller.hpp"
+
 #include "kapi/boot_modules.hpp"
 #include "kapi/devices/device.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/controller.hpp"
-#include "kernel/devices/storage/ram_disk/controller.hpp"
-
 #include <kstd/memory>
 #include <kstd/vector>
 
diff --git a/kernel/src/devices/storage/ram_disk/controller.cpp b/kernel/src/devices/storage/ram_disk/controller.cpp
index 040e61f5..d2305336 100644
--- a/kernel/src/devices/storage/ram_disk/controller.cpp
+++ b/kernel/src/devices/storage/ram_disk/controller.cpp
@@ -1,9 +1,9 @@
 #include "kernel/devices/storage/ram_disk/controller.hpp"
 
-#include "kapi/boot_module/boot_module_registry.hpp"
-
 #include "kernel/devices/storage/ram_disk/device.hpp"
 
+#include "kapi/boot_module/boot_module_registry.hpp"
+
 #include <kstd/memory>
 
 #include <algorithm>
diff --git a/kernel/src/devices/storage/ram_disk/device.cpp b/kernel/src/devices/storage/ram_disk/device.cpp
index 8fc3b2ae..c6a13631 100644
--- a/kernel/src/devices/storage/ram_disk/device.cpp
+++ b/kernel/src/devices/storage/ram_disk/device.cpp
@@ -1,10 +1,10 @@
 #include "kernel/devices/storage/ram_disk/device.hpp"
 
+#include "kernel/devices/block_device.hpp"
+
 #include "kapi/boot_module/boot_module.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/block_device.hpp"
-
 #include <kstd/cstring>
 #include <kstd/string>
 
diff --git a/kernel/src/devices/storage/ram_disk/device.tests.cpp b/kernel/src/devices/storage/ram_disk/device.tests.cpp
index eacdb04b..b475c4bf 100644
--- a/kernel/src/devices/storage/ram_disk/device.tests.cpp
+++ b/kernel/src/devices/storage/ram_disk/device.tests.cpp
@@ -3,10 +3,9 @@
 #include "kapi/boot_module/boot_module.hpp"
 #include "kapi/memory.hpp"
 
-#include "catch2/matchers/catch_matchers.hpp"
-#include "catch2/matchers/catch_matchers_range_equals.hpp"
-
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_range_equals.hpp>
 
 #include <cstddef>
 #include <ranges>
diff --git a/kernel/src/filesystem/dentry.cpp b/kernel/src/filesystem/dentry.cpp
index 65910113..af5ceab8 100644
--- a/kernel/src/filesystem/dentry.cpp
+++ b/kernel/src/filesystem/dentry.cpp
@@ -1,9 +1,9 @@
 #include "kernel/filesystem/dentry.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/inode.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 
 #include <algorithm>
diff --git a/kernel/src/filesystem/devfs/filesystem.cpp b/kernel/src/filesystem/devfs/filesystem.cpp
index dd60c5d7..76b9489a 100644
--- a/kernel/src/filesystem/devfs/filesystem.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.cpp
@@ -1,12 +1,12 @@
 #include "kernel/filesystem/devfs/filesystem.hpp"
 
-#include "kapi/devices/device.hpp"
-
 #include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/devfs/inode.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/inode.hpp"
 
+#include "kapi/devices/device.hpp"
+
 #include <kstd/memory>
 
 #include <algorithm>
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index 397a0fdd..5793bfcb 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -1,11 +1,11 @@
 #include "kernel/filesystem/device_inode.hpp"
 
-#include "kapi/devices/device.hpp"
-#include "kapi/system.hpp"
-
 #include "kernel/devices/block_device_utils.hpp"
 #include "kernel/filesystem/inode.hpp"
 
+#include "kapi/devices/device.hpp"
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 
 #include <cstddef>
diff --git a/kernel/src/filesystem/ext2/inode.cpp b/kernel/src/filesystem/ext2/inode.cpp
index 07a5525e..6b42db65 100644
--- a/kernel/src/filesystem/ext2/inode.cpp
+++ b/kernel/src/filesystem/ext2/inode.cpp
@@ -1,10 +1,10 @@
 #include "kernel/filesystem/ext2/inode.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
+#include "kapi/system.hpp"
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp
index 7569cead..4160429b 100644
--- a/kernel/src/filesystem/file_descriptor_table.cpp
+++ b/kernel/src/filesystem/file_descriptor_table.cpp
@@ -1,9 +1,9 @@
 #include "kernel/filesystem/file_descriptor_table.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/open_file_description.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 
 #include <algorithm>
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index 99e7456d..f9586600 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -1,10 +1,10 @@
 #include "kernel/filesystem/filesystem.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 
 #include <array>
diff --git a/kernel/src/filesystem/mount.cpp b/kernel/src/filesystem/mount.cpp
index d1653854..9c8584b7 100644
--- a/kernel/src/filesystem/mount.cpp
+++ b/kernel/src/filesystem/mount.cpp
@@ -1,10 +1,10 @@
 #include "kernel/filesystem/mount.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/dentry.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 #include <kstd/string>
 
@@ -13,8 +13,8 @@
 namespace kernel::filesystem
 {
   mount::mount(kstd::shared_ptr<dentry> const & mount_dentry, kstd::shared_ptr<dentry> const & root_dentry,
-           kstd::shared_ptr<filesystem> const & fs, std::string_view mount_path,
-           kstd::shared_ptr<mount> const & parent_mount)
+               kstd::shared_ptr<filesystem> const & fs, std::string_view mount_path,
+               kstd::shared_ptr<mount> const & parent_mount)
       : m_mount_path(mount_path)
       , m_mount_dentry(mount_dentry)
       , m_root_dentry(root_dentry)
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 84c8047b..23ced4cd 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -1,7 +1,5 @@
 #include "kernel/filesystem/vfs.hpp"
 
-#include "kapi/system.hpp"
-
 #include "kernel/filesystem/dentry.hpp"
 #include "kernel/filesystem/devfs/filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
@@ -9,6 +7,8 @@
 #include "kernel/filesystem/mount_table.hpp"
 #include "kernel/filesystem/rootfs/filesystem.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/memory>
 
 #include <optional>
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index aee35790..52cbe2e9 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -1,3 +1,10 @@
+#include "kernel/devices/storage/management.hpp"
+#include "kernel/filesystem/device_inode.hpp"
+#include "kernel/filesystem/file_descriptor_table.hpp"
+#include "kernel/filesystem/open_file_description.hpp"
+#include "kernel/filesystem/vfs.hpp"
+#include "kernel/memory.hpp"
+
 #include "kapi/boot_modules.hpp"
 #include "kapi/cio.hpp"
 #include "kapi/cpu.hpp"
@@ -6,13 +13,6 @@
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/management.hpp"
-#include "kernel/filesystem/device_inode.hpp"
-#include "kernel/filesystem/file_descriptor_table.hpp"
-#include "kernel/filesystem/open_file_description.hpp"
-#include "kernel/filesystem/vfs.hpp"
-#include "kernel/memory.hpp"
-
 #include <kstd/format>
 #include <kstd/memory>
 #include <kstd/os/error.hpp>
diff --git a/kernel/src/memory.cpp b/kernel/src/memory.cpp
index 4a8e203d..b5f65faf 100644
--- a/kernel/src/memory.cpp
+++ b/kernel/src/memory.cpp
@@ -1,11 +1,11 @@
 #include "kernel/memory.hpp"
 
-#include "kapi/memory.hpp"
-#include "kapi/system.hpp"
-
 #include "kernel/memory/block_list_allocator.hpp"
 #include "kernel/memory/heap_allocator.hpp"
 
+#include "kapi/memory.hpp"
+#include "kapi/system.hpp"
+
 #include <kstd/print>
 #include <kstd/units>
 
diff --git a/kernel/src/memory/bitmap_allocator.tests.cpp b/kernel/src/memory/bitmap_allocator.tests.cpp
index 56ec0a49..eff6d854 100644
--- a/kernel/src/memory/bitmap_allocator.tests.cpp
+++ b/kernel/src/memory/bitmap_allocator.tests.cpp
@@ -4,7 +4,6 @@
 
 #include "catch2/matchers/catch_matchers.hpp"
 #include "catch2/matchers/catch_matchers_range_equals.hpp"
-
 #include <catch2/catch_test_macros.hpp>
 
 #include <cstdint>
diff --git a/kernel/src/memory/block_list_allocator.cpp b/kernel/src/memory/block_list_allocator.cpp
index fbc5945d..5c416fa8 100644
--- a/kernel/src/memory/block_list_allocator.cpp
+++ b/kernel/src/memory/block_list_allocator.cpp
@@ -1,10 +1,10 @@
 #include "kernel/memory/block_list_allocator.hpp"
 
+#include "kernel/memory/heap_allocator.hpp"
+
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/memory/heap_allocator.hpp"
-
 #include <kstd/mutex>
 #include <kstd/units>
 
diff --git a/kernel/src/memory/block_list_allocator.tests.cpp b/kernel/src/memory/block_list_allocator.tests.cpp
index 0571441e..fccdad58 100644
--- a/kernel/src/memory/block_list_allocator.tests.cpp
+++ b/kernel/src/memory/block_list_allocator.tests.cpp
@@ -1,9 +1,9 @@
 #include "kernel/memory/block_list_allocator.hpp"
 
-#include "kapi/memory.hpp"
-
 #include "kernel/test_support/memory.hpp"
 
+#include "kapi/memory.hpp"
+
 #include <kstd/units>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/kernel/src/memory/operators.cpp b/kernel/src/memory/operators.cpp
index 25b5f243..dd3b4fa4 100644
--- a/kernel/src/memory/operators.cpp
+++ b/kernel/src/memory/operators.cpp
@@ -1,7 +1,7 @@
-#include "kapi/system.hpp"
-
 #include "kernel/memory.hpp"
 
+#include "kapi/system.hpp"
+
 #include <kstd/units>
 
 #include <cstddef>
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 cd8360b1..7fa2cb86 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 4a1cd1f6..5cdd4628 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 e926ba6c..3b4a1bd4 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 83dcbcc9..505e385b 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 03dac1d4..2a4f15ba 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 9120c890..19677439 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>
-- 
cgit v1.2.3