diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile
index 07cf0a58d0..bf5dd0a9b9 100644
--- a/src/system/boot/loader/Jamfile
+++ b/src/system/boot/loader/Jamfile
@@ -19,6 +19,7 @@ UsePrivateHeaders shared storage ;
 
 		BOOT_SUPPORT_FILE_SYSTEM_BFS
 		BOOT_SUPPORT_FILE_SYSTEM_TARFS
+		#BOOT_SUPPORT_FILE_MAP_DISK
 	;
 
 	# Add architecture specific partition/file system modules
@@ -51,7 +52,6 @@ UsePrivateHeaders shared storage ;
 KernelStaticLibrary boot_loader :
 	main.cpp
 	vfs.cpp
-	FileMapDisk.cpp
 	RootFileSystem.cpp
 	partitions.cpp
 	heap.cpp
@@ -77,6 +77,7 @@ KernelStaticLibrary boot_loader :
 # so that only the ones that are used will be included.
 
 KernelStaticLibrary boot_partitions :
+	FileMapDisk.cpp
 	amiga_rdb.cpp
 	apple.cpp
 	efi_gpt.cpp
diff --git a/src/system/boot/loader/partitions.cpp b/src/system/boot/loader/partitions.cpp
index 715e36c6e9..634dc067fe 100644
--- a/src/system/boot/loader/partitions.cpp
+++ b/src/system/boot/loader/partitions.cpp
@@ -222,7 +222,6 @@ Partition::AddChild()
 status_t
 Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
 {
-	static int fileMapDiskDepth = 0;
 	TRACE(("%p Partition::_Mount check for file_system: %s\n",
 		this, module->pretty_name));
 
@@ -237,6 +236,8 @@ Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
 
 		fIsFileSystem = true;
 
+#ifdef BOOT_SUPPORT_FILE_MAP_DISK
+		static int fileMapDiskDepth = 0;
 		// if we aren't already mounting an image
 		if (!fileMapDiskDepth++) {
 			// see if it contains an image file we could mount in turn
@@ -248,6 +249,7 @@ Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
 			}
 		}
 		fileMapDiskDepth--;
+#endif
 
 		return B_OK;
 	}