Index: LVM2.2.02.111/lib/device/dev-io.c
===================================================================
--- LVM2.2.02.111.orig/lib/device/dev-io.c
+++ LVM2.2.02.111/lib/device/dev-io.c
@@ -30,6 +30,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: LVM2.2.02.111/lib/filters/filter-type.c
===================================================================
--- LVM2.2.02.111.orig/lib/filters/filter-type.c
+++ LVM2.2.02.111/lib/filters/filter-type.c
@@ -13,6 +13,7 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <sys/ioctl.h>
+#define _LINUX_AUDIT_H_
 #include <linux/fs.h>
 #undef MAJOR
 #undef MINOR