20 files changed, 56 insertions, 43 deletions
diff --git a/libs/acpi/acpi/common/table_header.cpp b/libs/acpi/acpi/common/table_header.cpp
index c69ff5d..6a7a4dc 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 d6976b3..53cdb26 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 a8d4741..1a8b6d3 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 8307826..b76daa4 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 6795499..5d3b366 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 fe108c7..80e209d 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 937dce0..a6dd416 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 b4202b8..b77aeab 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 7fb564c..cc18a66 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 45a42ce..2ac8d31 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 06ce1a4..d7b700d 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>
diff --git a/libs/kstd/include/kstd/bits/format/context.hpp b/libs/kstd/include/kstd/bits/format/context.hpp
index 7f392a0..1883fc8 100644
--- a/libs/kstd/include/kstd/bits/format/context.hpp
+++ b/libs/kstd/include/kstd/bits/format/context.hpp
@@ -3,9 +3,8 @@
 
 // IWYU pragma: private, include <kstd/format>
 
-#include "arg.hpp"
+#include "kstd/bits/format/arg.hpp"
 #include "kstd/bits/format/output_buffer.hpp"
-
 #include <kstd/os/error.hpp>
 
 #include <concepts>
diff --git a/libs/kstd/include/kstd/stack b/libs/kstd/include/kstd/stack
index 9750376..77e6bfd 100644
--- a/libs/kstd/include/kstd/stack
+++ b/libs/kstd/include/kstd/stack
@@ -2,6 +2,7 @@
 #define KSTD_STACK_HPP
 
 #include "kstd/vector"
+
 #include <initializer_list>
 #include <utility>
 
diff --git a/libs/kstd/include/kstd/string b/libs/kstd/include/kstd/string
index 58c4a08..e228a04 100644
--- a/libs/kstd/include/kstd/string
+++ b/libs/kstd/include/kstd/string
@@ -1,10 +1,9 @@
 #ifndef KSTD_STRING_HPP
 #define KSTD_STRING_HPP
 
-#include "kstd/bits/format/context.hpp"
-#include "kstd/bits/format/formatter.hpp"
-#include "kstd/bits/format/formatter/string_view.hpp"
-
+#include <kstd/bits/format/context.hpp>
+#include <kstd/bits/format/formatter.hpp>
+#include <kstd/bits/format/formatter/string_view.hpp>
 #include <kstd/cstring>
 #include <kstd/os/error.hpp>
 #include <kstd/vector>
diff --git a/libs/kstd/include/kstd/units b/libs/kstd/include/kstd/units
index bc7e1b9..df5eb37 100644
--- a/libs/kstd/include/kstd/units
+++ b/libs/kstd/include/kstd/units
@@ -15,9 +15,8 @@ namespace kstd
     using value_type = ValueType;
 
     constexpr basic_unit() noexcept
-      : value{}
-    {
-    }
+        : value{}
+    {}
 
     explicit constexpr basic_unit(value_type value) noexcept
         : value{value}
diff --git a/libs/kstd/tests/src/flat_map.cpp b/libs/kstd/tests/src/flat_map.cpp
index eb599af..2b793d9 100644
--- a/libs/kstd/tests/src/flat_map.cpp
+++ b/libs/kstd/tests/src/flat_map.cpp
@@ -1,4 +1,5 @@
 #include <kstd/flat_map>
+
 #include <kstd/tests/os_panic.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/libs/kstd/tests/src/vector.cpp b/libs/kstd/tests/src/vector.cpp
index 97460b4..415ca8e 100644
--- a/libs/kstd/tests/src/vector.cpp
+++ b/libs/kstd/tests/src/vector.cpp
@@ -1,8 +1,8 @@
-#include "kstd/tests/os_panic.hpp"
+#include <kstd/vector>
 
+#include "kstd/tests/os_panic.hpp"
 #include <kstd/ranges>
 #include <kstd/tests/test_types.hpp>
-#include <kstd/vector>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/libs/multiboot2/multiboot2/information.hpp b/libs/multiboot2/multiboot2/information.hpp
index a2ded56..5f75fc8 100644
--- a/libs/multiboot2/multiboot2/information.hpp
+++ b/libs/multiboot2/multiboot2/information.hpp
@@ -1,14 +1,14 @@
 #ifndef MULTIBOOT2_INFORMATION_HPP
 #define MULTIBOOT2_INFORMATION_HPP
 
-#include "information/data.hpp"      // IWYU pragma: export
-#include "information/iterator.hpp"  // IWYU pragma: export
-#include "information/tag.hpp"       // IWYU pragma: export
+#include <elf/format.hpp>
+#include <elf/section_header.hpp>
 
 #include <kstd/units>
 
-#include <elf/format.hpp>
-#include <elf/section_header.hpp>
+#include "multiboot2/information/data.hpp"      // IWYU pragma: export
+#include "multiboot2/information/iterator.hpp"  // IWYU pragma: export
+#include "multiboot2/information/tag.hpp"       // IWYU pragma: export
 
 #include <algorithm>
 #include <cstddef>
@@ -129,7 +129,7 @@ namespace multiboot2
       return kstd::units::bytes{end_address - start_address};
     }
   };
-  
+
   struct acpi_rsdp : vla_tag<data::acpi_rsdp, std::byte, std::span>
   {
     using vla_tag::vla_tag;
diff --git a/libs/multiboot2/multiboot2/information/data.hpp b/libs/multiboot2/multiboot2/information/data.hpp
index 315eb39..531e2f3 100644
--- a/libs/multiboot2/multiboot2/information/data.hpp
+++ b/libs/multiboot2/multiboot2/information/data.hpp
@@ -3,11 +3,11 @@
 
 // IWYU pragma: private, include <multiboot2/information.hpp>
 
+#include <kstd/units>
+
 #include "multiboot2/constants/information_id.hpp"
 #include "multiboot2/constants/memory_type.hpp"
 
-#include <kstd/units>
-
 #include <cstdint>
 
 namespace multiboot2
diff --git a/libs/multiboot2/multiboot2/information/iterator.hpp b/libs/multiboot2/multiboot2/information/iterator.hpp
index 62c267d..ec0f4a2 100644
--- a/libs/multiboot2/multiboot2/information/iterator.hpp
+++ b/libs/multiboot2/multiboot2/information/iterator.hpp
@@ -4,7 +4,7 @@
 // IWYU pragma: private, include <multiboot2/information.hpp>
 
 #include "multiboot2/constants/information_id.hpp"
-#include "tag.hpp"
+#include "multiboot2/information/tag.hpp"
 
 #include <cstddef>
 #include <iterator>