6 files changed, 16 insertions, 4 deletions
diff --git a/tools/libxl/external/README b/tools/include/xen-external/README
index 8c8beea3f9..93c2bc9cd8 100644
--- a/tools/libxl/external/README
+++ b/tools/include/xen-external/README
@@ -1,5 +1,5 @@
-WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY (apart from this README)
------------------------------------------------------------------------
+WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY
+----------------------------------------------
 
 These files were obtained elsewhere and should only be updated by
 copying new versions from the source location, as documented below:
@@ -12,3 +12,13 @@ bsd-queue.3
     svn co -r 221843 svn://svn.freebsd.org/base/head/sys/sys/
     svn co -r 221843 svn://svn.freebsd.org/base/head/share/man/man3
     svn cat -r 221843 http://svn.freebsd.org/base/head/COPYRIGHT >tools/libxl/external/bsd-COPYRIGHT
+
+Exceptions:
+
+README
+
+  This file
+
+bsd-sys-queue-h-seddery
+
+  Script to transform the above into a new namespace.
diff --git a/tools/libxl/external/bsd-COPYRIGHT b/tools/include/xen-external/bsd-COPYRIGHT
index 6dc5d16b46..6dc5d16b46 100644
--- a/tools/libxl/external/bsd-COPYRIGHT
+++ b/tools/include/xen-external/bsd-COPYRIGHT
diff --git a/tools/libxl/external/bsd-queue.3 b/tools/include/xen-external/bsd-queue.3
index 007ca5c629..007ca5c629 100644
--- a/tools/libxl/external/bsd-queue.3
+++ b/tools/include/xen-external/bsd-queue.3
diff --git a/tools/libxl/bsd-sys-queue-h-seddery b/tools/include/xen-external/bsd-sys-queue-h-seddery
index c0aa079cbe..7a957e3a10 100755
--- a/tools/libxl/bsd-sys-queue-h-seddery
+++ b/tools/include/xen-external/bsd-sys-queue-h-seddery
@@ -68,3 +68,5 @@ s/\b(
 s/\b struct \s+ type \b/type/xg;
 
 s,^\#include.*sys/cdefs.*,/* $& */,xg;
+
+s/\b( NULL )/0/xg;
diff --git a/tools/libxl/external/bsd-sys-queue.h b/tools/include/xen-external/bsd-sys-queue.h
index 274e636c53..274e636c53 100644
--- a/tools/libxl/external/bsd-sys-queue.h
+++ b/tools/include/xen-external/bsd-sys-queue.h
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index b58c43ecb7..d0b6fda277 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -93,8 +93,8 @@ _libxl_paths.h: genpath
 	rm -f $@.tmp
 	$(call move-if-changed,$@.2.tmp,$@)
 
-_libxl_list.h: bsd-sys-queue-h-seddery external/bsd-sys-queue.h
-	perl ./$^ --prefix=libxl >$@.new
+_libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h
+	perl $^ --prefix=libxl >$@.new
 	$(call move-if-changed,$@.new,$@)
 
 libxl_paths.c: _libxl_paths.h