diff --git a/tools-xc_kexec.diff b/tools-xc_kexec.diff
index ca1495b..bc4f008 100644
--- a/tools-xc_kexec.diff
+++ b/tools-xc_kexec.diff
@@ -3701,7 +3701,7 @@ Index: xen-unstable/tools/xcutils/helper/x86_32/hypercall.h
 ===================================================================
 --- /dev/null
 +++ xen-unstable/tools/xcutils/helper/x86_32/hypercall.h
-@@ -0,0 +1,360 @@
+@@ -0,0 +1,359 @@
 +/******************************************************************************
 + * hypercall.h
 + *
@@ -3737,7 +3737,6 @@ Index: xen-unstable/tools/xcutils/helper/x86_32/hypercall.h
 +#ifndef __HYPERCALL_H__
 +#define __HYPERCALL_H__
 +
-+#include <linux/string.h> /* memcpy() */
 +
 +#define __STR(x) #x
 +#define STR(x) __STR(x)
@@ -4066,7 +4065,7 @@ Index: xen-unstable/tools/xcutils/helper/x86_64/div64.h
 ===================================================================
 --- /dev/null
 +++ xen-unstable/tools/xcutils/helper/x86_64/div64.h
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,57 @@
 +#ifndef _ASM_GENERIC_DIV64_H
 +#define _ASM_GENERIC_DIV64_H
 +/*
@@ -4087,7 +4086,6 @@ Index: xen-unstable/tools/xcutils/helper/x86_64/div64.h
 + */
 +
 +#include <linux/types.h>
-+#include <linux/compiler.h>
 +
 +#if BITS_PER_LONG == 64
 +
@@ -4184,7 +4182,7 @@ Index: xen-unstable/tools/xcutils/helper/x86_64/hypercall.h
 ===================================================================
 --- /dev/null
 +++ xen-unstable/tools/xcutils/helper/x86_64/hypercall.h
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,354 @@
 +/******************************************************************************
 + * hypercall.h
 + *
@@ -4224,7 +4222,6 @@ Index: xen-unstable/tools/xcutils/helper/x86_64/hypercall.h
 +#ifndef __HYPERCALL_H__
 +#define __HYPERCALL_H__
 +
-+#include <linux/string.h> /* memcpy() */
 +
 +#define __STR(x) #x
 +#define STR(x) __STR(x)
diff --git a/xen.changes b/xen.changes
index ef6193f..0b25d76 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  7 08:47:11 CEST 2007 - olh@suse.de
+
+- remove inclusion of linux/compiler.h and linux/string.h
+  remove ExclusiveArch and fix prep section for quilt setup *.spec
+
 -------------------------------------------------------------------
 Thu Aug  2 13:10:36 MDT 2007 - jfehlig@novell.com
 
diff --git a/xen.spec b/xen.spec
index 49131f4..0c08163 100644
--- a/xen.spec
+++ b/xen.spec
@@ -34,7 +34,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  kernel-source kernel-syms xorg-x11
 %endif
 Version:        3.1.0_15042
-Release:        23
+Release:        25
 License:        GPL v2 or later
 Group:          System/Kernel
 Autoreqprov:    on
@@ -163,7 +163,6 @@ Patch211:       32on64-extra-mem.patch
 Patch212:       blktap.patch
 URL:            http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64
 %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
 %if %{?with_kmp}0
 %suse_kernel_module_package -n xen um xen xenpae
@@ -635,12 +634,12 @@ Authors:
 %patch210 -p1
 %patch211 -p1
 %patch212 -p1
+
+%build
 XEN_EXTRAVERSION=%version-%release
 XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
 sed -i "s/XEN_EXTRAVERSION[\t ]*.=.*\$/XEN_EXTRAVERSION  = $XEN_EXTRAVERSION/" xen/Makefile
 sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET     = %{changeset}/" xen/Makefile
-
-%build
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
 export CFLAGS="${RPM_OPT_FLAGS}"
 export RPM_OPT_FLAGS
@@ -946,6 +945,9 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 /sbin/ldconfig
 
 %changelog
+* Tue Aug 07 2007 - olh@suse.de
+- remove inclusion of linux/compiler.h and linux/string.h
+  remove ExclusiveArch and fix prep section for quilt setup *.spec
 * Thu Aug 02 2007 - jfehlig@novell.com
 - Added patch to fix/cleanup destoryDevice code path in xend.
   Patch was submitted upstream.  Aids in fixing several bugs, e.g.