Index: boot/alpha/kernel.xml
===================================================================
--- boot/alpha/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/alpha/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/common/util-linux.xml
===================================================================
--- boot/common/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/common/util-linux.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -38,12 +38,4 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <para os="ba">Util-linux does not use the freshly installed headers and
Index: boot/mips/kernel.xml
===================================================================
--- boot/mips/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/mips/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -34,12 +34,4 @@
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/kernel.xml
===================================================================
--- boot/mips64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/mips64/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/util-linux.xml
===================================================================
--- boot/mips64/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/mips64/util-linux.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -40,18 +40,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
+    href="../../final-system/mips64/util-linux.xml"
     xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
+    href="../../final-system/mips64/util-linux.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='p7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='p8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/multilib/util-linux.xml
===================================================================
--- boot/multilib/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/multilib/util-linux.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -38,12 +38,4 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc/kernel.xml
===================================================================
--- boot/ppc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/ppc/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc64/kernel.xml
===================================================================
--- boot/ppc64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/ppc64/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc/kernel.xml
===================================================================
--- boot/sparc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/sparc/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc64/kernel.xml
===================================================================
--- boot/sparc64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/sparc64/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/x86/kernel.xml
===================================================================
--- boot/x86/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/x86/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -32,12 +32,4 @@
       use the resulting kernel image for production systems.</para>
     </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/x86_64/kernel.xml
===================================================================
--- boot/x86_64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
+++ boot/x86_64/kernel.xml	(revision a9fe0ced3f5cd21805c3eff1bc058302270c3174)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
