diff --git a/kernel/src/arch/Serial.cpp b/kernel/src/arch/Serial.cpp
index 1f0d59ea..7e6f5f98 100644
--- a/kernel/src/arch/Serial.cpp
+++ b/kernel/src/arch/Serial.cpp
@@ -1,6 +1,6 @@
 #include "arch/Serial.h"
-#include <luna/Result.h>
 #include <luna/Format.h>
+#include <luna/Result.h>
 #include <stdarg.h>
 
 namespace Serial
diff --git a/kernel/src/arch/x86_64/MMU.cpp b/kernel/src/arch/x86_64/MMU.cpp
index 7d76da52..25edd6ff 100644
--- a/kernel/src/arch/x86_64/MMU.cpp
+++ b/kernel/src/arch/x86_64/MMU.cpp
@@ -1,8 +1,8 @@
 #include "arch/MMU.h"
 #include "memory/MemoryManager.h"
+#include <luna/Result.h>
 #include <luna/String.h>
 #include <luna/SystemError.h>
-#include <luna/Result.h>
 
 #pragma GCC push_options
 #pragma GCC diagnostic ignored "-Wconversion"
diff --git a/kernel/src/boot/Init.cpp b/kernel/src/boot/Init.cpp
index 870d385e..64605a5b 100644
--- a/kernel/src/boot/Init.cpp
+++ b/kernel/src/boot/Init.cpp
@@ -4,8 +4,8 @@
 #include "boot/bootboot.h"
 #include "memory/MemoryManager.h"
 #include "video/Framebuffer.h"
-#include <luna/String.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 
 extern const BOOTBOOT bootboot;
 
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index 6bc1c5b6..33f7410e 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -4,8 +4,8 @@
 #include "boot/Init.h"
 #include "config.h"
 #include "memory/MemoryManager.h"
-#include <luna/Units.h>
 #include <luna/Result.h>
+#include <luna/Units.h>
 
 Result<void> init()
 {
diff --git a/kernel/src/video/TextConsole.cpp b/kernel/src/video/TextConsole.cpp
index 80565daf..dc5f96a0 100644
--- a/kernel/src/video/TextConsole.cpp
+++ b/kernel/src/video/TextConsole.cpp
@@ -2,8 +2,8 @@
 #include "boot/bootboot.h"
 #include "video/Framebuffer.h"
 #include <luna/Format.h>
-#include <luna/String.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 #include <stdarg.h>
 
 extern const BOOTBOOT bootboot;
diff --git a/luna/src/Format.cpp b/luna/src/Format.cpp
index 5bb9cb1e..0f7fd109 100644
--- a/luna/src/Format.cpp
+++ b/luna/src/Format.cpp
@@ -2,8 +2,8 @@
 #include <luna/Format.h>
 #include <luna/NumberParsing.h>
 #include <luna/Result.h>
-#include <stddef.h>
 #include <stdarg.h>
+#include <stddef.h>
 
 extern "C" usize strlen(const char*);
 
diff --git a/luna/src/Units.cpp b/luna/src/Units.cpp
index d0362a75..0b64dd9e 100644
--- a/luna/src/Units.cpp
+++ b/luna/src/Units.cpp
@@ -1,6 +1,6 @@
 #include <luna/Format.h>
-#include <luna/Units.h>
 #include <luna/Result.h>
+#include <luna/Units.h>
 
 Result<usize> to_dynamic_unit(usize value, char* buffer, usize max)
 {