7 files changed, 21 insertions, 20 deletions
diff --git a/arch/x86_64/src/cpu/interrupts.cpp b/arch/x86_64/src/cpu/interrupts.cpp
index 907f289..f58b851 100644
--- a/arch/x86_64/src/cpu/interrupts.cpp
+++ b/arch/x86_64/src/cpu/interrupts.cpp
@@ -1,12 +1,12 @@
 #include "arch/cpu/interrupts.hpp"
 
+#include "arch/cpu/legacy_pic.hpp"
+#include "arch/cpu/segment_selector.hpp"
+
 #include "kapi/cpu.hpp"
 #include "kapi/interrupts.hpp"
 #include "kapi/memory.hpp"
 
-#include "arch/cpu/legacy_pic.hpp"
-#include "arch/cpu/segment_selector.hpp"
-
 #include <kstd/print>
 
 #include <cstdint>
diff --git a/arch/x86_64/src/devices/init.cpp b/arch/x86_64/src/devices/init.cpp
index 7f0faa4..8c96b38 100644
--- a/arch/x86_64/src/devices/init.cpp
+++ b/arch/x86_64/src/devices/init.cpp
@@ -1,18 +1,18 @@
 #include "arch/devices/init.hpp"
 
+#include "arch/boot/boot.hpp"
+#include "arch/bus/isa.hpp"
+#include "arch/devices/legacy_pit.hpp"
+
 #include "kapi/acpi.hpp"
 #include "kapi/cpu.hpp"
 #include "kapi/devices.hpp"
 
-#include "arch/boot/boot.hpp"
-#include "arch/bus/isa.hpp"
-#include "arch/devices/legacy_pit.hpp"
+#include <acpi/acpi.hpp>
 
 #include <kstd/memory>
 #include <kstd/print>
 
-#include <acpi/acpi.hpp>
-
 #include <cstdint>
 #include <utility>
 
diff --git a/arch/x86_64/src/devices/legacy_pit.cpp b/arch/x86_64/src/devices/legacy_pit.cpp
index a8df3c3..44ff499 100644
--- a/arch/x86_64/src/devices/legacy_pit.cpp
+++ b/arch/x86_64/src/devices/legacy_pit.cpp
@@ -1,11 +1,11 @@
 #include "arch/devices/legacy_pit.hpp"
 
+#include "arch/device_io/port_io.hpp"
+
 #include "kapi/devices.hpp"
 #include "kapi/devices/device.hpp"
 #include "kapi/interrupts.hpp"
 
-#include "arch/device_io/port_io.hpp"
-
 #include <cstddef>
 #include <cstdint>
 
diff --git a/arch/x86_64/src/memory/higher_half_mapper.cpp b/arch/x86_64/src/memory/higher_half_mapper.cpp
index abb54a3..b0d1995 100644
--- a/arch/x86_64/src/memory/higher_half_mapper.cpp
+++ b/arch/x86_64/src/memory/higher_half_mapper.cpp
@@ -1,11 +1,11 @@
 #include "arch/memory/higher_half_mapper.hpp"
 
-#include "kapi/memory.hpp"
-#include "kapi/system.hpp"
-
 #include "arch/memory/page_table.hpp"
 #include "arch/memory/page_utilities.hpp"
 
+#include "kapi/memory.hpp"
+#include "kapi/system.hpp"
+
 #include <algorithm>
 #include <array>
 #include <cstddef>
diff --git a/arch/x86_64/src/memory/kernel_mapper.cpp b/arch/x86_64/src/memory/kernel_mapper.cpp
index ced8a14..46d4dca 100644
--- a/arch/x86_64/src/memory/kernel_mapper.cpp
+++ b/arch/x86_64/src/memory/kernel_mapper.cpp
@@ -1,15 +1,16 @@
 #include "arch/memory/kernel_mapper.hpp"
 
+#include "arch/boot/ld.hpp"
+
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
-#include "arch/boot/ld.hpp"
+#include <elf/format.hpp>
+#include <elf/section_header.hpp>
 
 #include <kstd/print>
 #include <kstd/units>
 
-#include <elf/format.hpp>
-#include <elf/section_header.hpp>
 #include <multiboot2/information.hpp>
 
 #include <algorithm>
diff --git a/arch/x86_64/src/memory/mmu.cpp b/arch/x86_64/src/memory/mmu.cpp
index ea23278..6d185a0 100644
--- a/arch/x86_64/src/memory/mmu.cpp
+++ b/arch/x86_64/src/memory/mmu.cpp
@@ -1,9 +1,9 @@
 #include "arch/memory/mmu.hpp"
 
-#include "kapi/memory.hpp"
-
 #include "arch/cpu/registers.hpp"
 
+#include "kapi/memory.hpp"
+
 namespace arch::memory
 {
   auto tlb_flush(kapi::memory::linear_address address) -> void
diff --git a/arch/x86_64/src/vga/text/device.cpp b/arch/x86_64/src/vga/text/device.cpp
index dcacd8c..0ecbef9 100644
--- a/arch/x86_64/src/vga/text/device.cpp
+++ b/arch/x86_64/src/vga/text/device.cpp
@@ -1,10 +1,10 @@
-#include "kapi/cio.hpp"
-
 #include "arch/boot/boot.hpp"
 #include "arch/boot/ld.hpp"
 #include "arch/vga/crtc.hpp"
 #include "arch/vga/text.hpp"
 
+#include "kapi/cio.hpp"
+
 #include <bit>
 #include <cstddef>
 #include <cstdint>