Index: BOOK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/64/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -128,4 +128,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>
 
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/common/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -106,4 +106,8 @@
 <screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
 
+    <para os="y">Finally, move a misplaced file:</para>
+
+<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
+
   </sect2>
 
Index: BOOK/final-system/common/isl.xml
===================================================================
--- BOOK/final-system/common/isl.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/common/isl.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -49,4 +49,8 @@
 <screen os="i"><userinput>make install</userinput></screen>
 
+    <para os="j">Finally, move a misplaced file:</para>
+
+<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
   </sect2>
 
Index: BOOK/final-system/mips/gcc.xml
===================================================================
--- BOOK/final-system/mips/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/mips/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -122,4 +122,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64-64/gcc.xml
===================================================================
--- BOOK/final-system/mips64-64/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/mips64-64/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -128,4 +128,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/mips64/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -129,4 +129,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32
+mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+
   </sect2>
 
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/multilib/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -129,4 +129,10 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <para os="y">Finally, move some misplaced files:</para>
+
+
+<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+
   </sect2>
 
Index: BOOK/final-system/multilib/isl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/isl-64bit.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/multilib/isl-64bit.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -58,4 +58,10 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
+mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
   </sect2>
 
Index: BOOK/final-system/multilib/isl-n32.xml
===================================================================
--- BOOK/final-system/multilib/isl-n32.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/multilib/isl-n32.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -59,4 +59,10 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
+mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
   </sect2>
 
Index: BOOK/final-system/multilib/isl.xml
===================================================================
--- BOOK/final-system/multilib/isl.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/multilib/isl.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -59,4 +59,12 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
Index: BOOK/final-system/ppc/gcc.xml
===================================================================
--- BOOK/final-system/ppc/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/ppc/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -120,4 +120,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>
 
Index: BOOK/final-system/ppc64/gcc.xml
===================================================================
--- BOOK/final-system/ppc64/gcc.xml	(revision cc858edf6c975e5e524cae014296cf65500c7ae1)
+++ BOOK/final-system/ppc64/gcc.xml	(revision e11c91d122d7fc80914288443c12b1a3407cc0de)
@@ -122,4 +122,12 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>
 
