Index: kernel/generic/include/main/main.h
===================================================================
--- kernel/generic/include/main/main.h	(revision bc18d63b733703c3262a3a720f92513621962cff)
+++ kernel/generic/include/main/main.h	(revision 0d5a50cade5ee95d9afc0d055a94381254bb6e18)
@@ -36,5 +36,10 @@
 #define KERN_MAIN_H_
 
+#include <arch/types.h>
+
 extern uintptr_t stack_safe;
+
+extern void main_bsp(void);
+extern void main_ap(void);
 
 #endif
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision bc18d63b733703c3262a3a720f92513621962cff)
+++ kernel/generic/src/main/main.c	(revision 0d5a50cade5ee95d9afc0d055a94381254bb6e18)
@@ -82,5 +82,5 @@
 #include <smp/smp.h>
 #include <ddi/ddi.h>
-
+#include <main/main.h>
 
 /** Global configuration structure. */
@@ -114,7 +114,4 @@
 /** Lowest safe stack virtual address. */
 uintptr_t stack_safe = 0;		
-
-void main_bsp(void);
-void main_ap(void);
 
 /*