diff --git a/kernel/debug.c b/kernel/debug.c
index 746cd213..442f955a 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -16,15 +16,16 @@
  * @brief  Debug console functions.
  */
 
-#include <lk/debug.h>
-#include <stdio.h>
+#include <kernel/debug.h>
+
+#include <kernel/mp.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
-#include <kernel/debug.h>
-#include <kernel/mp.h>
+#include <lk/console_cmd.h>
+#include <lk/debug.h>
 #include <lk/err.h>
 #include <platform.h>
-#include <lk/console_cmd.h>
+#include <stdio.h>
 
 static int cmd_threads(int argc, const cmd_args *argv);
 static int cmd_threadstats(int argc, const cmd_args *argv);
diff --git a/kernel/event.c b/kernel/event.c
index d18990af..2c4a4afd 100644
--- a/kernel/event.c
+++ b/kernel/event.c
@@ -25,11 +25,11 @@
  * @{
  */
 
-#include <kernel/event.h>
-#include <lk/debug.h>
 #include <assert.h>
-#include <lk/err.h>
+#include <kernel/event.h>
 #include <kernel/thread.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 
 /**
  * @brief  Initialize an event object
diff --git a/kernel/include/kernel/event.h b/kernel/include/kernel/event.h
index 62c72d20..c9f3da4d 100644
--- a/kernel/include/kernel/event.h
+++ b/kernel/include/kernel/event.h
@@ -7,10 +7,10 @@
  */
 #pragma once
 
+#include <kernel/thread.h>
 #include <lk/compiler.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <kernel/thread.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/mp.h b/kernel/include/kernel/mp.h
index a772ec6d..da2bf06a 100644
--- a/kernel/include/kernel/mp.h
+++ b/kernel/include/kernel/mp.h
@@ -7,11 +7,11 @@
  */
 #pragma once
 
-#include <lk/compiler.h>
+#include <kernel/thread.h>
 #include <limits.h>
+#include <lk/compiler.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <kernel/thread.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/mutex.h b/kernel/include/kernel/mutex.h
index 0b69e822..b0182dca 100644
--- a/kernel/include/kernel/mutex.h
+++ b/kernel/include/kernel/mutex.h
@@ -8,10 +8,10 @@
  */
 #pragma once
 
+#include <kernel/thread.h>
 #include <lk/compiler.h>
 #include <lk/debug.h>
 #include <stdint.h>
-#include <kernel/thread.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/novm.h b/kernel/include/kernel/novm.h
index 00cd6e2f..5553967f 100644
--- a/kernel/include/kernel/novm.h
+++ b/kernel/include/kernel/novm.h
@@ -7,9 +7,9 @@
  */
 #pragma once
 
+#include <arch.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <arch.h>
 
 #define PAGE_ALIGN(x) ALIGN(x, PAGE_SIZE)
 #define IS_PAGE_ALIGNED(x) IS_ALIGNED(x, PAGE_SIZE)
diff --git a/kernel/include/kernel/port.h b/kernel/include/kernel/port.h
index 868277ac..c5500971 100644
--- a/kernel/include/kernel/port.h
+++ b/kernel/include/kernel/port.h
@@ -7,9 +7,8 @@
  */
 #pragma once
 
-#include <sys/types.h>
 #include <lk/compiler.h>
-
+#include <sys/types.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/semaphore.h b/kernel/include/kernel/semaphore.h
index ef987ea6..d457065b 100644
--- a/kernel/include/kernel/semaphore.h
+++ b/kernel/include/kernel/semaphore.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <lk/compiler.h>
-#include <kernel/thread.h>
 #include <kernel/mutex.h>
+#include <kernel/thread.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/spinlock.h b/kernel/include/kernel/spinlock.h
index 918e7820..ee196d1e 100644
--- a/kernel/include/kernel/spinlock.h
+++ b/kernel/include/kernel/spinlock.h
@@ -7,8 +7,8 @@
  */
 #pragma once
 
-#include <lk/compiler.h>
 #include <arch/spinlock.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/thread.h b/kernel/include/kernel/thread.h
index 8a6f24af..e25cbfd3 100644
--- a/kernel/include/kernel/thread.h
+++ b/kernel/include/kernel/thread.h
@@ -7,15 +7,15 @@
  */
 #pragma once
 
-#include <sys/types.h>
-#include <lk/list.h>
-#include <lk/compiler.h>
 #include <arch/defines.h>
 #include <arch/ops.h>
 #include <arch/thread.h>
-#include <kernel/wait.h>
 #include <kernel/spinlock.h>
+#include <kernel/wait.h>
+#include <lk/compiler.h>
 #include <lk/debug.h>
+#include <lk/list.h>
+#include <sys/types.h>
 
 #if WITH_KERNEL_VM
 /* forward declaration */
diff --git a/kernel/include/kernel/vm.h b/kernel/include/kernel/vm.h
index bb8b87f4..1bf1d594 100644
--- a/kernel/include/kernel/vm.h
+++ b/kernel/include/kernel/vm.h
@@ -30,13 +30,13 @@
 
 #ifndef ASSEMBLY
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <lk/compiler.h>
-#include <lk/list.h>
-#include <stdlib.h>
 #include <arch.h>
 #include <arch/mmu.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/types.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/include/kernel/wait.h b/kernel/include/kernel/wait.h
index bdc2f2f2..dd28d554 100644
--- a/kernel/include/kernel/wait.h
+++ b/kernel/include/kernel/wait.h
@@ -7,12 +7,12 @@
  */
 #pragma once
 
-#include <sys/types.h>
-#include <lk/list.h>
-#include <lk/compiler.h>
 #include <arch/defines.h>
 #include <arch/ops.h>
 #include <arch/thread.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
+#include <sys/types.h>
 
 __BEGIN_CDECLS
 
diff --git a/kernel/init.c b/kernel/init.c
index bc651a48..32766169 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -5,13 +5,13 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT
  */
-#include <lk/compiler.h>
-#include <lk/debug.h>
 #include <kernel/debug.h>
-#include <kernel/thread.h>
-#include <kernel/timer.h>
 #include <kernel/mp.h>
 #include <kernel/port.h>
+#include <kernel/thread.h>
+#include <kernel/timer.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 
 void kernel_init(void) {
     // if enabled, configure the kernel's event log
diff --git a/kernel/mp.c b/kernel/mp.c
index 5ae41df9..a5d72471 100644
--- a/kernel/mp.c
+++ b/kernel/mp.c
@@ -8,12 +8,12 @@
 
 #include <kernel/mp.h>
 
-#include <stdlib.h>
-#include <lk/debug.h>
-#include <assert.h>
-#include <lk/trace.h>
 #include <arch/mp.h>
+#include <assert.h>
 #include <kernel/spinlock.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <stdlib.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 6aab928a..d1e334ce 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -16,10 +16,11 @@
  */
 
 #include <kernel/mutex.h>
-#include <lk/debug.h>
+
 #include <assert.h>
-#include <lk/err.h>
 #include <kernel/thread.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 
 /**
  * @brief  Initialize a mutex_t
diff --git a/kernel/novm/novm.c b/kernel/novm/novm.c
index 6c5096c0..2bd67da5 100644
--- a/kernel/novm/novm.c
+++ b/kernel/novm/novm.c
@@ -8,14 +8,14 @@
 
 #include "kernel/novm.h"
 
-#include <lk/err.h>
 #include <assert.h>
+#include <kernel/mutex.h>
+#include <lk/console_cmd.h>
+#include <lk/err.h>
+#include <lk/init.h>
 #include <lk/trace.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lk/init.h>
-#include <kernel/mutex.h>
-#include <lk/console_cmd.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/port.c b/kernel/port.c
index df1d338d..028cdbf8 100644
--- a/kernel/port.c
+++ b/kernel/port.c
@@ -13,14 +13,15 @@
  *
  */
 
+#include <kernel/port.h>
+
+#include <kernel/thread.h>
 #include <lk/debug.h>
+#include <lk/err.h>
 #include <lk/list.h>
+#include <lk/pow2.h>
 #include <malloc.h>
 #include <string.h>
-#include <lk/pow2.h>
-#include <lk/err.h>
-#include <kernel/thread.h>
-#include <kernel/port.h>
 
 // write ports can be in two states, open and closed, which have a
 // different magic number.
diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 3dbca91b..e940a3fe 100644
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include <kernel/semaphore.h>
+
+#include <kernel/thread.h>
 #include <lk/debug.h>
 #include <lk/err.h>
-#include <kernel/semaphore.h>
-#include <kernel/thread.h>
 
 void sem_init(semaphore_t *sem, unsigned int value) {
     *sem = (semaphore_t)SEMAPHORE_INITIAL_VALUE(*sem, value);
diff --git a/kernel/thread.c b/kernel/thread.c
index f1c84ca7..5588ecd7 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -15,20 +15,21 @@
  * @defgroup thread Threads
  * @{
  */
-#include <lk/debug.h>
-#include <assert.h>
-#include <lk/list.h>
-#include <malloc.h>
-#include <string.h>
-#include <printf.h>
-#include <lk/err.h>
 #include <kernel/thread.h>
-#include <kernel/timer.h>
+
+#include <assert.h>
 #include <kernel/debug.h>
 #include <kernel/mp.h>
-#include <platform.h>
-#include <target.h>
+#include <kernel/timer.h>
 #include <lib/heap.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/list.h>
+#include <malloc.h>
+#include <platform.h>
+#include <printf.h>
+#include <string.h>
+#include <target.h>
 #if WITH_KERNEL_VM
 #include <kernel/vm.h>
 #endif
diff --git a/kernel/timer.c b/kernel/timer.c
index ffd3d10b..80f509d8 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -19,16 +19,17 @@
  *
  * @{
  */
-#include <lk/debug.h>
-#include <lk/trace.h>
-#include <assert.h>
-#include <lk/list.h>
-#include <kernel/thread.h>
 #include <kernel/timer.h>
+
+#include <assert.h>
 #include <kernel/debug.h>
 #include <kernel/spinlock.h>
-#include <platform/timer.h>
+#include <kernel/thread.h>
+#include <lk/debug.h>
+#include <lk/list.h>
+#include <lk/trace.h>
 #include <platform.h>
+#include <platform/timer.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/bootalloc.c b/kernel/vm/bootalloc.c
index 65e8bda4..a5d0b9c4 100644
--- a/kernel/vm/bootalloc.c
+++ b/kernel/vm/bootalloc.c
@@ -6,12 +6,13 @@
  * https://opensource.org/licenses/MIT
  */
 #include <kernel/vm.h>
-#include "vm_priv.h"
 
+#include <lk/trace.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <lk/trace.h>
+
+#include "vm_priv.h"
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/pmm.c b/kernel/vm/pmm.c
index 6603fac8..dede0511 100644
--- a/kernel/vm/pmm.c
+++ b/kernel/vm/pmm.c
@@ -6,17 +6,18 @@
  * https://opensource.org/licenses/MIT
  */
 #include <kernel/vm.h>
-#include "vm_priv.h"
 
-#include <lk/trace.h>
 #include <assert.h>
-#include <lk/list.h>
-#include <stdlib.h>
-#include <lk/err.h>
-#include <string.h>
-#include <lk/pow2.h>
-#include <lk/console_cmd.h>
 #include <kernel/mutex.h>
+#include <lk/console_cmd.h>
+#include <lk/err.h>
+#include <lk/list.h>
+#include <lk/pow2.h>
+#include <lk/trace.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "vm_priv.h"
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/vm.c b/kernel/vm/vm.c
index b973c1c2..c323912f 100644
--- a/kernel/vm/vm.c
+++ b/kernel/vm/vm.c
@@ -6,16 +6,17 @@
  * https://opensource.org/licenses/MIT
  */
 #include <kernel/vm.h>
-#include "vm_priv.h"
 
-#include <lk/trace.h>
-#include <lk/err.h>
-#include <string.h>
-#include <lk/init.h>
-#include <lk/console_cmd.h>
 #include <arch/mmu.h>
 #include <kernel/thread.h>
+#include <lk/console_cmd.h>
 #include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/init.h>
+#include <lk/trace.h>
+#include <string.h>
+
+#include "vm_priv.h"
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/vm_priv.h b/kernel/vm/vm_priv.h
index c4884005..0c35cc35 100644
--- a/kernel/vm/vm_priv.h
+++ b/kernel/vm/vm_priv.h
@@ -7,9 +7,9 @@
  */
 #pragma once
 
+#include <kernel/vm.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <kernel/vm.h>
 
 /* simple boot time allocator */
 void *boot_alloc_mem(size_t len) __MALLOC;
diff --git a/kernel/vm/vmm.c b/kernel/vm/vmm.c
index 55e12be8..471b508a 100644
--- a/kernel/vm/vmm.c
+++ b/kernel/vm/vmm.c
@@ -5,13 +5,13 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT
  */
-#include <lk/trace.h>
 #include <assert.h>
-#include <lk/err.h>
-#include <string.h>
-#include <lk/console_cmd.h>
-#include <kernel/vm.h>
 #include <kernel/mutex.h>
+#include <kernel/vm.h>
+#include <lk/console_cmd.h>
+#include <lk/err.h>
+#include <lk/trace.h>
+#include <string.h>
 #include "vm_priv.h"
 
 #define LOCAL_TRACE 0
diff --git a/top/include/lk/console_cmd.h b/top/include/lk/console_cmd.h
index 8763d2b2..fe06540b 100644
--- a/top/include/lk/console_cmd.h
+++ b/top/include/lk/console_cmd.h
@@ -7,10 +7,10 @@
  */
 #pragma once
 
+#include <lk/compiler.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <lk/compiler.h>
 
 /* command args */
 typedef struct {
diff --git a/top/include/lk/debug.h b/top/include/lk/debug.h
index 5644fc68..1484ace5 100644
--- a/top/include/lk/debug.h
+++ b/top/include/lk/debug.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include <lk/compiler.h>
+#include <platform/debug.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <platform/debug.h>
 
 #if !defined(LK_DEBUGLEVEL)
 #define LK_DEBUGLEVEL 0
diff --git a/top/include/lk/list.h b/top/include/lk/list.h
index 12d518ed..adf1417b 100644
--- a/top/include/lk/list.h
+++ b/top/include/lk/list.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <lk/compiler.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 __BEGIN_CDECLS
 
diff --git a/top/include/lk/pow2.h b/top/include/lk/pow2.h
index 832a3551..aacb392a 100644
--- a/top/include/lk/pow2.h
+++ b/top/include/lk/pow2.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include <lk/compiler.h>
-#include <sys/types.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 __BEGIN_CDECLS
 
diff --git a/top/init.c b/top/init.c
index 54217804..50256622 100644
--- a/top/init.c
+++ b/top/init.c
@@ -11,9 +11,9 @@
  * a init hook that is called at increasing init levels as the system is
  * initialized.
  */
-#include <arch/ops.h>
 #include <lk/init.h>
 
+#include <arch/ops.h>
 #include <assert.h>
 #include <lk/compiler.h>
 #include <lk/debug.h>
diff --git a/top/main.c b/top/main.c
index 5cc5e657..d08ed868 100644
--- a/top/main.c
+++ b/top/main.c
@@ -10,19 +10,20 @@
  * Main entry point to the OS. Initializes modules in order and creates
  * the default thread.
  */
-#include <lk/compiler.h>
-#include <lk/debug.h>
-#include <string.h>
+#include <lk/main.h>
+
 #include <app.h>
 #include <arch.h>
-#include <platform.h>
-#include <target.h>
-#include <lib/heap.h>
 #include <kernel/mutex.h>
 #include <kernel/novm.h>
 #include <kernel/thread.h>
+#include <lib/heap.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <lk/init.h>
-#include <lk/main.h>
+#include <platform.h>
+#include <string.h>
+#include <target.h>
 
 /* saved boot arguments from whoever loaded the system */
 ulong lk_boot_args[4];