diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index 7f50939d24..6af18fb1c6 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -6,7 +6,6 @@
 
 
 #include "Debug.h"
-#include "cpp.h"
 #include "Volume.h"
 #include "Inode.h"
 #include "Index.h"
@@ -14,6 +13,8 @@
 #include "Query.h"
 #include "bfs_control.h"
 
+#include <kernel_cpp.h>
+
 #include <string.h>
 #include <stdio.h>
 
@@ -222,29 +223,12 @@ vnode_ops fs_entry =  {
 
 int32	api_version = B_CUR_FS_API_VERSION;
 
-#ifdef DEBUG
-//#warn Don't mount more than once... would register twice the debugger commands!
-int db_obfsinode(int argc, char **argv)
-{
-	Inode *ino;
-	if (argc < 2) {
-		kprintf("usage: obfsinode ptr\n");
-		return 0;
-	}
-	ino = (Inode *)parse_expression(argv[1]);
-	ino->KDumpMe();
-	return 0;
-}
-#endif
 
 static int
 bfs_mount(nspace_id nsid, const char *device, ulong flags, void *parms,
 		size_t len, void **data, vnode_id *rootID)
 {
 	FUNCTION();
-#ifdef DEBUG
-	add_debugger_command("obfsinode", db_obfsinode, "dump an OpenBFS Inode");
-#endif
 
 	Volume *volume = new Volume(nsid);
 	if (volume == NULL)
@@ -256,6 +240,10 @@ bfs_mount(nspace_id nsid, const char *device, ulong flags, void *parms,
 		*rootID = volume->ToVnode(volume->Root());
 		INFORM(("mounted \"%s\" (root node at %Ld, device = %s)\n",
 			volume->Name(), *rootID, device));
+
+#ifdef DEBUG
+		add_debugger_commands();
+#endif
 	}
 	else
 		delete volume;
@@ -274,7 +262,7 @@ bfs_unmount(void *ns)
 	delete volume;
 
 #ifdef DEBUG
-	remove_debugger_command("obfsinode", db_obfsinode);
+	remove_debugger_commands();
 #endif
 	RETURN_ERROR(status);
 }