Index: lib/device/dev-io.c
===================================================================
--- lib/device/dev-io.c.orig	2009-04-27 16:15:42.000000000 +0800
+++ lib/device/dev-io.c	2009-04-27 16:15:49.000000000 +0800
@@ -32,7 +32,7 @@
 #  undef WNOHANG		/* Avoid redefinition */
 #  undef WUNTRACED		/* Avoid redefinition */
 #  define _LINUX_AUDIT_H_	/* Avoid inclusion */
-#  include <linux/fs.h>		/* For block ioctl definitions */
+#  include <sys/mount.h>        /* For block ioctl definitions */
 #  define BLKSIZE_SHIFT SECTOR_SHIFT
 #  ifndef BLKGETSIZE64		/* fs.h out-of-date */
 #    define BLKGETSIZE64 _IOR(0x12, 114, size_t)
Index: lib/filters/filter.c
===================================================================
--- lib/filters/filter.c.orig	2009-04-27 16:15:42.000000000 +0800
+++ lib/filters/filter.c	2009-04-27 16:15:49.000000000 +0800
@@ -15,7 +15,7 @@
 
 #include <sys/ioctl.h>
 #define _LINUX_AUDIT_H_
-#include <linux/fs.h>
+#include <sys/mount.h>
 #undef MAJOR
 #undef MINOR
 #undef MKDEV