Index: BOOK/cross-tools/ppc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/cross-tools/ppc64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -140,12 +140,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='do'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/sparc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/cross-tools/sparc64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -91,10 +91,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
-    and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
-
   </sect2>
 
Index: BOOK/cross-tools/x86_64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/cross-tools/x86_64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -136,10 +136,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
-    and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
-
   </sect2>
 
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -140,12 +140,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
   </sect2>
 
Index: BOOK/final-system/ppc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/final-system/ppc64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -149,12 +149,4 @@
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
   </sect2>
 
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -135,12 +135,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 6d5b81a9205312f5f9a90a52c70827d1310b2c50)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision dc398928329ae227cb86a072cf1ed72855a8a2f8)
@@ -156,10 +156,4 @@
 
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
-
- <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
-    and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
 
   </sect2>
