diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h
index e4f23f41f5..38fc5ca505 100755
--- a/headers/private/kernel/debug.h
+++ b/headers/private/kernel/debug.h
@@ -19,8 +19,14 @@ bool dbg_set_serial_debug(bool new_val);
 bool dbg_get_serial_debug(void);
 int  dprintf(const char *fmt, ...) __PRINTFLIKE(1,2);
 int  panic(const char *fmt, ...) __PRINTFLIKE(1,2);
-void kernel_debugger(void);
-int  dbg_add_command(void (*func)(int, char **), const char *cmd, const char *desc);
+void kernel_debugger(const char *);
+
+/* special return codes for kernel debugger command function*/
+#define  B_KDEBUG_CONT   2
+#define  B_KDEBUG_QUIT   3
+
+int  add_debugger_command(const char * name, int (*func)(int, char **), const char *desc);
+int  remove_debugger_command(const char * name, int (*func)(int, char **));
 
 extern void dbg_save_registers(int *);	/* arch provided */
 
diff --git a/headers/private/kernel/gdb.h b/headers/private/kernel/gdb.h
index a066ffc4c5..66bfc8b572 100755
--- a/headers/private/kernel/gdb.h
+++ b/headers/private/kernel/gdb.h
@@ -5,6 +5,6 @@
 #ifndef _KERNEL_GDB_H
 #define _KERNEL_GDB_H
 
-extern void cmd_gdb(int, char **);
+extern int cmd_gdb(int, char **);
 
 #endif