diff --git a/src/kits/storage/File.cpp b/src/kits/storage/File.cpp
index 34a7525193..59fa910f85 100644
--- a/src/kits/storage/File.cpp
+++ b/src/kits/storage/File.cpp
@@ -7,11 +7,11 @@
 	BFile implementation.
 */
 
-#include <fsproto.h>
 
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
+#include <fs_interface.h>
 
 #include <syscalls.h>
 
@@ -429,7 +429,7 @@ BFile::SetSize(off_t size)
 		return B_BAD_VALUE;
 	struct stat statData;
 	statData.st_size = size;
-	return set_stat(statData, WSTAT_SIZE);
+	return set_stat(statData, FS_WRITE_STAT_SIZE);
 }
 
 // =
diff --git a/src/kits/storage/Statable.cpp b/src/kits/storage/Statable.cpp
index 149c4f5c80..b228f8fe3f 100644
--- a/src/kits/storage/Statable.cpp
+++ b/src/kits/storage/Statable.cpp
@@ -7,14 +7,13 @@
 	BStatable implementation.
 */
 
+#include <fs_interface.h>
 #include <Statable.h>
 #include <Node.h>
 #include <Volume.h>
 
 #include <sys/stat.h>
 
-#include "fsproto.h"
-
 /*!	\fn status_t GetStat(struct stat *st) const
 	\brief Returns the stat stucture for the node.
 	\param st the stat structure to be filled in.
@@ -110,7 +109,7 @@ BStatable::SetOwner(uid_t owner)
 {
 	struct stat statData;
 	statData.st_uid = owner;
-	return set_stat(statData, WSTAT_UID);
+	return set_stat(statData, FS_WRITE_STAT_UID);
 }
 	
 /*!	\brief Returns the group owner of the node.
@@ -138,7 +137,7 @@ BStatable::SetGroup(gid_t group)
 {
 	struct stat statData;
 	statData.st_gid = group;
-	return set_stat(statData, WSTAT_GID);
+	return set_stat(statData, FS_WRITE_STAT_GID);
 }
 	
 /*!	\brief Returns the permissions of the node.
@@ -168,7 +167,7 @@ BStatable::SetPermissions(mode_t perms)
 	// the FS should do the correct masking -- only the S_IUMSK part is
 	// modifiable
 	statData.st_mode = perms;
-	return set_stat(statData, WSTAT_MODE);
+	return set_stat(statData, FS_WRITE_STAT_MODE);
 }
 
 /*!	\brief Get the size of the node's data (not counting attributes).
@@ -212,7 +211,7 @@ BStatable::SetModificationTime(time_t mtime)
 {
 	struct stat statData;
 	statData.st_mtime = mtime;
-	return set_stat(statData, WSTAT_MTIME);
+	return set_stat(statData, FS_WRITE_STAT_MTIME);
 }
 
 /*!	\brief Returns the time the node was created.
@@ -240,7 +239,7 @@ BStatable::SetCreationTime(time_t ctime)
 {
 	struct stat statData;
 	statData.st_crtime = ctime;
-	return set_stat(statData, WSTAT_CRTIME);
+	return set_stat(statData, FS_WRITE_STAT_CRTIME);
 }
 
 /*!	\brief Returns the time the node was accessed.
@@ -270,7 +269,7 @@ BStatable::SetAccessTime(time_t atime)
 {
 	struct stat statData;
 	statData.st_atime = atime;
-	return set_stat(statData, WSTAT_ATIME);
+	return set_stat(statData, FS_WRITE_STAT_ATIME);
 }
 
 /*!	\brief Returns the volume the node lives on.