diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h
index 8018476358..c5754b120d 100755
--- a/headers/private/kernel/debug.h
+++ b/headers/private/kernel/debug.h
@@ -6,8 +6,7 @@
 #define _KERNEL_DEBUG_H
 
 
-#include <kernel.h>
-#include <arch/smp.h>
+#include <OS.h>
 
 struct kernel_args;
 
@@ -19,7 +18,7 @@ struct kernel_args;
 #	define ASSERT(x) 
 #endif
 
-extern int dbg_register_file[SMP_MAX_CPUS][14];
+extern int dbg_register_file[B_MAX_CPU_COUNT][14];
 	/* XXXmpetit -- must be made generic */
 
 #ifdef __cplusplus
diff --git a/src/kernel/core/debug.c b/src/kernel/core/debug.c
index 145854a020..24dcd24bb8 100644
--- a/src/kernel/core/debug.c
+++ b/src/kernel/core/debug.c
@@ -10,14 +10,11 @@
 ** Distributed under the terms of the NewOS License.
 */
 
-#include <kernel.h>
 #include <debug.h>
 #include <arch/int.h>
 #include <smp.h>
 #include <console.h>
-#include <memheap.h>
 #include <gdb.h>
-#include <Errors.h>
 #include <int.h>
 #include <vm.h>
 
@@ -27,7 +24,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -39,7 +36,7 @@ typedef struct debugger_command {
 	const char *description;
 } debugger_command;
 
-int dbg_register_file[SMP_MAX_CPUS][14];
+int dbg_register_file[B_MAX_CPU_COUNT][14];
 	/* XXXmpetit -- must be made generic */
 
 static bool sSerialDebugEnabled = false;