diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h
index ba99ec2fa5..c5d7a1228a 100755
--- a/headers/private/kernel/debug.h
+++ b/headers/private/kernel/debug.h
@@ -7,23 +7,18 @@
 
 
 #include <kernel.h>
-
+#include <arch/smp.h>
 
 struct kernel_args;
 
-extern int dbg_register_file[2][14]; /* XXXmpetit -- must be made generic */
+
+extern int dbg_register_file[SMP_MAX_CPUS][14];
+	/* XXXmpetit -- must be made generic */
 
 int  dbg_init(struct kernel_args *ka);
 int  dbg_init2(struct kernel_args *ka);
 char dbg_putch(char c);
 void dbg_puts(const char *s);
-bool dbg_set_serial_debug(bool new_val);
-bool dbg_get_serial_debug(void);
-
-/* special return codes for kernel debugger command function*/
-#define  B_KDEBUG_CONT   2
-#define  B_KDEBUG_QUIT   3
-
 
 #if DEBUG 
 #	define ASSERT(x) \