--- a/ecl.xml
+++ b/ecl.xml
@@ -1,82 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book [
-<!ENTITY % eclent SYSTEM "ecl.ent">
-%eclent;
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY html.stylesheet "base.css">
+<!ENTITY tex "TeX">
+<!ENTITY latex "LaTeX">
+<!ENTITY CommonLisp "Common Lisp">
+<!ENTITY ECL "<acronym>ECL</acronym>">
+<!ENTITY CMUCL "<acronym>CMUCL</acronym>">
+<!ENTITY SBCL "<acronym>SBCL</acronym>">
+<!ENTITY FFI "<acronym>FFI</acronym>">
+<!ENTITY UFFI "<acronym>UFFI</acronym>">
+<!ENTITY CFFI "<acronym>CFFI</acronym>">
+<!ENTITY FASL "<acronym>FASL</acronym>">
+<!ENTITY ANSI "<xref linkend='bib.ANSI'/>">
+<!ENTITY AMOP "<acronym>AMOP</acronym>">
+<!ENTITY Steele84 "<xref linkend='bib.CLTL2'/>">
+<!ENTITY HyperSpec "<xref linkend='bib.HyperSpec'/>">
+<!ENTITY ChapCopyright SYSTEM "tmp/copyright.xml">
+<!ENTITY ChapPreface SYSTEM "tmp/preface.xml">
+<!ENTITY ChapStandards SYSTEM "tmp/standards.xml">
+<!ENTITY ChapIO SYSTEM "tmp/io.xml">
+<!ENTITY ChapGC SYSTEM "tmp/gc.xml">
+<!ENTITY ChapPDE SYSTEM "tmp/pde.xml">
+<!ENTITY ChapInterpreter SYSTEM "tmp/interpreter.xml">
+<!ENTITY ChapCompiler SYSTEM "tmp/compiler.xml">
+<!ENTITY ChapDeclarations SYSTEM "tmp/declarations.xml">
+<!ENTITY ChapOS SYSTEM "tmp/os.xml">
+<!ENTITY RefOS SYSTEM "tmp/ref_os.xml">
+<!ENTITY ChapFFI SYSTEM "tmp/ffi.xml">
+<!ENTITY ChapMacros SYSTEM "tmp/macros.xml">
+<!ENTITY ChapMP SYSTEM "tmp/mp.xml">
+<!ENTITY ChapCLOS SYSTEM "tmp/clos.xml">
+<!ENTITY ChapInternals SYSTEM "tmp/internals.xml">
+<!ENTITY Bibliography SYSTEM "tmp/bibliography.xml">
+<!ENTITY optional "&amp;optional">
+<!ENTITY rest "&amp;rest">
+<!ENTITY keys "&amp;keys">
+<!ENTITY allow-other-keys "&amp;allow-other-keys">
+<!ENTITY aux "&amp;aux">
+<!ENTITY body "&amp;body">
+<!ENTITY whole "&amp;whole">
+<!ENTITY environment "&amp;environment">
 ]>
-<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
+<book lang="en">
+ <title>The &ECL; manual</title>
 
-<title>The &ECL; manual</title>
+ <bookinfo>
+  <author><firstname>Juan Jose</firstname><surname>Garcia-Ripoll</surname></author>
+  <date>$date$</date>
+  <title>The &ECL; manual</title>
+ </bookinfo>
 
-<info>
-<author><personname><firstname>Juan Jose</firstname><surname>Garcia-Ripoll</surname></personname></author>
-<date>$date$</date>
-</info>
+ &ChapPreface;
 
- <xi:include href="preface.xmlf" xpointer="preface" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
- <part xml:id="part.standards"><title>Standards</title>
- <xi:include href="ansi_overview.xml" xpointer="ansi.overview" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_evaluation.xml" xpointer="ansi.evaluation-and-compilation" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_types.xml" xpointer="ansi.types-and-classes" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_data_flow.xml" xpointer="ansi.data-and-control" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_structures.xml" xpointer="ansi.structures" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_conditions.xml" xpointer="ansi.conditions" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_objects.xml" xpointer="ansi.objects" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_symbols.xml" xpointer="ansi.symbols" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_packages.xml" xpointer="ansi.packages" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_numbers.xml" xpointer="ansi.numbers" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_characters.xml" xpointer="ansi.characters" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_conses.xml" xpointer="ansi.conses" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_arrays.xml" xpointer="ansi.arrays" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_strings.xml" xpointer="ansi.strings" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_sequences.xml" xpointer="ansi.sequences" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_hash_tables.xml" xpointer="ansi.hash-tables" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_filenames.xml" xpointer="ansi.filenames" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_files.xml" xpointer="ansi.files" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_streams.xml" xpointer="ansi.streams" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_printer.xml" xpointer="ansi.printer" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_reader.xml" xpointer="ansi.reader" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_system_construction.xml" xpointer="ansi.system-construction" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ansi_environment.xml" xpointer="ansi.environment" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <part id="part.standards">
+ <title>Standards</title>
+ &ChapStandards;
  </part>
 
- <part xml:id="part.extensions">
- <title>Extensions and Libraries</title>
- <xi:include href="asdf.xmlf" xpointer="element(ext.asdf)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="os.xmlf" xpointer="ext.os" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ffi.xmlf" xpointer="ext.ffi" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="mp.xmlf" xpointer="ext.mp" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="memory.xmlf" xpointer="ext.memory" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="mop.xmlf" xpointer="ext.mop" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="signals.xmlf" xpointer="ext.signals" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="embed.xmlf" xpointer="ext.embed" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <part id="part.extensions">
+ <title>Extensions</title>
+ &ChapOS;
+ &ChapFFI;
+<!--
+ &ChapIO;
+ &ChapPDE;
+ &ChapInterpreter;
+ &ChapCompiler;
+ &ChapDeclarations;
+ &ChapMacros;
+ &ChapMP;
+-->
  </part>
 
- <xi:include href="internals.xmlf" xpointer="part.internals" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
- <part xml:id="part.uffi">
- <title>UFFI Reference</title>
- <xi:include href="uffi/ref_primitive.xml" xpointer="uffi.primitives" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="uffi/ref_aggregate.xml" xpointer="uffi.aggregates" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="uffi/ref_object.xml" xpointer="uffi.objects" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="uffi/ref_string.xml" xpointer="uffi.strings" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="uffi/ref_func_libr.xml" xpointer="uffi.func_libr" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <part id="part.internals">
+ <title>Internals</title>
+ &ChapInternals;
+ &ChapGC;
  </part>
 
- <index type="cl">
- <title>Common Lisp symbols</title>
- </index>
-
- <index type="c">
- <title>C/C++ index</title>
- </index>
-
- <xi:include href="bibliography.xmlf" xpointer="Bibliography" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ &Bibliography;
 
 </book>
 <!-- Keep this comment at the end of the file
      Local variables:
-     mode: nxml
      sgml-indent-step: 1
      nxml-child-indent: 0
      nxml-outline-child-indent: 0