diff --git a/build/lib/pgBackRestBuild/Config/BuildDefine.pm b/build/lib/pgBackRestBuild/Config/BuildDefine.pm
index 589cf1d5b..f3715c94c 100644
--- a/build/lib/pgBackRestBuild/Config/BuildDefine.pm
+++ b/build/lib/pgBackRestBuild/Config/BuildDefine.pm
@@ -19,6 +19,7 @@ use pgBackRest::Common::String;
 use pgBackRest::Version;
 
 use BackRestDoc::Common::DocConfig;
+use BackRestDoc::Common::DocRender;
 
 use pgBackRestBuild::Build::Common;
 use pgBackRestBuild::Config::Data;
diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm
index b5a89a357..e4a6b57d7 100644
--- a/build/lib/pgBackRestBuild/Config/Data.pm
+++ b/build/lib/pgBackRestBuild/Config/Data.pm
@@ -66,7 +66,6 @@ use Getopt::Long qw(GetOptions);
 use Storable qw(dclone);
 
 use pgBackRest::Common::Exception;
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Io::Base;
 use pgBackRest::Common::Log;
 use pgBackRest::Common::Wait;
diff --git a/doc/lib/BackRestDoc/Common/DocExecute.pm b/doc/lib/BackRestDoc/Common/DocExecute.pm
index 666b3a803..d2e906cb9 100644
--- a/doc/lib/BackRestDoc/Common/DocExecute.pm
+++ b/doc/lib/BackRestDoc/Common/DocExecute.pm
@@ -14,7 +14,6 @@ use Exporter qw(import);
 use Storable qw(dclone);
 
 use pgBackRest::Common::Exception;
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Log;
 use pgBackRest::Common::String;
 use pgBackRest::Version;
@@ -525,6 +524,10 @@ sub backrestConfig
 
     if ($self->{bExe} && $self->isRequired($oSection))
     {
+        # Load module dynamically
+        require pgBackRest::Common::Ini;
+        pgBackRest::Common::Ini->import();
+
         my ($bCacheHit, $strCacheType, $hCacheKey, $hCacheValue) = $self->cachePop('cfg-' . PROJECT_EXE, $hCacheKey);
 
         if ($bCacheHit)
diff --git a/doc/lib/BackRestDoc/Latex/DocLatexSection.pm b/doc/lib/BackRestDoc/Latex/DocLatexSection.pm
index bd0f447a8..0c5bc33bc 100644
--- a/doc/lib/BackRestDoc/Latex/DocLatexSection.pm
+++ b/doc/lib/BackRestDoc/Latex/DocLatexSection.pm
@@ -11,7 +11,6 @@ use Carp qw(confess);
 use Exporter qw(import);
     our @EXPORT = qw();
 
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Log;
 use pgBackRest::Common::String;
 
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 58926cad8..3eb38b467 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -59,6 +59,10 @@
                         <p>Add <code>ServiceError</code> for errors from a service that can be retried.</p>
                     </release-item>
 
+                    <release-item>
+                        <p>Remove extraneous <code>use</code>/<code>include</code> statements.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Remove embedded semicolon from <code>String</code> constant macros.</p>
                     </release-item>
diff --git a/src/common/ini.c b/src/common/ini.c
index 4837436bf..c8a0d0875 100644
--- a/src/common/ini.c
+++ b/src/common/ini.c
@@ -9,7 +9,6 @@ Ini Handler
 #include "common/memContext.h"
 #include "common/ini.h"
 #include "common/type/keyValue.h"
-#include "storage/helper.h"
 
 /***********************************************************************************************************************************
 Contains information about the ini
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
index 20ebca278..ba86c48f1 100755
--- a/test/lib/pgBackRestTest/Common/ContainerTest.pm
+++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -18,7 +18,6 @@ use Exporter qw(import);
 use File::Basename qw(dirname);
 use Getopt::Long qw(GetOptions);
 
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Log;
 use pgBackRest::Common::String;
 use pgBackRest::Version;
diff --git a/test/lib/pgBackRestTest/Common/LogTest.pm b/test/lib/pgBackRestTest/Common/LogTest.pm
index 01e5d99fe..6bd65fc7c 100644
--- a/test/lib/pgBackRestTest/Common/LogTest.pm
+++ b/test/lib/pgBackRestTest/Common/LogTest.pm
@@ -15,7 +15,6 @@ use Exporter qw(import);
     our @EXPORT = qw();
 use File::Basename qw(dirname);
 
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Log;
 use pgBackRest::Version;
 
diff --git a/test/test.pl b/test/test.pl
index c47e2f30b..870256ecd 100755
--- a/test/test.pl
+++ b/test/test.pl
@@ -28,11 +28,9 @@ use lib dirname(dirname($0)) . '/build/lib';
 use lib dirname(dirname($0)) . '/doc/lib';
 
 use pgBackRest::Common::Exception;
-use pgBackRest::Common::Ini;
 use pgBackRest::Common::Log;
 use pgBackRest::Common::String;
 use pgBackRest::Common::Wait;
-use pgBackRest::DbVersion;
 use pgBackRest::Storage::Posix::Driver;
 use pgBackRest::Storage::Local;
 use pgBackRest::Version;