diff --git a/headers/os/kernel/fs_interface.h b/headers/os/kernel/fs_interface.h
index 65e3601b9c..af576c3b83 100644
--- a/headers/os/kernel/fs_interface.h
+++ b/headers/os/kernel/fs_interface.h
@@ -13,6 +13,8 @@ struct dirent;
 struct stat;
 struct fs_info;
 
+typedef dev_t mount_id;
+typedef ino_t vnode_id;
 
 /* the file system's private data structures */
 typedef void *fs_volume;
@@ -40,7 +42,7 @@ extern "C" {
 
 struct fs_calls {
 	/* general operations */
-	status_t (*mount)(fs_id id, const char *device, void *args, fs_volume *_fs, vnode_id *_rootVnodeID);
+	status_t (*mount)(mount_id id, const char *device, void *args, fs_volume *_fs, vnode_id *_rootVnodeID);
 	status_t (*unmount)(fs_volume fs);
 
 	status_t (*read_fs_info)(fs_volume fs, struct fs_info *info);
diff --git a/headers/private/kernel/ktypes.h b/headers/private/kernel/ktypes.h
index 68d66c4ce2..c0e7141df6 100755
--- a/headers/private/kernel/ktypes.h
+++ b/headers/private/kernel/ktypes.h
@@ -9,7 +9,6 @@
 extern "C" {
 #endif
 
-//#include <types.h>
 #include <SupportDefs.h>
 
 typedef uint16 mode_t;
@@ -23,12 +22,9 @@ typedef int32  port_id;
 typedef int32  image_id;
 typedef uint32 dev_t;
 typedef uint64 ino_t;
-typedef uint64 vnode_id;
-typedef uint32 fs_id;
 typedef uint16 nlink_t;
 typedef uint32 uid_t;
 typedef uint32 gid_t;
-//typedef int32 status_t;
 
 
 #ifndef NULL
@@ -57,21 +53,10 @@ typedef unsigned short          u_short;
 typedef unsigned int            u_int;
 typedef unsigned long           u_long;
 
-//typedef unsigned char           uchar;
-//typedef unsigned short          ushort; 
-//typedef unsigned int            uint;
-//typedef unsigned long           ulong;
-
 typedef unsigned long			addr;
 
-// Handled in arch_ktypes.h
-
-//typedef unsigned long addr;
-
-//typedef uint32                  socklen_t;
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif	/* _KERNEL_KTYPES_H */
diff --git a/headers/private/kernel/vfs.h b/headers/private/kernel/vfs.h
index e50a75ba6d..cea1472f19 100755
--- a/headers/private/kernel/vfs.h
+++ b/headers/private/kernel/vfs.h
@@ -41,9 +41,9 @@ int vfs_setrlimit(int resource, const struct rlimit * rlp);
 image_id vfs_load_fs_module(const char *path);
 
 /* calls needed by fs internals */
-int vfs_get_vnode(fs_id fsid, vnode_id vnid, fs_vnode *v);
-int vfs_put_vnode(fs_id fsid, vnode_id vnid);
-int vfs_remove_vnode(fs_id fsid, vnode_id vnid);
+int vfs_get_vnode(mount_id mountID, vnode_id vnodeID, fs_vnode *v);
+int vfs_put_vnode(mount_id mountID, vnode_id vnodeID);
+int vfs_remove_vnode(mount_id mountID, vnode_id vnodeID);
 
 /* calls needed by the VM for paging */
 int vfs_get_vnode_from_fd(int fd, bool kernel, void **vnode);