Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision b0474c7af01a4248084948dd7fd4bc1268ddb4c2)
+++ general/graphlib/graphlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,60 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
+<chapter id="general-graphlib">
+<?dbhtml filename="graphlib.html" dir="general"?>
+<title>Graphics Libraries</title>
 
-<chapter id="general-graphlib">
-  <?dbhtml filename="graphlib.html"?>
+<para>Depending on what your system will be used for, you may or
+may not require the graphics libraries.  Most desktop machines will 
+want them for use with graphical applications.  Most servers on the 
+other hand, will not require them.</para>
 
-  <title>Graphics and Font Libraries</title>
-
-  <para>
-    Depending on what your system will be used for, you may or
-    may not require the graphics and font libraries. Most desktop machines will
-    want them for use with graphical applications.  Most servers on the
-    other hand, will not require them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aalib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="babl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetype2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gegl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libavif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libexif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgxps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjpeg-turbo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjxl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmypaint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libspiro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mypaint-brushes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opencv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="potrace.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qrencode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sassc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webp-pixbuf-loader.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="woff2.xml"/>
+&lcms;
+&libjpeg;
+&libpng;
+&libtiff;
+&libungif;
+&libmng;
+&imlib;
 
 </chapter>
