diff --git a/include/xrpl/core/PerfLog.h b/include/xrpl/core/PerfLog.h
index cc9c8137a8..ca0d9333a4 100644
--- a/include/xrpl/core/PerfLog.h
+++ b/include/xrpl/core/PerfLog.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/config/BasicConfig.h>
 #include <xrpl/core/JobTypes.h>
 #include <xrpl/json/json_value.h>
 
@@ -18,6 +17,7 @@ class Journal;
 
 namespace xrpl {
 class Application;
+class Section;
 namespace perf {
 
 /**
diff --git a/include/xrpl/nodestore/Database.h b/include/xrpl/nodestore/Database.h
index 3692e2d1ae..369e5a4e3c 100644
--- a/include/xrpl/nodestore/Database.h
+++ b/include/xrpl/nodestore/Database.h
@@ -2,7 +2,6 @@
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/TaggedCache.ipp>
-#include <xrpl/config/BasicConfig.h>
 #include <xrpl/nodestore/Backend.h>
 #include <xrpl/nodestore/NodeObject.h>
 #include <xrpl/nodestore/Scheduler.h>
@@ -10,6 +9,10 @@
 
 #include <condition_variable>
 
+namespace xrpl {
+class Section;
+}  // namespace xrpl
+
 namespace xrpl::NodeStore {
 
 /** Persistency layer for NodeObject
diff --git a/include/xrpl/nodestore/Factory.h b/include/xrpl/nodestore/Factory.h
index fae10b0cd7..3e6ba76a08 100644
--- a/include/xrpl/nodestore/Factory.h
+++ b/include/xrpl/nodestore/Factory.h
@@ -1,12 +1,15 @@
 #pragma once
 
 #include <xrpl/beast/utility/Journal.h>
-#include <xrpl/config/BasicConfig.h>
 #include <xrpl/nodestore/Backend.h>
 #include <xrpl/nodestore/Scheduler.h>
 
 #include <nudb/store.hpp>
 
+namespace xrpl {
+class Section;
+}  // namespace xrpl
+
 namespace xrpl::NodeStore {
 
 /** Base class for backend factories. */
diff --git a/include/xrpl/server/Port.h b/include/xrpl/server/Port.h
index 15df18fbfe..8176bf04e3 100644
--- a/include/xrpl/server/Port.h
+++ b/include/xrpl/server/Port.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <xrpl/beast/net/IPEndpoint.h>
-#include <xrpl/config/BasicConfig.h>
 
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/network_v4.hpp>
@@ -21,6 +20,8 @@ class context;  // NOLINT(readability-identifier-naming) -- external library nam
 
 namespace xrpl {
 
+class Section;
+
 /** Configuration information for a Server listening port. */
 struct Port
 {