Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/introduction/common/changelog.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -48,4 +48,10 @@
           <para>[manuel] - Omit running Bzip2's testsuite as a separate step,
           as make runs it automatically. Ported from LFS-SVN.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updated TCL build to install headers. Thank you Greg Schafer.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updated Expect to use the newly relocated TCL Headers. Thank you Greg Schafer.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/temp-tools/64/expect-64bit.xml
===================================================================
--- BOOK/temp-tools/64/expect-64bit.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/64/expect-64bit.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -35,5 +35,5 @@
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -65,16 +65,4 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
   </sect2>
 
Index: BOOK/temp-tools/64/tcl-64bit.xml
===================================================================
--- BOOK/temp-tools/64/tcl-64bit.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/64/tcl-64bit.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -55,8 +55,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
Index: BOOK/temp-tools/common/expect.xml
===================================================================
--- BOOK/temp-tools/common/expect.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/common/expect.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -43,5 +43,5 @@
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
     <variablelist os="d">
@@ -57,8 +57,8 @@
 
       <varlistentry>
-        <term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
+        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
         <listitem>
-          <para>This explicitly tells Expect where to find Tcl's source
-          directory and internal headers. Using this option avoids conditions
+          <para>This explicitly tells Expect where to find Tcl's internal headers.
+           Using this option avoids conditions
           where <command>configure</command> fails because it cannot
           automatically discover the location of the Tcl source directory.</para>
@@ -104,11 +104,4 @@
 
     </variablelist>
-
-    <para os="k">Now remove the <envar>TCLPATH</envar> variable:</para>
-
-<screen os="l"><userinput>unset TCLPATH</userinput></screen>
-
-    <para os="m">The source directories of both Tcl and Expect can now
-    be removed.</para>
 
   </sect2>
Index: BOOK/temp-tools/common/tcl.xml
===================================================================
--- BOOK/temp-tools/common/tcl.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/common/tcl.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -66,15 +66,7 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <warning os="h">
-      <para><emphasis>Do not</emphasis> remove the <filename
-      class="directory">tcl&tcl-version;</filename> source directory yet,
-      as the next package will need its internal headers.</para>
-    </warning>
+    <para os="i">Now we will install the TCL headers into /tools.</para>
 
-    <para os="i">Set a variable containing the full path of the current directory.
-    The next package, Expect, will use this variable to find Tcl's headers.</para>
-
-<screen os="j"><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
+<screen os="j"><userinput>make install-private-headers</userinput></screen>
 
     <para os="k">Now make a necessary symbolic link:</para>
Index: BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/expect-64bit.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/multilib/expect-64bit.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -35,5 +35,5 @@
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=$TCLPATH \
+   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
 
@@ -66,16 +66,4 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
   </sect2>
 
Index: BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/tcl-64bit.xml	(revision 4cbeff8bf76015259ae728fe16f23a7a90a31a58)
+++ BOOK/temp-tools/multilib/tcl-64bit.xml	(revision b15e6404f1c44c0aa2f921b4252574fda539d1a6)
@@ -56,8 +56,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
