diff --git a/src/add-ons/kernel/file_systems/bfs/bfs.h b/src/add-ons/kernel/file_systems/bfs/bfs.h
index 6af8591029..f95081a9f4 100644
--- a/src/add-ons/kernel/file_systems/bfs/bfs.h
+++ b/src/add-ons/kernel/file_systems/bfs/bfs.h
@@ -13,6 +13,10 @@
 #include "system_dependencies.h"
 
 
+#ifdef _BOOT_MODE
+namespace BFS {
+#endif
+
 // ToDo: temporary fix! (missing but public ioctls)
 #define IOCTL_FILE_UNCACHED_IO	10000
 
@@ -364,5 +368,8 @@ small_data::IsLast(const bfs_inode *inode) const
 	return (uint32)this > (uint32)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
 }
 
+#ifdef _BOOT_MODE
+}	// namespace BFS
+#endif
 
 #endif	/* BFS_H */
diff --git a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
index fb18492483..92c1492090 100644
--- a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
+++ b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
@@ -22,6 +22,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <ByteOrder.h>
+
+#ifndef _BOOT_MODE
 #include <fs_attr.h>
 #include <fs_cache.h>
 #include <fs_index.h>
@@ -29,12 +32,12 @@
 #include <fs_interface.h>
 #include <fs_query.h>
 #include <fs_volume.h>
-#include <ByteOrder.h>
 #include <Drivers.h>
 #include <KernelExport.h>
 #include <NodeMonitor.h>
 #include <SupportDefs.h>
 #include <TypeConstants.h>
+#endif	// _BOOT_MODE
 
 #include <util/DoublyLinkedList.h>
 #include <util/kernel_cpp.h>
diff --git a/src/system/boot/loader/file_systems/bfs/Jamfile b/src/system/boot/loader/file_systems/bfs/Jamfile
index 0db7c3ce7d..74839cd936 100644
--- a/src/system/boot/loader/file_systems/bfs/Jamfile
+++ b/src/system/boot/loader/file_systems/bfs/Jamfile
@@ -6,7 +6,10 @@ UsePrivateHeaders kernel storage ;
 
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 
-SubDirC++Flags -fno-rtti ;
+local defines = [ FDefines _BOOT_MODE ] ;
+
+SubDirCcFlags $(defines) ;
+SubDirC++Flags -fno-rtti $(defines) ;
 
 KernelStaticLibrary boot_bfs :
 	bfs.cpp
diff --git a/src/system/boot/loader/file_systems/bfs/Volume.h b/src/system/boot/loader/file_systems/bfs/Volume.h
index af019b9e23..a05e537178 100644
--- a/src/system/boot/loader/file_systems/bfs/Volume.h
+++ b/src/system/boot/loader/file_systems/bfs/Volume.h
@@ -13,10 +13,10 @@ namespace boot {
 }
 
 
-namespace BFS {
-
 #include "bfs.h"
 
+namespace BFS {
+
 class Directory;
 
 class Volume {