diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.cpp b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
index 40959bc9ce..f1757651db 100644
--- a/src/add-ons/kernel/file_systems/bfs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
@@ -13,6 +13,7 @@
 
 #include <util/kernel_cpp.h>
 #include <KernelExport.h>
+#include <Drivers.h>
 #include <fs_volume.h>
 
 #include <stdlib.h>
@@ -218,7 +219,7 @@ disk_super_block::Initialize(const char *diskName, off_t numBlocks, uint32 block
 //	#pragma mark -
 
 
-Volume::Volume(nspace_id id)
+Volume::Volume(mount_id id)
 	:
 	fID(id),
 	fBlockAllocator(this),
diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.h b/src/add-ons/kernel/file_systems/bfs/Volume.h
index bf34ede1c5..54b79ea397 100644
--- a/src/add-ons/kernel/file_systems/bfs/Volume.h
+++ b/src/add-ons/kernel/file_systems/bfs/Volume.h
@@ -8,12 +8,12 @@
 
 
 #include <KernelExport.h>
+#include <fs_interface.h>
 
 extern "C" {
 	#ifndef _IMPEXP_KERNEL
 	#	define _IMPEXP_KERNEL
 	#endif
-	#include "fsproto.h"
 	#include "lock.h"
 	#include "cache.h"
 }
@@ -37,7 +37,7 @@ enum volume_initialize_flags {
 
 class Volume {
 	public:
-		Volume(nspace_id id);
+		Volume(mount_id id);
 		~Volume();
 
 		status_t			Mount(const char *device, uint32 flags);
@@ -59,7 +59,7 @@ class Volume {
 		vint32				&LogEnd() { return fLogEnd; }
 		int					Device() const { return fDevice; }
 
-		nspace_id			ID() const { return fID; }
+		mount_id			ID() const { return fID; }
 		const char			*Name() const { return fSuperBlock.name; }
 
 		off_t				NumBlocks() const { return fSuperBlock.NumBlocks(); }
@@ -116,7 +116,7 @@ class Volume {
 		uint32				GetUniqueID();
 
 	protected:
-		nspace_id			fID;
+		mount_id			fID;
 		int					fDevice;
 		disk_super_block	fSuperBlock;