diff -r abbe3df33774 linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h	Tue Nov  8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h	Wed Nov  9 17:08:18 2005
@@ -6,7 +6,10 @@
 #include <asm/page.h>
 #include <linux/config.h>
 #include <linux/compiler.h>
+
+#ifdef CONFIG_SMP_ALTERNATIVES
 #include <asm/smp_alt.h>
+#endif
 
 asmlinkage int printk(const char * fmt, ...)
 	__attribute__ ((format (printf, 1, 2)));
diff -r abbe3df33774 linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Tue Nov  8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Nov  9 17:08:18 2005
@@ -8,7 +8,10 @@
 #include <asm/segment.h>
 #include <asm/cpufeature.h>
 #include <asm/hypervisor.h>
+
+#ifdef CONFIG_SMP_ALTERNATIVES
 #include <asm/smp_alt.h>
+#endif
 
 #ifdef __KERNEL__