3 files changed, 17 insertions, 11 deletions
diff --git a/include/fuse.h b/include/fuse.h
index 46fc87b..451e163 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -13,9 +13,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <utime.h>
 
+#include "fusestat.h"
 /* ----------------------------------------------------------- *
  * Basic FUSE API                                              *
  * ----------------------------------------------------------- */
@@ -82,7 +82,7 @@ struct fuse_operations {
     int (*open)     (const char *, int);
     int (*read)     (const char *, char *, size_t, off_t);
     int (*write)    (const char *, const char *, size_t, off_t);
-    int (*statfs)   (struct statfs *);
+    int (*statfs)   (struct fuse_statfs *);
 };
 
 /** Extra context that may be needed by some filesystems */
diff --git a/include/fusestat.h b/include/fusestat.h
new file mode 100644
index 0000000..a18509c
--- /dev/null
+++ b/include/fusestat.h
@@ -0,0 +1,14 @@
+#ifndef __FUSESTAT_H_
+#define __FUSESTAT_H_
+/* this is seperated out into its own file because both
+ * kernel and lib use it, but neither can #include the
+ * other's headerfile */
+typedef struct fuse_statfs {
+    long block_size;
+    long blocks;
+    long blocks_free;
+    long files;
+    long files_free;
+    long namelen;
+} fuse_statfs_t;
+#endif
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 40f3950..539ebce 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -8,6 +8,7 @@
 
 /* This file defines the kernel interface of FUSE */
 
+#include "fusestat.h"
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 2
 
@@ -157,15 +158,6 @@ struct fuse_write_in {
 	char buf[0];
 };
 
-typedef struct fuse_statfs {
-	long block_size;
-	long blocks;
-	long blocks_free;
-	long files;
-	long files_free;
-	long namelen;
-} fuse_statfs_t;
-
 struct fuse_statfs_out {
 	struct fuse_statfs st;
 };