5 files changed, 5 insertions, 10 deletions
diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
index adcbcff58a..0b8ed920eb 100644
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -2,10 +2,6 @@ XEN_ROOT=../../..
 include $(XEN_ROOT)/Config.mk
 
 ROOT = $(XEN_ROOT)/xen/include/public
-HOSTCFLAGS += -I$(ROOT)/foreign
-
-MKCHECKER_PY = $(ROOT)/foreign/mkchecker.py
-MKHEADER_PY = $(ROOT)/foreign/mkheader.py
 
 architectures := x86_32 x86_64 ia64
 headers := $(patsubst %, %.h, $(architectures))
@@ -23,17 +19,17 @@ checker: checker.c $(headers)
 
 check-headers: checker
 	./checker > tmp.size
-	diff -u $(ROOT)/foreign/reference.size tmp.size
+	diff -u reference.size tmp.size
 	rm tmp.size
 
-x86_32.h: $(MKHEADER_PY) $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
+x86_32.h: mkheader.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-x86_64.h: $(MKHEADER_PY) $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
+x86_64.h: mkheader.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-ia64.h: $(MKHEADER_PY) $(ROOT)/arch-ia64.h $(ROOT)/xen.h
+ia64.h: mkheader.py $(ROOT)/arch-ia64.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-checker.c: $(MKCHECKER_PY)
+checker.c: mkchecker.py
 	python $< $@ $(architectures)
diff --git a/xen/include/public/foreign/mkchecker.py b/tools/include/xen-foreign/mkchecker.py
index 98f8c2396b..66c17b19e9 100644
--- a/xen/include/public/foreign/mkchecker.py
+++ b/tools/include/xen-foreign/mkchecker.py
@@ -19,7 +19,6 @@ f.write('''
 #include <stdlib.h>
 #include <stddef.h>
 #include <inttypes.h>
-#include "../xen.h"
 ''');
 
 for a in archs:
diff --git a/xen/include/public/foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py
index 3d75a7a4b6..3d75a7a4b6 100644
--- a/xen/include/public/foreign/mkheader.py
+++ b/tools/include/xen-foreign/mkheader.py
diff --git a/xen/include/public/foreign/reference.size b/tools/include/xen-foreign/reference.size
index ead6cd1559..ead6cd1559 100644
--- a/xen/include/public/foreign/reference.size
+++ b/tools/include/xen-foreign/reference.size
diff --git a/xen/include/public/foreign/structs.py b/tools/include/xen-foreign/structs.py
index 7d51ca8b79..7d51ca8b79 100644
--- a/xen/include/public/foreign/structs.py
+++ b/tools/include/xen-foreign/structs.py