--- xen-unstable-11234/tools/ioemu/usb-linux.c.compile	2006-08-23 16:20:15.000000000 -0400
+++ xen-unstable-11234/tools/ioemu/usb-linux.c	2006-08-23 16:21:25.000000000 -0400
@@ -26,7 +26,6 @@
 #if defined(__linux__)
 #include <dirent.h>
 #include <sys/ioctl.h>
-#include <linux/compiler.h>
 #include <linux/usbdevice_fs.h>
 #include <linux/version.h>
 
--- xen-unstable-11234/tools/blktap/drivers/Makefile.compile	2006-08-23 06:27:06.000000000 -0400
+++ xen-unstable-11234/tools/blktap/drivers/Makefile	2006-08-23 16:16:28.000000000 -0400
@@ -10,12 +10,6 @@
 INSTALL_DIR  = /usr/sbin
 LIBAIO_DIR   = ../../libaio/src
 
-CFLAGS   += -fPIC
-CFLAGS   += -Wall
-CFLAGS   += -Werror
-CFLAGS   += -Wno-unused
-CFLAGS   += -g3
-CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
 CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
 CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--- xen-unstable-11234/Config.mk.compile	2006-08-23 06:27:06.000000000 -0400
+++ xen-unstable-11234/Config.mk	2006-08-23 16:16:28.000000000 -0400
@@ -10,7 +10,7 @@
 
 # Tools to run on system hosting the build
 HOSTCC     = gcc
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
 AS         = $(CROSS_COMPILE)as
 LD         = $(CROSS_COMPILE)ld