diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index c66b42590..98f0548c7 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
@@ -17,7 +21,8 @@
                (translators put your name and email here)
 -->
 
-<chapter id="setup-accounts">
+<chapter id="setup-accounts"
+         xmlns:xi="http://www.w3.org/2001/XInclude">
       <title>Setting Up, Editing &amp; Working with Accounts</title>
 
       <para>This section describes the process of setting up, editing and working with <application>&app;</application> Accounts.
@@ -228,7 +233,7 @@
         the main branches are shown in the report, rather than the individual accounts. For
         example, a chart of accounts might look like the following:</para>
 
-         &chartacctseg;
+        <xi:include href="Help_chtacctseg.xml" />
 
         <note id="accts-code">
         <title>Accounts codes</title>
diff --git a/help/C/Help_ch_Business.xml b/help/C/Help_ch_Business.xml
index 95e1de2ed..d0705464f 100644
--- a/help/C/Help_ch_Business.xml
+++ b/help/C/Help_ch_Business.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/help/C/Help_ch_Customize.xml b/help/C/Help_ch_Customize.xml
index a18ffe7f9..125748c46 100644
--- a/help/C/Help_ch_Customize.xml
+++ b/help/C/Help_ch_Customize.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.1
@@ -20,7 +24,8 @@
                (translators put your name and email here)
 -->
 
-  <chapter id="custom-gnucash">
+<chapter id="custom-gnucash"
+         xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Customizing <application>&app;</application></title>
 
     <sect1 id="account-options">
@@ -2564,7 +2569,7 @@
 
         <para>Table 32. Detailed <acronym>TXF</acronym> Category Descriptions</para>
 
-	&txf-categories;
+        <xi:include href="Help_txf-categories.xml" />
       </sect2>
     </sect1>
 
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index ce9e33108..86e17e127 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/C/Help_ch_GettingHelp.xml b/help/C/Help_ch_GettingHelp.xml
index 005c52c26..b3628ad91 100644
--- a/help/C/Help_ch_GettingHelp.xml
+++ b/help/C/Help_ch_GettingHelp.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/C/Help_ch_GettingStarted.xml b/help/C/Help_ch_GettingStarted.xml
index a23a70cd7..3f60bf189 100644
--- a/help/C/Help_ch_GettingStarted.xml
+++ b/help/C/Help_ch_GettingStarted.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/C/Help_ch_Intro.xml b/help/C/Help_ch_Intro.xml
index 2d3d19b53..1327227f7 100644
--- a/help/C/Help_ch_Intro.xml
+++ b/help/C/Help_ch_Intro.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" >
--->
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
 
 <!--
       (Do not remove this comment block.)
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index cd9efbca7..5ad01f11d 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/C/Help_ch_Tools_Assistants.xml b/help/C/Help_ch_Tools_Assistants.xml
index f044b38d6..d9c0908ba 100644
--- a/help/C/Help_ch_Tools_Assistants.xml
+++ b/help/C/Help_ch_Tools_Assistants.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index 1b59690cf..a5477fbef 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
     (Do not remove this comment block.)
     Version: 2.0.x
diff --git a/help/C/Help_chartofaccts.xml b/help/C/Help_chartofaccts.xml
index b94407a59..94244258f 100644
--- a/help/C/Help_chartofaccts.xml
+++ b/help/C/Help_chartofaccts.xml
@@ -1,4 +1,8 @@
-        <itemizedlist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE itemizedlist PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                              "../../docbook/gnc-docbookx.dtd">
+
+<itemizedlist>
 <listitem>
 <para>            Assets
 
diff --git a/help/C/Help_chtacctseg.xml b/help/C/Help_chtacctseg.xml
index 99df81922..9746daaf8 100644
--- a/help/C/Help_chtacctseg.xml
+++ b/help/C/Help_chtacctseg.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE literallayout PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                               "../../docbook/gnc-docbookx.dtd">
+
 <literallayout>
 <literal>        300             Expenses
          |
diff --git a/help/C/Help_fdl-appendix.xml b/help/C/Help_fdl-appendix.xml
index c48a459ec..4d356f188 100644
--- a/help/C/Help_fdl-appendix.xml
+++ b/help/C/Help_fdl-appendix.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais@okstate.edu>
diff --git a/help/C/Help_legal.xml b/help/C/Help_legal.xml
index ac97e1de4..15aa5d97d 100644
--- a/help/C/Help_legal.xml
+++ b/help/C/Help_legal.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE legalnotice PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
   <legalnotice id="legalnotice">
 	<para>
 	  Permission is granted to copy, distribute and/or modify this
diff --git a/help/C/Help_tips-appendix.xml b/help/C/Help_tips-appendix.xml
index b319af5ad..434d966eb 100644
--- a/help/C/Help_tips-appendix.xml
+++ b/help/C/Help_tips-appendix.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.6.20
diff --git a/help/C/Help_txf-categories.xml b/help/C/Help_txf-categories.xml
index fbf5614a7..53a01a053 100644
--- a/help/C/Help_txf-categories.xml
+++ b/help/C/Help_txf-categories.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE para PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                      "../../docbook/gnc-docbookx.dtd">
+
 <para>
 <!-- Translators: You will probably have your own codes.
      Look for similar files as the source at the end of this file,
@@ -982,7 +986,6 @@ The fair market value of donated property, such as used clothing or furniture.</
 </tbody>
 </tgroup>
 </table>
-</para>
-<para>Source:
-	<ulink url="https://github.com/Gnucash/gnucash/blob/maint/src/tax/us/txf-help.scm"></ulink>
+Source:
+    <ulink url="https://github.com/Gnucash/gnucash/blob/maint/src/tax/us/txf-help.scm"></ulink>
 </para>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 51a46fcf4..b3a31d676 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
-"../../docbook/gnc-docbookx.dtd" [
-
-<!-- List of files: -->
-<!ENTITY intro SYSTEM "Help_ch_Intro.xml">
-<!ENTITY chGettingHelp SYSTEM "Help_ch_GettingHelp.xml">
-<!ENTITY chGettingStarted SYSTEM "Help_ch_GettingStarted.xml">
-<!ENTITY chGUIMenus SYSTEM "Help_ch_GUIMenus.xml">
-<!ENTITY chAccounts SYSTEM "Help_ch_Account-Actions.xml">
-<!ENTITY chTransactions SYSTEM "Help_ch_Transactions.xml">
-<!ENTITY chBusiness SYSTEM "Help_ch_Business.xml">
-<!ENTITY chToolsAssistants SYSTEM "Help_ch_Tools_Assistants.xml">
-<!ENTITY chReports SYSTEM "Help_ch_Reports.xml">
-<!ENTITY custom SYSTEM "Help_ch_Customize.xml">
-<!ENTITY chartacctseg SYSTEM "Help_chtacctseg.xml">
-<!ENTITY chartofaccts SYSTEM "Help_chartofaccts.xml">
-<!ENTITY txf-categories SYSTEM "Help_txf-categories.xml">
-<!ENTITY legal SYSTEM "Help_legal.xml">
-<!ENTITY GFDL SYSTEM "Help_fdl-appendix.xml">
-<!ENTITY Tips SYSTEM "Help_tips-appendix.xml">
-]>
+                      "../../docbook/gnc-docbookx.dtd" >
 
 <!--
       (Do not remove this comment block.)
@@ -31,7 +12,8 @@
                (translators put your name and email here)
 -->
 
-<book id="help" lang="en-US">
+<book id="help" lang="en-US"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
 
@@ -60,7 +42,7 @@
        </address>
     </publisher>
 
-    &legal;
+    <xi:include href="Help_legal.xml" />
 
     <authorgroup>
       <author><surname>The GnuCash Documentation Team</surname></author>
@@ -358,17 +340,17 @@
     </para>
   </preface>
 
-&intro;
-&chGettingHelp;
-&chGettingStarted;
-&chGUIMenus;
-&chAccounts;
-&chTransactions;
-&chBusiness;
-&chToolsAssistants;
-&chReports;
-&custom;
-&Tips;
-&GFDL;
+<xi:include href="Help_ch_Intro.xml" />
+<xi:include href="Help_ch_GettingHelp.xml" />
+<xi:include href="Help_ch_GettingStarted.xml" />
+<xi:include href="Help_ch_GUIMenus.xml" />
+<xi:include href="Help_ch_Account-Actions.xml" />
+<xi:include href="Help_ch_Transactions.xml" />
+<xi:include href="Help_ch_Business.xml" />
+<xi:include href="Help_ch_Tools_Assistants.xml" />
+<xi:include href="Help_ch_Reports.xml" />
+<xi:include href="Help_ch_Customize.xml" />
+<xi:include href="Help_tips-appendix.xml" />
+<!-- unused? xi:include href="Help_chartofaccts.xml" /-->
+<xi:include href="Help_fdl-appendix.xml" />
 </book>
-
diff --git a/help/de/Help_ch_GettingStarted.xml b/help/de/Help_ch_GettingStarted.xml
index 68e9a256d..6c4002564 100644
--- a/help/de/Help_ch_GettingStarted.xml
+++ b/help/de/Help_ch_GettingStarted.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/de/Help_ch_Intro.xml b/help/de/Help_ch_Intro.xml
index 68ffb6071..fa4a4368b 100644
--- a/help/de/Help_ch_Intro.xml
+++ b/help/de/Help_ch_Intro.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" >
--->
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
 
 <!--
       (Do not remove this comment block.)
diff --git a/help/de/Help_chartofaccts.xml b/help/de/Help_chartofaccts.xml
index d486450a1..bb7355e48 100644
--- a/help/de/Help_chartofaccts.xml
+++ b/help/de/Help_chartofaccts.xml
@@ -1,4 +1,8 @@
-        <itemizedlist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE itemizelist PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                             "../../docbook/gnc-docbookx.dtd">
+
+<itemizedlist>
 <listitem>
 <para>            Assets 
 
diff --git a/help/de/Help_chtacctseg.xml b/help/de/Help_chtacctseg.xml
index 72eb39ea7..f67f64ad2 100644
--- a/help/de/Help_chtacctseg.xml
+++ b/help/de/Help_chtacctseg.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE literallayout PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                               "../../docbook/gnc-docbookx.dtd">
+
 <literallayout>
 <literal>        300             Expenses
          |
diff --git a/help/de/Help_fdl-appendix.xml b/help/de/Help_fdl-appendix.xml
index 707ea9941..b0b9cfcc0 100644
--- a/help/de/Help_fdl-appendix.xml
+++ b/help/de/Help_fdl-appendix.xml
@@ -1,4 +1,8 @@
-<!--  
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
+<!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais@okstate.edu>
      Maintained by the GNOME Documentation Project
diff --git a/help/de/Help_legal.xml b/help/de/Help_legal.xml
index 45fb43016..e1537d43d 100644
--- a/help/de/Help_legal.xml
+++ b/help/de/Help_legal.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE legalnotice PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
   <legalnotice id="legalnotice">
 	<para>
 	  Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem <ulink type="help" url="ghelp:fdl">Link</ulink> oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCs.
diff --git a/help/de/Help_tips-appendix.xml b/help/de/Help_tips-appendix.xml
index 0c14bc321..a73761350 100644
--- a/help/de/Help_tips-appendix.xml
+++ b/help/de/Help_tips-appendix.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.6.20
diff --git a/help/de/Help_txf-categories.xml b/help/de/Help_txf-categories.xml
index 2a886d070..6e5fbcfc3 100644
--- a/help/de/Help_txf-categories.xml
+++ b/help/de/Help_txf-categories.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE para PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                      "../../docbook/gnc-docbookx.dtd">
+
 <para>
 <table>
 <title>Detailed TXF Category Descriptions</title>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index f319a804d..ebdecb7ec 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
-"../../docbook/gnc-docbookx.dtd" [
-
-<!-- List of files: -->
-<!ENTITY intro SYSTEM "Help_ch_Intro.xml">
-<!ENTITY chGettingHelp SYSTEM "Help_ch_GettingHelp.xml">
-<!ENTITY chGettingStarted SYSTEM "Help_ch_GettingStarted.xml">
-<!ENTITY chGUIMenus SYSTEM "Help_ch_GUIMenus.xml">
-<!ENTITY chAccounts SYSTEM "Help_ch_Account-Actions.xml">
-<!ENTITY chTransactions SYSTEM "Help_ch_Transactions.xml">
-<!ENTITY chToolsAssistants SYSTEM "Help_ch_Tools_Assistants.xml">
-<!ENTITY chReports SYSTEM "Help_ch_Reports.xml">
-<!ENTITY custom SYSTEM "Help_ch_Customize.xml">
-<!ENTITY chartacctseg SYSTEM "Help_chtacctseg.xml">
-<!ENTITY chartofaccts SYSTEM "Help_chartofaccts.xml">
-<!ENTITY txf-categories SYSTEM "Help_txf-categories.xml">
-<!ENTITY legal SYSTEM "Help_legal.xml">
-<!ENTITY GFDL SYSTEM "Help_fdl-appendix.xml">
-<!ENTITY Tips SYSTEM "Help_tips-appendix.xml">
-]>
+                      "../../docbook/gnc-docbookx.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
@@ -43,7 +25,8 @@
     Structure of translation adjusted to rev 19776
     Frank Ellenberger (f.ellenberger@online.de)
 -->
-<book id='help' lang="de_DE">
+<book id='help' lang="de_DE"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
 
@@ -87,7 +70,7 @@
        </address>
     </publisher>
 
-    &legal;
+    <xi:include href="Help_legal.xml" />
 
     <authorgroup>
       <author><surname>The &app; Documentation Team</surname>
@@ -339,16 +322,15 @@
     </para>
   </preface>
 
-&intro;
-<!-- Bereich intro ausgelagert
-          H.S. 02.01.2011
--->
-
-
-&chGettingStarted;
-<!-- Bereich GettingStarted ausgelagert
- 	 H.S. 03.01.2011
--->
+<xi:include href="Help_ch_Intro.xml" />
+<!--xi:include href="Help_ch_GettingHelp.xml" /-->
+<xi:include href="Help_ch_GettingStarted.xml" />
+<!--xi:include href="Help_ch_GUIMenus.xml" /-->
+<!--xi:include href="Help_ch_Account-Actions.xml" /-->
+<!--xi:include href="Help_ch_Transactions.xml" /-->
+<!--xi:include href="Help_ch_Tools_Assistants.xml" /-->
+<!--xi:include href="Help_ch_Reports.xml" /-->
+<!--xi:include href="Help_ch_Customize.xml" /-->
 
 
     <chapter id="appendix">
@@ -4808,7 +4790,7 @@
         <title>Neue Kontenhierarchie erstellen</title>
         <para />
         <para>Ein Kontenplan (Kontenhierarchie) ist eine Art Inhaltsverzeichnis für Ihre Finanzen. Am besten denkt man sich einen Kontenplan als Baum: Die Äste stehen für ganze Kategorien oder Gruppen, während die Blätter einzelne Bankkonten oder Aufwandsarten bezeichnen. Wenn Sie einen zusammenfassenden Bericht aufrufen, werden typischerweise nur die Hauptäste im Bericht dargestellt und nicht die Einzelkonten. Eine Kontenhierarchie könnte beispielsweise wie folgt aussehen: [FIXME: Abbildung übersetzen]
-	&chartacctseg;
+        <xi:include href="Help_chtacctseg.xml" />
 	</para>
         <para />
         <para>Beachten Sie, jedes Konto nicht nur einen Namen besitzt, sondern auch eine Nummer, um die Konten zu ordnen. Wenn Sie einen Bericht erstellen, wird die Sortierreihenfolge nach der Nummer bestimmt. Es ist üblich, dass die Nummern der "Blatt"-Konten nicht mit Null enden, während die Nummern der höheren Hierarchieebenen jeweils mehr Nullen am Ende haben. </para>
@@ -4816,7 +4798,7 @@
         <para>GnuCash verbietet nicht die doppelte Vergabe von Nummern, jedoch wird empfohlen, dass Sie dies vermeiden. Kontonummern werden als Zahlen im 36er Basissystem behandelt, d.h., Sie können neben Ziffern auch die Buchstaben "a" bis "z" verwenden.</para>
         <para />
         <para>Nachfolgend ist eine Beispielkontenhierarchie dargestellt. Jedes Konto besitzt eine vorgegebene Kontoart. Dieses Beispiel kombiniert einige typische geschäftliche und private Konten. [FIXME: Abbildung übersetzen]
-	&chartofaccts;
+        <xi:include href="Help_chartofaccts.xml" />
 	</para>
         <para />
       </sect3>
@@ -6813,12 +6795,11 @@
         <para />
         <para>Table 32. Detailed TXF Category Descriptions</para>
         <para />
-	&txf-categories;
+        <xi:include href="Help_txf-categories.xml" />
       </sect3>
     </sect2>
   </sect1>
 </chapter>
-&Tips;
-&GFDL;
-
+<xi:include href="Help_tips-appendix.xml" />
+<xi:include href="Help_fdl-appendix.xml" />
 </book>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 8b8f36453..e5f2e726b 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
-"../../docbook/gnc-docbookx.dtd" [
-
-<!-- List of files: -->
-<!ENTITY intro SYSTEM "Help_ch_Intro.xml">
-<!ENTITY chGettingHelp SYSTEM "Help_ch_GettingHelp.xml">
-<!ENTITY chGettingStarted SYSTEM "Help_ch_GettingStarted.xml">
-<!ENTITY chGUIMenus SYSTEM "Help_ch_GUIMenus.xml">
-<!ENTITY chAccounts SYSTEM "Help_ch_Account-Actions.xml">
-<!ENTITY chTransactions SYSTEM "Help_ch_Transactions.xml">
-<!ENTITY chBusiness SYSTEM "Help_ch_Business.xml">
-<!ENTITY chToolsAssistants SYSTEM "Help_ch_Tools_Assistants.xml">
-<!ENTITY chReports SYSTEM "Help_ch_Reports.xml">
-<!ENTITY custom SYSTEM "Help_ch_Customize.xml">
-<!ENTITY chartacctseg SYSTEM "Help_chtacctseg.xml">
-<!ENTITY chartofaccts SYSTEM "Help_chartofaccts.xml">
-<!ENTITY txf-categories SYSTEM "Help_txf-categories.xml">
-<!ENTITY legal SYSTEM "Help_legal.xml">
-<!ENTITY GFDL SYSTEM "Help_fdl-appendix.xml">
-<!ENTITY Tips SYSTEM "Help_tips-appendix.xml">
-]>
+                      "../../docbook/gnc-docbookx.dtd" >
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
@@ -36,7 +17,8 @@
   Translators:
                (translators put your name and email here)
 -->
-<book id="help" lang="it">
+<book id="help" lang="it"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
 
diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index a842f7419..85649015e 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/pt/Help_ch_Business.xml b/help/pt/Help_ch_Business.xml
index 9797a49f0..b056436da 100644
--- a/help/pt/Help_ch_Business.xml
+++ b/help/pt/Help_ch_Business.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
       (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/help/pt/Help_ch_Customize.xml b/help/pt/Help_ch_Customize.xml
index aff0e7b46..71cb5adc1 100644
--- a/help/pt/Help_ch_Customize.xml
+++ b/help/pt/Help_ch_Customize.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
       (Do not remove this comment block.)
   Version: 2.0.1
   Last modified: February 13th 2014
@@ -2308,4 +2312,4 @@ LANGUAGE={LANG}</programlisting>
       
     </sect1>
 
-  </chapter>
\ No newline at end of file
+  </chapter>
diff --git a/help/pt/Help_ch_GUIMenus.xml b/help/pt/Help_ch_GUIMenus.xml
index dd37dbb04..dbc390a99 100644
--- a/help/pt/Help_ch_GUIMenus.xml
+++ b/help/pt/Help_ch_GUIMenus.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/pt/Help_ch_GettingHelp.xml b/help/pt/Help_ch_GettingHelp.xml
index 55b544fcc..0ffdd713b 100644
--- a/help/pt/Help_ch_GettingHelp.xml
+++ b/help/pt/Help_ch_GettingHelp.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
 
       (Do not remove this comment block.)
   Version: 2.0.2
diff --git a/help/pt/Help_ch_GettingStarted.xml b/help/pt/Help_ch_GettingStarted.xml
index 746f9d54f..ea213f58f 100644
--- a/help/pt/Help_ch_GettingStarted.xml
+++ b/help/pt/Help_ch_GettingStarted.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/pt/Help_ch_Intro.xml b/help/pt/Help_ch_Intro.xml
index 81fb6a814..80720b9b5 100644
--- a/help/pt/Help_ch_Intro.xml
+++ b/help/pt/Help_ch_Intro.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" >
--->
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
 
 <!--
       (Do not remove this comment block.)
diff --git a/help/pt/Help_ch_Reports.xml b/help/pt/Help_ch_Reports.xml
index dd5cb5388..3832914f3 100644
--- a/help/pt/Help_ch_Reports.xml
+++ b/help/pt/Help_ch_Reports.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
       (Do not remove this comment block.)
   Version: 2.0.x
    Last modified: December 7th 2009
diff --git a/help/pt/Help_ch_Tools_Assistants.xml b/help/pt/Help_ch_Tools_Assistants.xml
index 3e865bdf0..9f8675be1 100644
--- a/help/pt/Help_ch_Tools_Assistants.xml
+++ b/help/pt/Help_ch_Tools_Assistants.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
       (Do not remove this comment block.)
   Version: 2.0.x
    Last modified: April 15th 2007
diff --git a/help/pt/Help_ch_Transactions.xml b/help/pt/Help_ch_Transactions.xml
index 27514ed48..03067033a 100644
--- a/help/pt/Help_ch_Transactions.xml
+++ b/help/pt/Help_ch_Transactions.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
+<!--
     (Do not remove this comment block.)
     Version: 2.0.x
     Last modified: April 15th 2007
diff --git a/help/pt/Help_chartofaccts.xml b/help/pt/Help_chartofaccts.xml
index 3a4ee9310..dd3209016 100644
--- a/help/pt/Help_chartofaccts.xml
+++ b/help/pt/Help_chartofaccts.xml
@@ -1,4 +1,8 @@
-        <itemizedlist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE itemizedlist PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                              "../../docbook/gnc-docbookx.dtd">
+
+<itemizedlist>
 <listitem>
 <para>            Ativos 
 
diff --git a/help/pt/Help_chtacctseg.xml b/help/pt/Help_chtacctseg.xml
index 2e4c5a7f5..616368308 100644
--- a/help/pt/Help_chtacctseg.xml
+++ b/help/pt/Help_chtacctseg.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE literallayout PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                               "../../docbook/gnc-docbookx.dtd">
+
 <literallayout>
 <literal>        300             Despesas
          |
diff --git a/help/pt/Help_fdl-appendix.xml b/help/pt/Help_fdl-appendix.xml
index e1ee5a9af..5fa410b27 100644
--- a/help/pt/Help_fdl-appendix.xml
+++ b/help/pt/Help_fdl-appendix.xml
@@ -1,4 +1,8 @@
-<!--  
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
+<!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais@okstate.edu>
      Maintained by the GNOME Documentation Project
diff --git a/help/pt/Help_legal.xml b/help/pt/Help_legal.xml
index ac97e1de4..15aa5d97d 100644
--- a/help/pt/Help_legal.xml
+++ b/help/pt/Help_legal.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE legalnotice PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                         "../../docbook/gnc-docbookx.dtd">
+
   <legalnotice id="legalnotice">
 	<para>
 	  Permission is granted to copy, distribute and/or modify this
diff --git a/help/pt/Help_tips-appendix.xml b/help/pt/Help_tips-appendix.xml
index d1f686c74..74418c533 100644
--- a/help/pt/Help_tips-appendix.xml
+++ b/help/pt/Help_tips-appendix.xml
@@ -1,4 +1,8 @@
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                          "../../docbook/gnc-docbookx.dtd">
+
+<!--
       (Do not remove this comment block.)
   Version: 2.4.12
    Last modified: April 11th 2013 (reflect bugfixes by F::Q 1.18)
diff --git a/help/pt/Help_txf-categories.xml b/help/pt/Help_txf-categories.xml
index 5b3c31241..53a01a053 100644
--- a/help/pt/Help_txf-categories.xml
+++ b/help/pt/Help_txf-categories.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE para PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
+                      "../../docbook/gnc-docbookx.dtd">
+
 <para>
 <!-- Translators: You will probably have your own codes.
      Look for similar files as the source at the end of this file,
@@ -982,7 +986,6 @@ The fair market value of donated property, such as used clothing or furniture.</
 </tbody>
 </tgroup>
 </table>
-</para>
-<para>Source: 
-	<ulink url="https://github.com/Gnucash/gnucash/blob/maint/src/tax/us/txf-help.scm"></ulink>
+Source:
+    <ulink url="https://github.com/Gnucash/gnucash/blob/maint/src/tax/us/txf-help.scm"></ulink>
 </para>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index 971e0fb54..d408f0ada 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//GnuCash//DTD DocBook XML V4.5-Based Extension 1.0//EN"
-"../../docbook/gnc-docbookx.dtd" [
-
-<!-- List of files: -->
-<!ENTITY intro SYSTEM "Help_ch_Intro.xml">
-<!ENTITY chGettingHelp SYSTEM "Help_ch_GettingHelp.xml">
-<!ENTITY chGettingStarted SYSTEM "Help_ch_GettingStarted.xml">
-<!ENTITY chGUIMenus SYSTEM "Help_ch_GUIMenus.xml">
-<!ENTITY chAccounts SYSTEM "Help_ch_Account-Actions.xml">
-<!ENTITY chTransactions SYSTEM "Help_ch_Transactions.xml">
-<!ENTITY chBusiness SYSTEM "Help_ch_Business.xml">
-<!ENTITY chToolsAssistants SYSTEM "Help_ch_Tools_Assistants.xml">
-<!ENTITY chReports SYSTEM "Help_ch_Reports.xml">
-<!ENTITY custom SYSTEM "Help_ch_Customize.xml">
-<!ENTITY chartacctseg SYSTEM "Help_chtacctseg.xml">
-<!ENTITY chartofaccts SYSTEM "Help_chartofaccts.xml">
-<!ENTITY txf-categories SYSTEM "Help_txf-categories.xml">
-<!ENTITY legal SYSTEM "Help_legal.xml">
-<!ENTITY GFDL SYSTEM "Help_fdl-appendix.xml">
-<!ENTITY Tips SYSTEM "Help_tips-appendix.xml">
-]>
+                      "../../docbook/gnc-docbookx.dtd" >
 
 <!--
       (Do not remove this comment block.)
@@ -38,7 +19,8 @@
                (Pedro Albuquerque <palbuquerque73@gmail.com>)
 -->
 
-<book id="help" lang="pt">
+<book id="help" lang="pt"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
 
@@ -67,7 +49,7 @@
        </address>
     </publisher>
 
-    &legal;
+    <xi:include href="Help_legal.xml" />
 
     <authorgroup>
       <author><surname>Equipa de documentação do &app;</surname></author>
@@ -322,18 +304,17 @@
     </para>
   </preface>
 
-&intro;
-&chGettingHelp;
-&chGettingStarted;
-&chGUIMenus;
-&chAccounts;
-&chTransactions;
-&chBusiness;
-&chToolsAssistants;
-&chReports;
-&custom;
-&Tips;
-&GFDL;
+<xi:include href="Help_ch_Intro.xml" />
+<xi:include href="Help_ch_GettingHelp.xml" />
+<xi:include href="Help_ch_GettingStarted.xml" />
+<xi:include href="Help_ch_GUIMenus.xml" />
+<xi:include href="Help_ch_Account-Actions.xml" />
+<xi:include href="Help_ch_Transactions.xml" />
+<xi:include href="Help_ch_Business.xml" />
+<xi:include href="Help_ch_Tools_Assistants.xml" />
+<xi:include href="Help_ch_Reports.xml" />
+<xi:include href="Help_ch_Customize.xml" />
+<xi:include href="Help_tips-appendix.xml" />
+<xi:include href="Help_fdl-appendix.xml" />
 
 </book>
-