Index: cross-tools/alpha/gcc-final.xml
===================================================================
--- cross-tools/alpha/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/alpha/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: cross-tools/mips/gcc-final.xml
===================================================================
--- cross-tools/mips/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/mips/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -72,12 +72,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: cross-tools/mips64-64/gcc-final.xml
===================================================================
--- cross-tools/mips64-64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/mips64-64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -78,12 +78,4 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/mips64/gcc-final.xml
===================================================================
--- cross-tools/mips64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/mips64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -72,9 +72,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
+    href="../x86_64/gcc-final.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
+    href="../x86_64/gcc-final.xml"
     xpointer="xpointer(//*[@os='be'])"/>
 
Index: cross-tools/ppc/gcc-final.xml
===================================================================
--- cross-tools/ppc/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/ppc/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- cross-tools/sparc64-64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/sparc64-64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: cross-tools/sparc64/gcc-final.xml
===================================================================
--- cross-tools/sparc64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/sparc64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -64,9 +64,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
+    href="../x86_64/gcc-final.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
+    href="../x86_64/gcc-final.xml"
     xpointer="xpointer(//*[@os='be'])"/>
 
Index: cross-tools/x86/gcc-static.xml
===================================================================
--- cross-tools/x86/gcc-static.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/x86/gcc-static.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -48,6 +48,6 @@
 #define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/linux.h</userinput></screen>
 
-    <para os="ai">Now we will change <command>gcc</command>'s search path to look
-    into <filename class="directory">/tools</filename> only:</para>
+    <para os="ai">Now we will alter <command>gcc</command>'s c preprocessors default
+    include search path to use <filename class="directory">/tools</filename> only:</para>
 
 <screen os="aj"><userinput>cp gcc/Makefile.in{,.orig}
Index: cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- cross-tools/x86_64-64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/x86_64-64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: cross-tools/x86_64/gcc-final.xml
===================================================================
--- cross-tools/x86_64/gcc-final.xml	(revision 93d0ea2cff3c09e165018785bd436d53ffa94fc0)
+++ cross-tools/x86_64/gcc-final.xml	(revision 4c2d76e4ca00090b1faacfe18e54a7b710142e68)
@@ -63,11 +63,9 @@
     xpointer="xpointer(//*[@os='aj'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
+    <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
+    so it doesn't pick up the host's header files:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
+<screen os="be"><userinput>cp configure{,.orig}
+sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
