diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Debug.h b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Debug.h
index ba3e8492e9..938f40a500 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Debug.h
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Debug.h
@@ -50,9 +50,9 @@
 //	D()
 //		the statements in D() are only included if DEBUG is defined
 
-	#include <KernelExport.h>
-	#define kprintf printf
-	#define dprintf printf
+#include <KernelExport.h>
+#define kprintf printf
+#define dprintf printf
 
 #ifdef DEBUG
 	#define PRINT(x) { __out("bfs: "); __out x; }
@@ -95,6 +95,9 @@
 	extern void dump_bplustree_header(bplustree_header *header);
 	extern void dump_bplustree_node(bplustree_node *node,bplustree_header *header = NULL,Volume *volume = NULL);
 	extern void dump_block(const char *buffer, int size);
+
+	extern void add_debugger_commands();
+	extern void remove_debugger_commands();
 #endif
 
 #endif	/* DEBUG_H */
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
index 07ebd752fb..6c29de138a 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -3,6 +3,7 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems bfs bfs_shell ;
 SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
 
+UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
 
 {
 	# set CHECK_MALLOC to something when doing tests against memory corruption
@@ -20,14 +21,13 @@ SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti $(malloc_debug_flags) ;
 }
 
-SimpleTest bfs_shell
-	:
+SimpleTest bfs_shell :
 	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
 	sysdep.c hexdump.c argv.c
 
 	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
 	BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
-	Debug.cpp cpp.cpp
+	Debug.cpp kernel_cpp.cpp
 	:
 	;
 
@@ -38,6 +38,10 @@ SEARCH on [ FGristFiles
 		Debug.cpp cpp.cpp
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;
 
+SEARCH on [ FGristFiles
+		kernel_cpp.cpp
+	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+
 SEARCH on [ FGristFiles
 		fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
 		sysdep.c hexdump.c argv.c