diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
index d5cf1476d1..00a8044302 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
@@ -29,6 +29,7 @@ SimpleTest mkbfs :
 	sl.c
 	sysdep.c
 	rootfs.c
+	errors.cpp
 
 	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
 	BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
@@ -49,7 +50,7 @@ SEARCH on [ FGristFiles
 
 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
+		sysdep.c hexdump.c argv.c errors.cpp
 	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
 
 SEARCH on [ FGristFiles
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/mkbfs.cpp b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/mkbfs.cpp
index 5f325393cb..64a63b55e4 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/mkbfs.cpp
+++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/mkbfs.cpp
@@ -8,6 +8,17 @@
 
 #include "boot_block.h"
 #include "compat.h"
+
+// the definitions in fsproto.h (included by kprotos.h) and fs_interface.h
+// (included by Volume.h) are not compatible
+#define get_vnode _get_vnode
+#define put_vnode _put_vnode
+#define new_vnode _new_vnode
+#define remove_vnode _remove_vnode
+#define unremove_vnode _unremove_vnode
+#define notify_listener _notify_listener
+#define send_notification _send_notification
+
 #include "kprotos.h"
 
 #include <string.h>