Index: archive/perl-importer.xml
===================================================================
--- archive/perl-importer.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
+++ archive/perl-importer.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Importer-&Importer-version;.tar.gz">
+  <!ENTITY my-md5sum "3f09930b82cadfe26d0ce2fb1338aa1b">
+
+]>
+
+  <!-- Begin Importer -->
+  <sect2 id="perl-importer" xreflabel="Importer-&Importer-version;">
+
+    <title>Importer-&Importer-version;</title>
+
+    <indexterm zone="perl-importer">
+      <primary sortas="a-Importer">Importer</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Importer</title>
+
+      <para>
+        Importer provides an alternative but compatible interface to modules
+        that export symbols.
+      </para>
+
+      &lfs121_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&my-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &my-md5sum;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Importer</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                  href="../../../xincludes/perl-standard-install.xml"/>
+
+    </sect3>
+
+  </sect2>
Index: archive/perl-module-pluggable.xml
===================================================================
--- archive/perl-module-pluggable.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
+++ archive/perl-module-pluggable.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY my-download-http "&metacpan_authors;/S/SI/SIMONW/Module-Pluggable-&Module-Pluggable-version;.tar.gz">
+  <!ENTITY my-md5sum "87ce2971662efd0b69a81bb4dc9ea76c">
+
+]>
+
+  <!-- Begin Module::Pluggable -->
+  <sect2 id="perl-module-pluggable" xreflabel="Module-Pluggable-&Module-Pluggable-version;">
+
+    <title>Module::Pluggable-&Module-Pluggable-version;</title>
+
+    <indexterm zone="perl-module-pluggable">
+      <primary sortas="a-Module-Pluggable">Module::Pluggable</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Module::Pluggable</title>
+
+      <para>
+        Module::Pluggable provides a way of having 'plugins' for your module.
+      </para>
+
+      &lfs121_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&my-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &my-md5sum;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Module::Pluggable</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                  href="../../../xincludes/perl-standard-install.xml"/>
+
+    </sect3>
+
+  </sect2>
Index: archive/perl-sub-info.xml
===================================================================
--- archive/perl-sub-info.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
+++ archive/perl-sub-info.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Sub-Info-&Sub-Info-version;.tar.gz">
+  <!ENTITY my-md5sum "335345b534fc0539c894050f7814cbda">
+
+]>
+
+  <!-- Begin Sub::Info -->
+  <sect2 id="perl-sub-info" xreflabel="Sub-Info-&Sub-Info-version;">
+
+    <title>Sub::Info-&Sub-Info-version;</title>
+
+    <indexterm zone="perl-sub-info">
+      <primary sortas="a-Sub-Info">Sub::Info</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Sub::Info</title>
+
+      <para>
+        Sub::Info is a tool for inspecting subroutines.
+      </para>
+
+      &lfs121_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&my-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &my-md5sum;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Sub::Info</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                  href="../../../xincludes/perl-standard-install.xml"/>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/perl-deps.xml
===================================================================
--- general/prog/perl-deps.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ general/prog/perl-deps.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -256,9 +256,4 @@
       <listitem>
         <para>
-          <xref linkend="perl-importer"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="perl-io-html"/>
         </para>
@@ -311,9 +306,4 @@
       <listitem>
         <para>
-          <xref linkend="perl-module-pluggable"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="perl-module-runtime"/>
         </para>
@@ -397,9 +387,4 @@
         <para>
           <xref linkend="perl-sub-identify"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-info"/>
         </para>
       </listitem>
@@ -684,7 +669,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-importer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-deps/perl-io-html.xml"/>
 
@@ -716,7 +698,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-deps/perl-module-implementation.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-module-pluggable.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -772,7 +751,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-info.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-deps/perl-sub-quote.xml"/>
 
Index: neral/prog/perl-deps/perl-importer.xml
===================================================================
--- general/prog/perl-deps/perl-importer.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Importer-&Importer-version;.tar.gz">
-  <!ENTITY my-md5sum "3f09930b82cadfe26d0ce2fb1338aa1b">
-
-]>
-
-  <!-- Begin Importer -->
-  <sect2 id="perl-importer" xreflabel="Importer-&Importer-version;">
-
-    <title>Importer-&Importer-version;</title>
-
-    <indexterm zone="perl-importer">
-      <primary sortas="a-Importer">Importer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Importer</title>
-
-      <para>
-        Importer provides an alternative but compatible interface to modules
-        that export symbols.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Importer</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-module-pluggable.xml
===================================================================
--- general/prog/perl-deps/perl-module-pluggable.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY my-download-http "&metacpan_authors;/S/SI/SIMONW/Module-Pluggable-&Module-Pluggable-version;.tar.gz">
-  <!ENTITY my-md5sum "87ce2971662efd0b69a81bb4dc9ea76c">
-
-]>
-
-  <!-- Begin Module::Pluggable -->
-  <sect2 id="perl-module-pluggable" xreflabel="Module-Pluggable-&Module-Pluggable-version;">
-
-    <title>Module::Pluggable-&Module-Pluggable-version;</title>
-
-    <indexterm zone="perl-module-pluggable">
-      <primary sortas="a-Module-Pluggable">Module::Pluggable</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Pluggable</title>
-
-      <para>
-        Module::Pluggable provides a way of having 'plugins' for your module.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Pluggable</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-sub-info.xml
===================================================================
--- general/prog/perl-deps/perl-sub-info.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Sub-Info-&Sub-Info-version;.tar.gz">
-  <!ENTITY my-md5sum "335345b534fc0539c894050f7814cbda">
-
-]>
-
-  <!-- Begin Sub::Info -->
-  <sect2 id="perl-sub-info" xreflabel="Sub-Info-&Sub-Info-version;">
-
-    <title>Sub::Info-&Sub-Info-version;</title>
-
-    <indexterm zone="perl-sub-info">
-      <primary sortas="a-Sub-Info">Sub::Info</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Info</title>
-
-      <para>
-        Sub::Info is a tool for inspecting subroutines.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sub::Info Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-importer"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sub::Info</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-term-table.xml
===================================================================
--- general/prog/perl-deps/perl-term-table.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ general/prog/perl-deps/perl-term-table.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Term-Table-&Term-Table-version;.tar.gz">
-  <!ENTITY my-md5sum "ef0c76824c57eaa7796558060067bb49">
+  <!ENTITY my-md5sum "7022839afa343ce81c92645acb21c22d">
 
 ]>
@@ -43,11 +43,4 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Term::Table Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-importer"/>
-      </para>
-
     </sect3>
 
Index: general/prog/perl-deps/perl-test2-suite.xml
===================================================================
--- general/prog/perl-deps/perl-test2-suite.xml	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ general/prog/perl-deps/perl-test2-suite.xml	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Test2-Suite-&Test2-Suite-version;.tar.gz">
-  <!ENTITY my-md5sum "5fcc87c264a1e93fe7cb0879a0abae15">
+  <!ENTITY my-md5sum "b5958ed274ab778fe5681f0c520d05f7">
 
 ]>
@@ -47,8 +47,4 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <!-- importer is pulled in by both sub-info and term-table -->
-        <xref linkend="perl-module-pluggable"/>,
-        <xref linkend="perl-scope-guard"/>,
-        <xref linkend="perl-sub-info"/> and
         <xref linkend="perl-term-table"/>
       </para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 22ab1ba3a016cb7c09d9d59646e487484a694da3)
+++ packages.ent	(revision c98cfb212f2afb68274ee0bfd3b7641e3a0170b6)
@@ -505,5 +505,5 @@
 <!ENTITY Sub-Uplevel-version          "0.2800">
 <!--<!ENTITY SUPER-version                "1.20190531">-->
-<!ENTITY Term-Table-version           "0.016">
+<!ENTITY Term-Table-version           "0.018">
 <!ENTITY Test-Deep-version            "1.204">
 <!ENTITY Test-Exception-version       "0.43">
@@ -520,5 +520,5 @@
 <!ENTITY Test-Without-Module-version  "0.21">
 <!ENTITY Test2-Plugin-NoWarnings-version "0.09">
-<!ENTITY Test2-Suite-version          "0.000145">
+<!ENTITY Test2-Suite-version          "0.000159">
 <!ENTITY Text-CSV_XS-version          "1.53">
 <!ENTITY Text-Diff-version            "1.45">
