11 files changed, 37 insertions, 23 deletions
diff --git a/libs/acpi/acpi/common/table_header.cpp b/libs/acpi/acpi/common/table_header.cpp
index c69ff5d9..6a7a4dc3 100644
--- a/libs/acpi/acpi/common/table_header.cpp
+++ b/libs/acpi/acpi/common/table_header.cpp
@@ -1,8 +1,8 @@
+#include <acpi/common/table_header.hpp>
+
 #include <kstd/cstring>
 #include <kstd/units>
 
-#include <acpi/common/table_header.hpp>
-
 #include <array>
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/common/table_header.test.cpp b/libs/acpi/acpi/common/table_header.test.cpp
index d6976b3e..53cdb265 100644
--- a/libs/acpi/acpi/common/table_header.test.cpp
+++ b/libs/acpi/acpi/common/table_header.test.cpp
@@ -1,7 +1,9 @@
+#include <acpi/common/table_header.hpp>
+
 #include <kstd/units>
 
-#include <acpi/common/table_header.hpp>
 #include <catch2/catch_test_macros.hpp>
+
 #include <test_data/tables.hpp>
 
 SCENARIO("Common table header parsing", "[common_table_header]")
diff --git a/libs/acpi/acpi/data/madt.cpp b/libs/acpi/acpi/data/madt.cpp
index a8d47412..1a8b6d3a 100644
--- a/libs/acpi/acpi/data/madt.cpp
+++ b/libs/acpi/acpi/data/madt.cpp
@@ -1,7 +1,7 @@
-#include <kstd/cstring>
-
 #include <acpi/data/madt.hpp>
 
+#include <kstd/cstring>
+
 #include <bit>
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/madt.hpp b/libs/acpi/acpi/data/madt.hpp
index 83078260..b76daa4f 100644
--- a/libs/acpi/acpi/data/madt.hpp
+++ b/libs/acpi/acpi/data/madt.hpp
@@ -3,14 +3,14 @@
 
 // IWYU pragma: private, include <acpi/acpi.hpp>
 
-#include <kstd/ext/bitfield_enum>
-#include <kstd/os/error.hpp>
-#include <kstd/units>
-
 #include <acpi/common/table_signature.hpp>
 #include <acpi/common/table_type.hpp>
 #include <acpi/common/vla_table.hpp>
 
+#include <kstd/ext/bitfield_enum>
+#include <kstd/os/error.hpp>
+#include <kstd/units>
+
 #include <array>
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/madt.test.cpp b/libs/acpi/acpi/data/madt.test.cpp
index 6795499d..5d3b3660 100644
--- a/libs/acpi/acpi/data/madt.test.cpp
+++ b/libs/acpi/acpi/data/madt.test.cpp
@@ -1,11 +1,13 @@
+#include <acpi/data/madt.hpp>
+
 #include <kstd/units>
 
-#include <acpi/data/madt.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <test_data/tables.hpp>
 
 #include <iterator>
 
+#include <test_data/tables.hpp>
+
 SCENARIO("MADT parsing", "[madt]")
 {
   GIVEN("The basic compiled MADT containing a single LAPIC entry and the default x86 LAPIC address")
diff --git a/libs/acpi/acpi/data/rsdt.cpp b/libs/acpi/acpi/data/rsdt.cpp
index fe108c7c..80e209db 100644
--- a/libs/acpi/acpi/data/rsdt.cpp
+++ b/libs/acpi/acpi/data/rsdt.cpp
@@ -1,7 +1,8 @@
-#include <kstd/cstring>
+#include <acpi/data/rsdt.hpp>
 
 #include <acpi/common/table_header.hpp>
-#include <acpi/data/rsdt.hpp>
+
+#include <kstd/cstring>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/rsdt.test.cpp b/libs/acpi/acpi/data/rsdt.test.cpp
index 937dce08..a6dd4160 100644
--- a/libs/acpi/acpi/data/rsdt.test.cpp
+++ b/libs/acpi/acpi/data/rsdt.test.cpp
@@ -1,12 +1,15 @@
-#include <kstd/units>
+#include <acpi/data/rsdt.hpp>
 
 #include <acpi/acpi.hpp>
-#include <acpi/data/rsdt.hpp>
+
+#include <kstd/units>
+
 #include <catch2/catch_test_macros.hpp>
-#include <test_data/tables.hpp>
 
 #include <iterator>
 
+#include <test_data/tables.hpp>
+
 SCENARIO("RSDT parsing", "[rsdt]")
 {
   GIVEN("The basic compiled RSDT containing 8 table pointers")
diff --git a/libs/acpi/acpi/data/xsdt.cpp b/libs/acpi/acpi/data/xsdt.cpp
index b4202b8c..b77aeab7 100644
--- a/libs/acpi/acpi/data/xsdt.cpp
+++ b/libs/acpi/acpi/data/xsdt.cpp
@@ -1,7 +1,8 @@
-#include <kstd/cstring>
+#include <acpi/data/xsdt.hpp>
 
 #include <acpi/common/table_header.hpp>
-#include <acpi/data/xsdt.hpp>
+
+#include <kstd/cstring>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/xsdt.test.cpp b/libs/acpi/acpi/data/xsdt.test.cpp
index 7fb564c8..cc18a668 100644
--- a/libs/acpi/acpi/data/xsdt.test.cpp
+++ b/libs/acpi/acpi/data/xsdt.test.cpp
@@ -1,12 +1,15 @@
-#include <kstd/units>
+#include <acpi/data/xsdt.hpp>
 
 #include <acpi/acpi.hpp>
-#include <acpi/data/xsdt.hpp>
+
+#include <kstd/units>
+
 #include <catch2/catch_test_macros.hpp>
-#include <test_data/tables.hpp>
 
 #include <iterator>
 
+#include <test_data/tables.hpp>
+
 SCENARIO("XSDT parsing", "[xsdt]")
 {
   GIVEN("The basic compiled XSDT containing 8 table pointers")
diff --git a/libs/acpi/acpi/pointers.cpp b/libs/acpi/acpi/pointers.cpp
index 45a42ce7..2ac8d319 100644
--- a/libs/acpi/acpi/pointers.cpp
+++ b/libs/acpi/acpi/pointers.cpp
@@ -1,7 +1,8 @@
-#include <kstd/units>
+#include <acpi/pointers.hpp>
 
 #include <acpi/common/checksum.hpp>
-#include <acpi/pointers.hpp>
+
+#include <kstd/units>
 
 #include <bit>
 #include <cstddef>
diff --git a/libs/acpi/acpi/pointers.test.cpp b/libs/acpi/acpi/pointers.test.cpp
index 06ce1a43..d7b700d6 100644
--- a/libs/acpi/acpi/pointers.test.cpp
+++ b/libs/acpi/acpi/pointers.test.cpp
@@ -1,4 +1,5 @@
 #include <acpi/pointers.hpp>
+
 #include <catch2/catch_test_macros.hpp>
 
 #include <array>