Index: BOOK/cross-tools/alpha-chapter.xml
===================================================================
--- BOOK/cross-tools/alpha-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/alpha-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc-headers.xml"/>
Index: OK/cross-tools/alpha/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-alpha /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/mips-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
Index: BOOK/cross-tools/mips/linux-headers.xml
===================================================================
--- BOOK/cross-tools/mips/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/mips/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-mips /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/mips/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/mips/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='md'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-mips /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/mips64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc-static.xml"/>
Index: OK/cross-tools/mips64-64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/mips64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='md'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-mips /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/mips64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc-static.xml"/>
Index: OK/cross-tools/mips64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/mips64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='md'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-mips /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/ppc-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/ppc-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc-static.xml"/>
Index: BOOK/cross-tools/ppc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/ppc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/ppc/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-ppc /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/ppc/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-ppc /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/ppc64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-headers.xml"/>
Index: BOOK/cross-tools/ppc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/ppc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux--Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/ppc64/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-powerpc /tools/include/
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/ppc64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/ppc64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-ppc /tools/include/
-cp -Rv include/asm-ppc64 /tools/include/
-cp -Rv include/asm-ppc-biarch /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/sparc-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/sparc-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>
Index: BOOK/cross-tools/sparc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/sparc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-sparc /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/sparc/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-sparc /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/sparc64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-static.xml"/>
Index: BOOK/cross-tools/sparc64-64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/sparc64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-sparc64 /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/sparc64-64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-sparc64 /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/sparc64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-static.xml"/>
Index: BOOK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/sparc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc64/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-sparc64 /tools/include/
+cp -Rv include/asm-sparc /tools/include/
+cp -Rv include/asm-sparc-biarch /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/sparc64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-sparc64 /tools/include/
-cp -Rv include/asm-sparc /tools/include/
-cp -Rv include/asm-sparc-biarch /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/x86-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-static.xml"/>
Index: BOOK/cross-tools/x86/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/x86/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-i386 /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/x86/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-i386 /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/x86_64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-static.xml"/>
Index: BOOK/cross-tools/x86_64-64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/x86_64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-x86_64 /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/x86_64-64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-x86_64 /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/cross-tools/x86_64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
Index: BOOK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/cross-tools/x86_64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-cross-tools-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /tools/include
+cp -Rv include/asm-i386 /tools/include/
+cp -Rv include/asm-x86_64 /tools/include/
+cp -Rv include/asm-x86_64-biarch /tools/include/asm
+cp -Rv include/linux /tools/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-linux-headers" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/cross-tools/x86_64/linux-libc-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para>Install the header files:</para>
-
-<screen><userinput>install -dv /tools/include
-cp -Rv include/asm-i386 /tools/include/
-cp -Rv include/asm-x86_64 /tools/include/
-cp -Rv include/asm-x86_64-biarch /tools/include/asm
-cp -Rv include/linux /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-libc-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/alpha-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
Index: BOOK/final-system/alpha/linux-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/alpha/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-alpha/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -ar include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-alpha/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/mips-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/adjusting.xml"/>
Index: BOOK/final-system/mips/linux-headers.xml
===================================================================
--- BOOK/final-system/mips/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/mips/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="mf"><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-mips/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -ar include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/mips/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/mips/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="ma">The following patch adds NPTL support:</para>
-
-<screen os="mb"><userinput>patch -Np1 -i ../&linux-libc-headers-mips_tls-patch;</userinput></screen>
-
-    <para os="mc">The following patch fixes a compile issue with sysklogd:</para>
-
-<screen os="md"><userinput>patch -Np1 -i ../&linux-libc-headers-mips_atomic_fix-patch;</userinput></screen>
-
-    <para os="me">Install the header files:</para>
-
-<screen os="mf"><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-mips/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/adjusting.xml"/>
Index: OK/final-system/mips64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/mips64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='md'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='me'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/mips64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-n32.xml"/>
Index: OK/final-system/mips64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/mips64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='md'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='me'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='mf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/ppc-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/adjusting.xml"/>
Index: BOOK/final-system/ppc/linux-headers.xml
===================================================================
--- BOOK/final-system/ppc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/ppc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-ppc/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -ar include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/ppc/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-ppc/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/ppc64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/adjusting.xml"/>
Index: BOOK/final-system/ppc64/linux-headers.xml
===================================================================
--- BOOK/final-system/ppc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/ppc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-powerpc/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -ar include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/ppc64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/ppc64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="aa">The following patch contains header stubs which link to the
-    proper header from either asm-ppc or asm-ppc64:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&linux-libc-headers-ppc_biarch-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi}
-cp -av include/asm-ppc/* /usr/include/asm-ppc
-cp -av include/asm-ppc64/* /usr/include/asm-ppc64
-cp -av include/asm-ppc-biarch/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>find /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/sparc-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
Index: BOOK/final-system/sparc/linux-headers.xml
===================================================================
--- BOOK/final-system/sparc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/sparc/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-sparc/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -ar include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para os="s1">The following patch fixes build issues with Silo and other programs:</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-sparc/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
Index: BOOK/final-system/sparc64-64/linux-headers.xml
===================================================================
--- BOOK/final-system/sparc64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/sparc64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
+cp -av include/asm-sparc64/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -av include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-sparc64/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/sparc64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
Index: BOOK/final-system/sparc64/linux-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/sparc64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,asm-sparc64,asm-sparc,linux,mtd,net,scsi,sound}
+cp -av include/asm-sparc64/* /usr/include/asm-sparc64
+cp -av include/asm-sparc/* /usr/include/asm-sparc
+cp -av include/asm-sparc-biarch/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -av include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi}</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen><userinput>find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para os="ba">The following patch contains header stubs which link to the
-    proper header from either asm-sparc or asm-sparc64:</para>
-
-<screen os="bb"><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,asm-sparc64,asm-sparc,linux,mtd,scsi}
-cp -av include/asm-sparc64/* /usr/include/asm-sparc64
-cp -av include/asm-sparc/* /usr/include/asm-sparc
-cp -av include/asm-sparc-biarch/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/x86-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
Index: BOOK/final-system/x86/linux-headers.xml
===================================================================
--- BOOK/final-system/x86/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/x86/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Linux Headers package contains the
+    <quote>sanitized</quote> kernel headers.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Coreutils and Findutils</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Headers</title>
+
+    <para os="a">For years it has been common practice to use <quote>raw</quote>
+    kernel headers (straight from a kernel tarball) in <filename
+    class="directory">/usr/include</filename>, but over the last few
+    years, the kernel developers have taken a strong stance that this
+    should not be done. This gave birth to the Linux-LLH-Headers Project,
+    which was designed to maintain an API stable version of the Linux
+    headers. But recently this project stopped producing updates. Cross-LFS
+    decided to come up with our own santized headers and placed them in
+    the book.</para>
+
+    <para os="b">Install the header files:</para>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
+cp -av include/asm-i386/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -av include/sound/* /usr/include/sound</userinput></screen>
+
+    <para os="c">Ensure that all the headers are owned by
+    <systemitem class="username">root</systemitem>:</para>
+
+<screen os="d"><userinput>chown -Rv root:root /usr/include/{asm,linux,mtd,net,scsi,sound}</userinput></screen>
+
+    <para os="e">Make sure the users can read the headers:</para>
+
+<screen os="f"><userinput>find /usr/include/{asm,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-linux-headers" role="content">
+    <title>Contents of Linux-Headers</title>
+
+    <segmentedlist>
+      <segtitle>Installed headers</segtitle>
+
+      <seglistitem>
+        <seg>/usr/include/{asm,linux}/*.h</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="linux-headers">
+        <term><filename
+        class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
+        <listitem>
+          <para>The Linux API headers</para>
+          <indexterm zone="ch-system-linux-headers linux-headers">
+            <primary
+            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/x86/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Linux-Libc-Headers package contains the
-    <quote>sanitized</quote> kernel headers.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Coreutils and Findutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <para os="a">For years it has been common practice to use <quote>raw</quote>
-    kernel headers (straight from a kernel tarball) in <filename
-    class="directory">/usr/include</filename>, but over the last few
-    years, the kernel developers have taken a strong stance that this
-    should not be done. This gave birth to the Linux-Libc-Headers Project,
-    which was designed to maintain an API stable version of the Linux
-    headers.</para>
-
-    <para os="b">Install the header files:</para>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-i386/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <para os="c">Ensure that all the headers are owned by
-    <systemitem class="username">root</systemitem>:</para>
-
-<screen os="d"><userinput>chown -Rv root:root /usr/include/{asm,linux,mtd,scsi}</userinput></screen>
-
-    <para os="e">Make sure the users can read the headers:</para>
-
-<screen os="f"><userinput>find /usr/include/{asm,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-linux-libc-headers" role="content">
-    <title>Contents of Linux-Libc-Headers</title>
-
-    <segmentedlist>
-      <segtitle>Installed headers</segtitle>
-
-      <seglistitem>
-        <seg>/usr/include/{asm,linux}/*.h</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="linux-libc-headers">
-        <term><filename
-        class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
-        <listitem>
-          <para>The Linux API headers</para>
-          <indexterm zone="ch-system-linux-libc-headers linux-libc-headers">
-            <primary
-            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/adjusting.xml"/>
Index: BOOK/final-system/x86_64-64/linux-headers.xml
===================================================================
--- BOOK/final-system/x86_64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/x86_64-64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linuxlinux-headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
+cp -av include/asm-x86_64/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -av include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64-64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-x86_64/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/final-system/x86_64-chapter.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
Index: BOOK/final-system/x86_64/linux-headers.xml
===================================================================
--- BOOK/final-system/x86_64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
+++ BOOK/final-system/x86_64/linux-headers.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-headers" role="wrap">
+  <?dbhtml filename="linux-headers.html"?>
+
+  <title>Linux-Headers-&linux-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-headers">
+    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound}
+cp -av include/asm-i386/* /usr/include/asm-i386
+cp -av include/asm-x86_64/* /usr/include/asm-x86_64
+cp -av include/asm-x86_64-biarch/* /usr/include/asm
+cp -av include/linux/* /usr/include/linux
+cp -av include/mtd/* /usr/include/mtd
+cp -av include/net/* /usr/include/net
+cp -av include/scsi/* /usr/include/scsi
+cp -av include/sound/* /usr/include/sound</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound}</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen><userinput>find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-headers.xml"
+  xpointer="xpointer(id('contents-linux-headers'))"/>
+
+</sect1>
Index: OK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64/linux-libc-headers.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-libc-headers" role="wrap">
-  <?dbhtml filename="linux-libc-headers.html"?>
-
-  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-
-  <indexterm zone="ch-system-linux-libc-headers">
-    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Libc-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="aa">The following patch contains header stubs which link to the
-    proper header from either asm-i386 or asm-x86_64:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&linux-libc-headers-x86_64_biarch-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>install -dv /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi}
-cp -av include/asm-i386/* /usr/include/asm-i386
-cp -av include/asm-x86_64/* /usr/include/asm-x86_64
-cp -av include/asm-x86_64-biarch/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/scsi/* /usr/include/scsi</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
-
-</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/introduction/common/changelog.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -41,7 +41,10 @@
       <itemizedlist>
         <listitem>
+          <para>[jim] - Removed Linux-Libc-Headers and replace it with
+	   our Linux-Headers package.</para>
+        </listitem>
+        <listitem>
           <para>[jim] - Updated to Linux 2.6.16.9.</para>
         </listitem>
-      <itemizedlist>
         <listitem>
           <para>[jim] - Updated to Linux 2.6.16.8.</para>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/common/packages.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -235,7 +235,7 @@
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-version;) - &linux-libc-headers-size;:</term>
-      <listitem>
-        <para><ulink url="&linux-libc-headers-url;"/></para>
+      <term>Linux-Headers (&linux-headers-version;) - &linux-headers-size;:</term>
+      <listitem>
+        <para><ulink url="&linux-headers-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/mips/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -65,20 +65,4 @@
     </varlistentry>
 
-    <varlistentry os="linux-libc-headers-mips_atomic_fix-patch">
-      <term>Linux Headers Atomic Fix Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_atomic_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="linux-libc-headers-mips_tls-patch">
-      <term>Linux Headers TLS Patch - 3.2 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="mktemp-mips_update-patch">
       <term>Mktemp Config Update Patch - 56 KB:</term>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/mips64-64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -51,12 +51,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-mips_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
 
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/mips64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -54,12 +54,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-mips_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
 
Index: BOOK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/ppc64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -16,12 +16,4 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry>
-      <term>Linux Libc Headers (&linux-libc-headers-version;) - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-ppc_biarch-patch;"/></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry>
Index: BOOK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/sparc/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -49,12 +49,4 @@
     </varlistentry>
 
-    <varlistentry os="linux-libc-headers-sparc_conflicts-patch">
-      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="silo-fixes-patch">
       <term>Silo Fixes Patch - 657 KB:</term>
Index: BOOK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/sparc64-64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -39,8 +39,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-sparc_conflicts-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
 
Index: BOOK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/sparc64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -37,16 +37,4 @@
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
-    <varlistentry>
-      <term>Linux-libc-headers Sparc Biarch Patch - 80 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_biarch-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-sparc_conflicts-patch'])"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/patches.xml"
Index: BOOK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/materials/x86_64/patches.xml	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -29,12 +29,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry>
-      <term>Linux-libc-headers x86_64 Biarch Patch - 100 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-x86_64_biarch-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - 1.4 KB:</term>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 011eaf32752eb5087175e04d8f25c181bb1a6f11)
+++ BOOK/packages.ent	(revision f097f3e8a11557190a241b15c8122a76d4d40b30)
@@ -165,7 +165,7 @@
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
 
-<!ENTITY linux-libc-headers-version "2.6.12.0">
-<!ENTITY linux-libc-headers-size "2.5 MB">
-<!ENTITY linux-libc-headers-url "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
+<!ENTITY linux-headers-version "&linux-version;-04192006">
+<!ENTITY linux-headers-size "1.2 MB">
+<!ENTITY linux-headers-url "http://ftp.jg555.com/-headers/linux-headers-&linux-headers-version;.tar.bz2">
 
 <!ENTITY m4-version "1.4.4">
