diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile
index 17c3a87ea8..e55006af16 100644
--- a/src/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/bfs/Jamfile
@@ -15,6 +15,8 @@ oldOPTIM = $(OPTIM) ;
 	# under Dano/Zeta
 	if $(COMPILE_FOR_R5) {
 		defines += COMPILE_FOR_R5 ;
+	} else if $(COMPILE_FOR_ZETA) {
+		defines += COMPILE_FOR_ZETA ;
 	}
 	
 	# Enable OpenBFS to be compiled as a full BFS replacement. Will
@@ -36,7 +38,7 @@ oldOPTIM = $(OPTIM) ;
 	SubDirC++Flags $(defines) -Wall -Wno-multichar ;
 }
 
-UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
+UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 
 R5KernelAddon $(bfsAddOnName) : [ FDirName kernel file_systems ] :
 	BlockAllocator.cpp
diff --git a/src/add-ons/kernel/file_systems/bfs/fsproto.h b/src/add-ons/kernel/file_systems/bfs/fsproto.h
index f86df8abd8..cf6195478f 100644
--- a/src/add-ons/kernel/file_systems/bfs/fsproto.h
+++ b/src/add-ons/kernel/file_systems/bfs/fsproto.h
@@ -60,10 +60,10 @@ typedef ino_t		vnode_id;
 #define		IOCTL_MODIFIED_TIME		10003
 
 
-// B_CUR_FS_API_VERSION is 2 for R5, but 3 on Dano, because of the
-// added calls for power management - so it's set to 3 here because
-// that's a requirement to let Dano boot from our fs...
-#if defined(B_BEOS_VERSION_DANO) && !defined(COMPILE_FOR_R5)
+// B_CUR_FS_API_VERSION is 2 for R5, but 3 on Zeta and Dano, because
+// of the added calls for power management - so it's set to 3 here
+// because that's a requirement to let Dano boot from our fs...
+#ifdef COMPILE_FOR_ZETA
 #	define B_CUR_FS_API_VERSION	3
 #else
 #	define B_CUR_FS_API_VERSION 2