--- a/ecl.xml
+++ b/ecl.xml
@@ -1,129 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!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 "<application>ECL</application>">
-<!ENTITY CMUCL "<application>CMUCL</application>">
-<!ENTITY SBCL "<application>SBCL</application>">
-<!ENTITY FFI "<application>FFI</application>">
-<!ENTITY UFFI "<link linkend='part.uffi'><application>UFFI</application></link>">
-<!ENTITY CFFI "<application>CFFI</application>">
-<!ENTITY ASDF "<application>ASDF</application>">
-<!ENTITY FASL "<acronym>FASL</acronym>">
-<!ENTITY ANSI "<xref linkend='bib.ANSI'/>">
-<!ENTITY AMOP "<xref linkend='bib.AMOP'/>">
-<!ENTITY CLOS "<acronym>CLOS</acronym>">
-<!ENTITY PCL "<acronym>PCL</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 ChapASDF SYSTEM "tmp/asdf.xml">
-<!ENTITY ChapOS SYSTEM "tmp/os.xml">
-<!ENTITY GFDL SYSTEM "tmp/COPYING.GFDL.xml">
-<!ENTITY RefOS SYSTEM "tmp/ref_os.xml">
-<!ENTITY ChapMP SYSTEM "tmp/mp.xml">
-<!ENTITY RefMP SYSTEM "tmp/ref_mp.xml">
-<!ENTITY ChapSignals SYSTEM "tmp/signals.xml">
-<!ENTITY RefSignals SYSTEM "tmp/ref_signals.xml">
-<!ENTITY ChapEmbed SYSTEM "tmp/embed.xml">
-<!ENTITY RefEmbed SYSTEM "tmp/ref_embed.xml">
-<!ENTITY ChapMemory SYSTEM "tmp/memory.xml">
-<!ENTITY RefMemory SYSTEM "tmp/ref_memory.xml">
-<!ENTITY ChapMOP SYSTEM "tmp/mop.xml">
-<!ENTITY ChapFFI SYSTEM "tmp/ffi.xml">
-<!ENTITY ChapMacros SYSTEM "tmp/macros.xml">
-<!ENTITY ChapCLOS SYSTEM "tmp/clos.xml">
-<!ENTITY ChapInternals SYSTEM "tmp/internals.xml">
-<!ENTITY RefUFFIPrimitive SYSTEM "tmp/ref_primitive.xml">
-<!ENTITY RefUFFIAggregate SYSTEM "tmp/ref_aggregate.xml">
-<!ENTITY RefUFFIObject SYSTEM "tmp/ref_object.xml">
-<!ENTITY RefUFFIString SYSTEM "tmp/ref_string.xml">
-<!ENTITY RefUFFIFuncLibr SYSTEM "tmp/ref_func_libr.xml">
-<!ENTITY Bibliography SYSTEM "tmp/bibliography.xml">
-<!ENTITY optional "&amp;optional">
-<!ENTITY rest "&amp;rest">
-<!ENTITY key "&amp;key">
-<!ENTITY allow-other-keys "&amp;allow-other-keys">
-<!ENTITY aux "&amp;aux">
-<!ENTITY body "&amp;body">
-<!ENTITY whole "&amp;whole">
-<!ENTITY environment "&amp;environment">
-<!ENTITY uffi "<application><emphasis>UFFI</emphasis></application>">
-<!ENTITY ffi "<acronym>FFI</acronym>">
-<!ENTITY LW "<application>Lispworks</application>">
-<!ENTITY OpenMCL "<application>OpenMCL</application>">
-<!ENTITY MCL "<application>MCL</application>">
-<!ENTITY ACL "<application>AllegroCL</application>">
-<!ENTITY t "<constant>T</constant>">
-<!ENTITY nil "<constant>NIL</constant>">
-<!ENTITY NULL "<constant>NULL</constant>">
-<!ENTITY C "<acronym>C</acronym>">
-<!ENTITY defsystem "<application>defsystem</application>">
-<!ENTITY cygwin "<ulink url='http://www.cygwin.com/'><application>Cygwin</application></ulink>">
-<!ENTITY mingw "<ulink url='http://mingw.sourceforge.net/'><application>Mingw</application></ulink>">
+<!DOCTYPE book [
+<!ENTITY % eclent SYSTEM "ecl.ent">
+%eclent;
 ]>
-<book lang="en">
- <title>The &ECL; manual</title>
+<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
 
- <bookinfo>
-  <author><firstname>Juan Jose</firstname><surname>Garcia-Ripoll</surname></author>
-  <date>$date$</date>
-  <title>The &ECL; manual</title>
- </bookinfo>
+<title>The &ECL; manual</title>
 
- &ChapPreface;
+<info>
+<author><personname><firstname>Juan Jose</firstname><surname>Garcia-Ripoll</surname></personname></author>
+<date>$date$</date>
+</info>
 
- <part id="part.standards">
- <title>Standards</title>
- &ChapStandards;
+ <xi:include href="preface.xmlf" xpointer="preface" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+ <xi:include href="standards.xmlf" xpointer="part.standards" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+ <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>
 
- <part id="part.extensions">
- <title>Extensions and libraries</title>
- &ChapASDF;
- &ChapOS;
- &ChapFFI;
- &ChapMP;
- &ChapMemory;
- &ChapMOP;
- &ChapSignals;
- &ChapEmbed;
-<!--
- &ChapIO;
- &ChapPDE;
- &ChapCompiler;
- &ChapInterpreter;
- &ChapDeclarations;
- &ChapMacros;
--->
+ <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>
 
- <part id="part.internals">
- <title>Internals</title>
- &ChapInternals;
- </part>
-
- <part id="part.uffi">
- <title>UFFI Reference</title>
- &RefUFFIPrimitive;
- &RefUFFIAggregate;
- &RefUFFIObject;
- &RefUFFIString;
- &RefUFFIFuncLibr;
- </part>
-
- &Bibliography;
+ <xi:include href="bibliography.xmlf" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 </book>
 <!-- Keep this comment at the end of the file