Index: lib/device/dev-io.c
===================================================================
--- lib/device/dev-io.c.orig	2009-05-20 19:09:49.000000000 +0800
+++ lib/device/dev-io.c	2010-02-04 11:00:22.000000000 +0800
@@ -31,6 +31,7 @@
 #  define u64 uint64_t		/* Missing without __KERNEL__ */
 #  undef WNOHANG		/* Avoid redefinition */
 #  undef WUNTRACED		/* Avoid redefinition */
+#  define _LINUX_AUDIT_H_	/* Avoid inclusion */
 #  include <linux/fs.h>		/* For block ioctl definitions */
 #  define BLKSIZE_SHIFT SECTOR_SHIFT
 #  ifndef BLKGETSIZE64		/* fs.h out-of-date */
Index: lib/filters/filter.c
===================================================================
--- lib/filters/filter.c.orig	2010-02-04 11:00:18.000000000 +0800
+++ lib/filters/filter.c	2010-02-04 11:00:22.000000000 +0800
@@ -14,6 +14,7 @@
  */
 
 #include <sys/ioctl.h>
+#define _LINUX_AUDIT_H_
 #include <linux/fs.h>
 #undef MAJOR
 #undef MINOR