diff --git a/include/sys/vfs.h b/include/sys/vfs.h
index b18c90928a..cc6c3b693f 100644
--- a/include/sys/vfs.h
+++ b/include/sys/vfs.h
@@ -25,11 +25,14 @@
 #ifndef _SPL_ZFS_H
 #define _SPL_ZFS_H
 
-typedef struct vfs {
-	int foo;
-} vfs_t;
+#include <linux/mount.h>
+#include <linux/fs.h>
+#include <linux/dcache.h>
+#include <linux/statfs.h>
+#include <linux/xattr.h>
+#include <linux/security.h>
 
-#define MAXFIDSZ	64
+#define	MAXFIDSZ	64
 
 typedef struct fid {
 	union {
@@ -41,4 +44,7 @@ typedef struct fid {
 	} un;
 } fid_t;
 
+#define	fid_len		un._fid.len
+#define	fid_data	un._fid.data
+
 #endif /* SPL_ZFS_H */