diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index 2cc28d9ee5..5a971edfe7 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -27,8 +27,8 @@ for subdir in $(subdirs) {
 }
 
 UsePrivateHeaders shared app [ FDirName servers app ] ;
-UsePrivateHeaders kernel ;
-	# for syscalls.h
+UsePrivateHeaders kernel ;	# for syscalls.h
+UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders input ;
 
 # Add subsubdirs to the SEARCH_SOURCE.
@@ -43,8 +43,12 @@ LIBBE_SOURCE =
 	$(STORAGE_KIT_SOURCE)
 ;
 
+LIBBE_SOURCE_HAIKU_ONLY =
+	$(STORAGE_KIT_SOURCE_HAIKU_ONLY)
+;
+
 SharedLibrary be :
-	$(LIBBE_SOURCE)
+	$(LIBBE_SOURCE) $(LIBBE_SOURCE_HAIKU_ONLY)
 ;
 
 SharedLibraryFromObjects openbeos :
diff --git a/src/kits/storage/storage.src b/src/kits/storage/storage.src
index ddbb029239..8f4f6c2a3c 100644
--- a/src/kits/storage/storage.src
+++ b/src/kits/storage/storage.src
@@ -51,3 +51,16 @@ STORAGE_KIT_SOURCE =
 	RPatternList.cpp	
 	Rule.cpp			
 ;
+
+STORAGE_KIT_SOURCE_HAIKU_ONLY =
+	# storage: DiskDevice API
+	DiskDevice.cpp
+	DiskDeviceJob.cpp
+	DiskDevicePrivate.cpp
+	DiskDeviceRoster.cpp
+	DiskDeviceTypes.cpp
+	DiskDeviceVisitor.cpp
+	DiskSystem.cpp
+	Partition.cpp
+	PartitioningInfo.cpp
+;