Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision c8c80645f833315f8aa46e46a5e6aa135869d218)
+++ general/sysutils/sysutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,73 +1,15 @@
-<?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-sysutils">
+<?dbhtml filename="sysutils.html" dir="general"?>
+<title>System Utilities</title>
 
-<chapter id="general-sysutils">
-  <?dbhtml filename="sysutils.html"?>
-
-  <title>System Utilities</title>
-
-  <para>
-    This chapter contains mainly hardware utilities. It also contains
-    some applications used by other applications in the book for
-    installation or configuration purposes.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acpid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluez.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bubblewrap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-pk-helper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-
-  <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="blocaled.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hwdata.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logrotate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modemmanager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p7zip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pax.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pm-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="power-profiles-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="redland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysmon-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
-
-  <!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="weston.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdotool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>
+&gpm;
+&fcron;
+&hdparm;
+&which;
+&unzip;
+&zip;
+&pccts;
+&pciutils;
+&pkgconfig;
 
 </chapter>
