Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision e08162be96bc4ff41d0a733317b13d516f1e1b6d)
+++ kernel/arch/amd64/src/interrupt.c	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -45,5 +45,4 @@
 #include <mm/as.h>
 #include <arch.h>
-#include <arch/asm.h>
 #include <proc/scheduler.h>
 #include <proc/thread.h>
Index: kernel/arch/amd64/src/syscall.c
===================================================================
--- kernel/arch/amd64/src/syscall.c	(revision e08162be96bc4ff41d0a733317b13d516f1e1b6d)
+++ kernel/arch/amd64/src/syscall.c	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -41,5 +41,4 @@
 
 #include <print.h>
-#include <arch/cpu.h>
 
 extern void syscall_entry(void);
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision e08162be96bc4ff41d0a733317b13d516f1e1b6d)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 5823f4dafdc6e95ad32a5172bfc2a5313cef59d7)
@@ -50,5 +50,4 @@
 #include <arch/cpuid.h>
 #include <arch.h>
-#include <time/delay.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>