diff --git a/src/system/kernel/debug/debug.c b/src/system/kernel/debug/debug.c
index f0155b404a..c6d2e02375 100644
--- a/src/system/kernel/debug/debug.c
+++ b/src/system/kernel/debug/debug.c
@@ -9,11 +9,11 @@
 /* This file contains the debugger */
 
 #include "blue_screen.h"
+#include "gdb.h"
 
 #include <debug.h>
 #include <driver_settings.h>
 #include <frame_buffer_console.h>
-#include <gdb.h>
 #include <int.h>
 #include <smp.h>
 #include <vm.h>
diff --git a/src/system/kernel/debug/gdb.c b/src/system/kernel/debug/gdb.c
index 2e91707773..14baa215fd 100644
--- a/src/system/kernel/debug/gdb.c
+++ b/src/system/kernel/debug/gdb.c
@@ -1,12 +1,14 @@
 /*
- * Copyright 2005, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2002, Manuel J. Petit. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
 
-/* Contains the code to interface with a remote GDB */
+/** Contains the code to interface with a remote GDB */
+
+#include "gdb.h"
 
 #include <string.h>
 #include <stdarg.h>
@@ -14,7 +16,6 @@
 #include <vm.h>
 #include <smp.h>
 #include <debug.h>
-#include <gdb.h>
 #include <arch/debug_console.h>
 
 
@@ -489,6 +490,9 @@ gdb_state_machine(void)
 }
 
 
+//	#pragma mark -
+
+
 int
 cmd_gdb(int argc, char **argv)
 {
diff --git a/headers/private/kernel/gdb.h b/src/system/kernel/debug/gdb.h
similarity index 100%
rename from headers/private/kernel/gdb.h
rename to src/system/kernel/debug/gdb.h