Index: 2005-12-16/arch/i386/Makefile
===================================================================
--- 2005-12-16.orig/arch/i386/Makefile	2005-12-20 18:02:37.000000000 +0100
+++ 2005-12-16/arch/i386/Makefile	2005-12-21 16:18:08.168530904 +0100
@@ -103,6 +103,7 @@ drivers-$(CONFIG_PM)			+= arch/i386/powe
 
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)
+CPPFLAGS += $(mflags-y)
 
 boot := arch/i386/boot
 
@@ -110,7 +111,7 @@ boot := arch/i386/boot
 	zdisk bzdisk fdimage fdimage144 fdimage288 install kernel_install
 
 ifdef CONFIG_XEN
-CPPFLAGS        := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE)
+CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o
 boot := arch/i386/boot-xen
 .PHONY: vmlinuz