Index: cross-tools/alpha/gcc-final.xml
===================================================================
--- cross-tools/alpha/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/alpha/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/mips/gcc-final.xml
===================================================================
--- cross-tools/mips/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/mips/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/mips64-64/gcc-final.xml
===================================================================
--- cross-tools/mips64-64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/mips64-64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/mips64/gcc-final.xml
===================================================================
--- cross-tools/mips64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/mips64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/ppc/gcc-final.xml
===================================================================
--- cross-tools/ppc/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/ppc/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/ppc64/gcc-final.xml
===================================================================
--- cross-tools/ppc64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/ppc64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/sparc/gcc-final.xml
===================================================================
--- cross-tools/sparc/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/sparc/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -32,18 +32,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- cross-tools/sparc64-64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/sparc64-64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -32,18 +32,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/sparc64/gcc-final.xml
===================================================================
--- cross-tools/sparc64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/sparc64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -32,18 +32,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/x86/gcc-final.xml
===================================================================
--- cross-tools/x86/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/x86/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- cross-tools/x86_64-64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/x86_64-64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/x86_64/gcc-final.xml
===================================================================
--- cross-tools/x86_64/gcc-final.xml	(revision f9b3685d0cbd8d2f0332ed5608564fdde8f476cd)
+++ cross-tools/x86_64/gcc-final.xml	(revision 6c605d735392376766805d0e55a2b379d2e19fa2)
@@ -30,12 +30,4 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
