diff --git a/headers/private/kernel/arch/x86/arch_stage2.h b/headers/private/kernel/arch/x86/arch_stage2.h
index 813816f0d5..1d65f16f64 100644
--- a/headers/private/kernel/arch/x86/arch_stage2.h
+++ b/headers/private/kernel/arch/x86/arch_stage2.h
@@ -5,7 +5,7 @@
 #ifndef _KERNEL_ARCH_x86_STAGE2_H
 #define _KERNEL_ARCH_x86_STAGE2_H
 
-#include <stage2_struct.h>
+#include <boot/stage2_struct.h>
 
 #define MAX_BOOT_PTABLES 4
 
diff --git a/headers/private/kernel/arch/x86/console_dev.h b/headers/private/kernel/arch/x86/console_dev.h
index 7ff9c3e9dc..fd81b979eb 100755
--- a/headers/private/kernel/arch/x86/console_dev.h
+++ b/headers/private/kernel/arch/x86/console_dev.h
@@ -5,9 +5,9 @@
 #ifndef _CONSOLE_DEV_H
 #define _CONSOLE_DEV_H
 
-#include <stage2.h>
+struct kernel_args;
 
-int console_dev_init(kernel_args *ka);
+int console_dev_init(struct kernel_args *ka);
 
 enum {
 	CONSOLE_OP_WRITEXY = 2376
diff --git a/headers/private/kernel/arch/x86/keyboard.h b/headers/private/kernel/arch/x86/keyboard.h
deleted file mode 100755
index 0943d903ef..0000000000
--- a/headers/private/kernel/arch/x86/keyboard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _KEYBOARD_H
-#define _KEYBOARD_H
-
-#include <stage2.h>
-
-int keyboard_dev_init(kernel_args *ka);
-
-#endif
-
diff --git a/headers/private/kernel/arch/x86/smp_priv.h b/headers/private/kernel/arch/x86/smp_priv.h
index 41e11c7794..fcd90c9f90 100755
--- a/headers/private/kernel/arch/x86/smp_priv.h
+++ b/headers/private/kernel/arch/x86/smp_priv.h
@@ -5,10 +5,11 @@
 #ifndef _KERNEL_ARCH_x86_SMP_PRIV_H
 #define _KERNEL_ARCH_x86_SMP_PRIV_H
 
+#include <ktypes.h>
+
 int i386_smp_interrupt(int vector);
 void arch_smp_ack_interrupt(void);
 int arch_smp_set_apic_timer(bigtime_t relative_timeout);
 int arch_smp_clear_apic_timer(void);
-int smp_intercpu_int_handler(void);
 
 #endif	/* _KERNEL_ARCH_x86_SMP_PRIV_H */
diff --git a/headers/private/kernel/arch/x86/stage2_priv.h b/headers/private/kernel/arch/x86/stage2_priv.h
index 84b92051cf..72d03a6ea9 100755
--- a/headers/private/kernel/arch/x86/stage2_priv.h
+++ b/headers/private/kernel/arch/x86/stage2_priv.h
@@ -5,7 +5,7 @@
 #ifndef _STAGE2_PRIV_H
 #define _STAGE2_PRIV_H
 
-#include <stage2.h>
+#include <boot/stage2.h>
 #include <ktypes.h>
 
 extern void _start(uint32 mem, int in_vesa, uint32 vesa_ptr);