diff --git a/src/kits/storage/DiskDevice.cpp b/src/kits/storage/DiskDevice.cpp
index 4d685e0f51..403473440d 100644
--- a/src/kits/storage/DiskDevice.cpp
+++ b/src/kits/storage/DiskDevice.cpp
@@ -14,13 +14,14 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <syscalls.h>
+
 #include <DiskDevice.h>
 #include <DiskDeviceVisitor.h>
 #include <Drivers.h>
 #include <Message.h>
 #include <Path.h>
 
-#include "ddm_userland_interface.h"
 
 /*!	\class BDiskDevice
 	\brief A BDiskDevice object represents a storage device.
diff --git a/src/kits/storage/DiskDeviceJob.cpp b/src/kits/storage/DiskDeviceJob.cpp
index f104b1e3a8..0cbdfb6b45 100644
--- a/src/kits/storage/DiskDeviceJob.cpp
+++ b/src/kits/storage/DiskDeviceJob.cpp
@@ -3,7 +3,8 @@
 //  by the OpenBeOS license.
 //---------------------------------------------------------------------
 
-#include <ddm_userland_interface.h>
+#include <syscalls.h>
+
 #include <DiskDeviceJob.h>
 
 // constructor
diff --git a/src/kits/storage/DiskDeviceRoster.cpp b/src/kits/storage/DiskDeviceRoster.cpp
index 11fbca7896..937eafce55 100644
--- a/src/kits/storage/DiskDeviceRoster.cpp
+++ b/src/kits/storage/DiskDeviceRoster.cpp
@@ -5,6 +5,8 @@
 
 #include <new>
 
+#include <syscalls.h>
+
 #include <Directory.h>
 #include <DiskDevice.h>
 #include <DiskDeviceJob.h>
@@ -18,7 +20,6 @@
 #include <Path.h>
 
 //#include "AddOnImage.h"
-#include "ddm_userland_interface.h"
 
 /*!	\class BDiskDeviceRoster
 	\brief An interface for iterating through the disk devices known to the
diff --git a/src/kits/storage/DiskSystem.cpp b/src/kits/storage/DiskSystem.cpp
index 23fb915bac..5260ef2c23 100644
--- a/src/kits/storage/DiskSystem.cpp
+++ b/src/kits/storage/DiskSystem.cpp
@@ -3,7 +3,8 @@
 //  by the OpenBeOS license.
 //---------------------------------------------------------------------
 
-#include <ddm_userland_interface.h>
+#include <syscalls.h>
+
 #include <DiskSystem.h>
 #include <Partition.h>
 
diff --git a/src/kits/storage/PartitioningInfo.cpp b/src/kits/storage/PartitioningInfo.cpp
index 0f593912ee..b2f6361d5e 100644
--- a/src/kits/storage/PartitioningInfo.cpp
+++ b/src/kits/storage/PartitioningInfo.cpp
@@ -5,7 +5,8 @@
 
 #include <new>
 
-#include <ddm_userland_interface.h>
+#include <syscalls.h>
+
 #include <PartitioningInfo.h>
 
 using namespace std;