From 8eb233c2ea8ad5a159be73b77f0f5e1496d547ac Mon Sep 17 00:00:00 2001
From: Jingchen <a1q123456@users.noreply.github.com>
Date: Fri, 31 Oct 2025 22:25:16 +0000
Subject: [PATCH] refactor: Modularize shamap and nodestore (#5668)

This change moves the shamap and nodestore from `xrpld` to `libxrpl`.
---
 .../scripts/levelization/results/loops.txt    |  2 +-
 .../scripts/levelization/results/ordering.txt | 37 +++++++++++--------
 cmake/RippledCore.cmake                       | 28 +++++++++++---
 cmake/RippledInstall.cmake                    | 11 ++++--
 .../unity => include/xrpl/basics}/rocksdb.h   |  0
 .../xrpl}/nodestore/Backend.h                 |  2 +-
 .../xrpl}/nodestore/Database.h                |  7 ++--
 .../xrpl}/nodestore/DatabaseRotating.h        |  2 +-
 .../xrpl}/nodestore/DummyScheduler.h          |  2 +-
 .../xrpl}/nodestore/Factory.h                 |  5 +--
 .../xrpl}/nodestore/Manager.h                 |  4 +-
 .../xrpl}/nodestore/NodeObject.h              |  0
 .../xrpl}/nodestore/README.md                 |  0
 .../xrpl}/nodestore/Scheduler.h               |  2 +-
 {src/xrpld => include/xrpl}/nodestore/Task.h  |  0
 {src/xrpld => include/xrpl}/nodestore/Types.h |  2 +-
 .../xrpl}/nodestore/detail/BatchWriter.h      |  6 +--
 .../xrpl}/nodestore/detail/DatabaseNodeImp.h  |  3 +-
 .../nodestore/detail/DatabaseRotatingImp.h    |  2 +-
 .../xrpl}/nodestore/detail/DecodedBlob.h      |  2 +-
 .../xrpl}/nodestore/detail/EncodedBlob.h      |  3 +-
 .../xrpl}/nodestore/detail/ManagerImp.h       |  4 +-
 .../xrpl}/nodestore/detail/codec.h            |  5 +--
 .../xrpl}/nodestore/detail/varint.h           |  0
 {src/xrpld => include/xrpl}/shamap/Family.h   |  7 ++--
 .../xrpl}/shamap/FullBelowCache.h             |  0
 {src/xrpld => include/xrpl}/shamap/README.md  |  0
 {src/xrpld => include/xrpl}/shamap/SHAMap.h   | 20 +++++-----
 .../xrpl}/shamap/SHAMapAccountStateLeafNode.h |  5 +--
 .../xrpl}/shamap/SHAMapAddNode.h              |  0
 .../xrpl}/shamap/SHAMapInnerNode.h            |  5 +--
 .../xrpl}/shamap/SHAMapItem.h                 |  0
 .../xrpl}/shamap/SHAMapLeafNode.h             |  4 +-
 .../xrpl}/shamap/SHAMapMissingNode.h          |  3 +-
 .../xrpl}/shamap/SHAMapNodeID.h               |  0
 .../xrpl}/shamap/SHAMapSyncFilter.h           |  2 +-
 .../xrpl}/shamap/SHAMapTreeNode.h             |  5 +--
 .../xrpl}/shamap/SHAMapTxLeafNode.h           |  5 +--
 .../xrpl}/shamap/SHAMapTxPlusMetaLeafNode.h   |  5 +--
 .../xrpl}/shamap/TreeNodeCache.h              |  3 +-
 .../xrpl}/shamap/detail/TaggedPointer.h       |  3 +-
 .../xrpl}/shamap/detail/TaggedPointer.ipp     |  5 +--
 .../nodestore}/BatchWriter.cpp                |  2 +-
 .../detail => libxrpl/nodestore}/Database.cpp |  3 +-
 .../nodestore}/DatabaseNodeImp.cpp            |  2 +-
 .../nodestore}/DatabaseRotatingImp.cpp        |  2 +-
 .../nodestore}/DecodedBlob.cpp                |  3 +-
 .../nodestore}/DummyScheduler.cpp             |  2 +-
 .../nodestore}/ManagerImp.cpp                 | 25 ++++++++++++-
 .../nodestore}/NodeObject.cpp                 |  2 +-
 .../nodestore/backend/MemoryFactory.cpp       | 31 ++++++++--------
 .../nodestore/backend/NuDBFactory.cpp         | 29 ++++++++-------
 .../nodestore/backend/NullFactory.cpp         | 22 ++++++-----
 .../nodestore/backend/RocksDBFactory.cpp      | 32 ++++++++--------
 .../detail => libxrpl/shamap}/SHAMap.cpp      | 13 +++----
 .../detail => libxrpl/shamap}/SHAMapDelta.cpp |  3 +-
 .../shamap}/SHAMapInnerNode.cpp               |  7 ++--
 .../shamap}/SHAMapLeafNode.cpp                |  2 +-
 .../shamap}/SHAMapNodeID.cpp                  |  5 +--
 .../detail => libxrpl/shamap}/SHAMapSync.cpp  |  7 ++--
 .../shamap}/SHAMapTreeNode.cpp                | 11 +++---
 src/test/app/SHAMapStore_test.cpp             |  2 +-
 src/test/nodestore/Backend_test.cpp           |  7 ++--
 src/test/nodestore/Basics_test.cpp            |  4 +-
 src/test/nodestore/Database_test.cpp          |  4 +-
 src/test/nodestore/NuDBFactory_test.cpp       |  5 +--
 src/test/nodestore/TestBase.h                 |  7 ++--
 src/test/nodestore/Timing_test.cpp            |  5 +--
 src/test/nodestore/import_test.cpp            |  5 +--
 src/test/nodestore/varint_test.cpp            |  3 +-
 src/test/overlay/compression_test.cpp         |  2 +-
 src/test/shamap/FetchPack_test.cpp            |  5 +--
 src/test/shamap/SHAMapSync_test.cpp           |  5 +--
 src/test/shamap/SHAMap_test.cpp               |  3 +-
 src/test/shamap/common.h                      |  7 ++--
 .../app/consensus/RCLCensorshipDetector.h     |  3 +-
 src/xrpld/app/consensus/RCLConsensus.h        |  2 +-
 src/xrpld/app/consensus/RCLCxTx.h             |  2 +-
 src/xrpld/app/ledger/AccountStateSF.h         |  5 ++-
 src/xrpld/app/ledger/ConsensusTransSetSF.cpp  |  2 +-
 src/xrpld/app/ledger/ConsensusTransSetSF.h    |  2 +-
 src/xrpld/app/ledger/InboundTransactions.h    |  2 +-
 src/xrpld/app/ledger/Ledger.cpp               |  4 +-
 src/xrpld/app/ledger/Ledger.h                 |  2 +-
 src/xrpld/app/ledger/TransactionMaster.h      |  4 +-
 src/xrpld/app/ledger/TransactionStateSF.h     |  5 ++-
 src/xrpld/app/ledger/detail/InboundLedger.cpp |  2 +-
 src/xrpld/app/ledger/detail/SkipListAcquire.h |  3 +-
 .../app/ledger/detail/TransactionAcquire.h    |  3 +-
 src/xrpld/app/main/Application.cpp            |  2 +-
 src/xrpld/app/main/Application.h              |  2 +-
 src/xrpld/app/main/NodeStoreScheduler.h       |  3 +-
 src/xrpld/app/misc/FeeVote.h                  |  3 +-
 src/xrpld/app/misc/NegativeUNLVote.cpp        |  3 +-
 src/xrpld/app/misc/SHAMapStore.h              |  3 +-
 src/xrpld/app/misc/SHAMapStoreImp.cpp         |  6 +--
 src/xrpld/app/misc/SHAMapStoreImp.h           |  5 ++-
 src/xrpld/rpc/handlers/GetCounts.cpp          |  2 +-
 src/xrpld/shamap/{detail => }/NodeFamily.cpp  |  3 +-
 src/xrpld/shamap/NodeFamily.h                 |  3 +-
 100 files changed, 282 insertions(+), 262 deletions(-)
 rename {src/xrpld/unity => include/xrpl/basics}/rocksdb.h (100%)
 rename {src/xrpld => include/xrpl}/nodestore/Backend.h (99%)
 rename {src/xrpld => include/xrpl}/nodestore/Database.h (98%)
 rename {src/xrpld => include/xrpl}/nodestore/DatabaseRotating.h (98%)
 rename {src/xrpld => include/xrpl}/nodestore/DummyScheduler.h (97%)
 rename {src/xrpld => include/xrpl}/nodestore/Factory.h (97%)
 rename {src/xrpld => include/xrpl}/nodestore/Manager.h (97%)
 rename {src/xrpld => include/xrpl}/nodestore/NodeObject.h (100%)
 rename {src/xrpld => include/xrpl}/nodestore/README.md (100%)
 rename {src/xrpld => include/xrpl}/nodestore/Scheduler.h (98%)
 rename {src/xrpld => include/xrpl}/nodestore/Task.h (100%)
 rename {src/xrpld => include/xrpl}/nodestore/Types.h (97%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/BatchWriter.h (96%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/DatabaseNodeImp.h (99%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/DatabaseRotatingImp.h (98%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/DecodedBlob.h (98%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/EncodedBlob.h (99%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/ManagerImp.h (96%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/codec.h (99%)
 rename {src/xrpld => include/xrpl}/nodestore/detail/varint.h (100%)
 rename {src/xrpld => include/xrpl}/shamap/Family.h (95%)
 rename {src/xrpld => include/xrpl}/shamap/FullBelowCache.h (100%)
 rename {src/xrpld => include/xrpl}/shamap/README.md (100%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMap.h (98%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapAccountStateLeafNode.h (97%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapAddNode.h (100%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapInnerNode.h (98%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapItem.h (100%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapLeafNode.h (96%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapMissingNode.h (98%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapNodeID.h (100%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapSyncFilter.h (97%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapTreeNode.h (98%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapTxLeafNode.h (97%)
 rename {src/xrpld => include/xrpl}/shamap/SHAMapTxPlusMetaLeafNode.h (97%)
 rename {src/xrpld => include/xrpl}/shamap/TreeNodeCache.h (97%)
 rename {src/xrpld => include/xrpl}/shamap/detail/TaggedPointer.h (99%)
 rename {src/xrpld => include/xrpl}/shamap/detail/TaggedPointer.ipp (99%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/BatchWriter.cpp (98%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/Database.cpp (99%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/DatabaseNodeImp.cpp (99%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/DatabaseRotatingImp.cpp (99%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/DecodedBlob.cpp (98%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/DummyScheduler.cpp (96%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/ManagerImp.cpp (81%)
 rename src/{xrpld/nodestore/detail => libxrpl/nodestore}/NodeObject.cpp (97%)
 rename src/{xrpld => libxrpl}/nodestore/backend/MemoryFactory.cpp (92%)
 rename src/{xrpld => libxrpl}/nodestore/backend/NuDBFactory.cpp (96%)
 rename src/{xrpld => libxrpl}/nodestore/backend/NullFactory.cpp (90%)
 rename src/{xrpld => libxrpl}/nodestore/backend/RocksDBFactory.cpp (96%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMap.cpp (99%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapDelta.cpp (99%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapInnerNode.cpp (99%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapLeafNode.cpp (98%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapNodeID.cpp (98%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapSync.cpp (99%)
 rename src/{xrpld/shamap/detail => libxrpl/shamap}/SHAMapTreeNode.cpp (95%)
 rename src/xrpld/shamap/{detail => }/NodeFamily.cpp (98%)

diff --git a/.github/scripts/levelization/results/loops.txt b/.github/scripts/levelization/results/loops.txt
index e998e962d4..d057391be9 100644
--- a/.github/scripts/levelization/results/loops.txt
+++ b/.github/scripts/levelization/results/loops.txt
@@ -17,7 +17,7 @@ Loop: xrpld.app xrpld.rpc
   xrpld.rpc > xrpld.app
 
 Loop: xrpld.app xrpld.shamap
-  xrpld.app > xrpld.shamap
+  xrpld.shamap ~= xrpld.app
 
 Loop: xrpld.core xrpld.perflog
   xrpld.perflog == xrpld.core
diff --git a/.github/scripts/levelization/results/ordering.txt b/.github/scripts/levelization/results/ordering.txt
index e17bd14bbc..251e9c1957 100644
--- a/.github/scripts/levelization/results/ordering.txt
+++ b/.github/scripts/levelization/results/ordering.txt
@@ -8,6 +8,10 @@ libxrpl.ledger > xrpl.ledger
 libxrpl.ledger > xrpl.protocol
 libxrpl.net > xrpl.basics
 libxrpl.net > xrpl.net
+libxrpl.nodestore > xrpl.basics
+libxrpl.nodestore > xrpl.json
+libxrpl.nodestore > xrpl.nodestore
+libxrpl.nodestore > xrpl.protocol
 libxrpl.protocol > xrpl.basics
 libxrpl.protocol > xrpl.json
 libxrpl.protocol > xrpl.protocol
@@ -18,6 +22,9 @@ libxrpl.server > xrpl.basics
 libxrpl.server > xrpl.json
 libxrpl.server > xrpl.protocol
 libxrpl.server > xrpl.server
+libxrpl.shamap > xrpl.basics
+libxrpl.shamap > xrpl.protocol
+libxrpl.shamap > xrpl.shamap
 test.app > test.jtx
 test.app > test.rpc
 test.app > test.toplevel
@@ -25,11 +32,11 @@ test.app > test.unit_test
 test.app > xrpl.basics
 test.app > xrpld.app
 test.app > xrpld.core
-test.app > xrpld.nodestore
 test.app > xrpld.overlay
 test.app > xrpld.rpc
 test.app > xrpl.json
 test.app > xrpl.ledger
+test.app > xrpl.nodestore
 test.app > xrpl.protocol
 test.app > xrpl.resource
 test.basics > test.jtx
@@ -86,8 +93,7 @@ test.nodestore > test.toplevel
 test.nodestore > test.unit_test
 test.nodestore > xrpl.basics
 test.nodestore > xrpld.core
-test.nodestore > xrpld.nodestore
-test.nodestore > xrpld.unity
+test.nodestore > xrpl.nodestore
 test.overlay > test.jtx
 test.overlay > test.toplevel
 test.overlay > test.unit_test
@@ -95,8 +101,8 @@ test.overlay > xrpl.basics
 test.overlay > xrpld.app
 test.overlay > xrpld.overlay
 test.overlay > xrpld.peerfinder
-test.overlay > xrpld.shamap
 test.overlay > xrpl.protocol
+test.overlay > xrpl.shamap
 test.peerfinder > test.beast
 test.peerfinder > test.unit_test
 test.peerfinder > xrpl.basics
@@ -131,9 +137,9 @@ test.server > xrpl.json
 test.server > xrpl.server
 test.shamap > test.unit_test
 test.shamap > xrpl.basics
-test.shamap > xrpld.nodestore
-test.shamap > xrpld.shamap
+test.shamap > xrpl.nodestore
 test.shamap > xrpl.protocol
+test.shamap > xrpl.shamap
 test.toplevel > test.csf
 test.toplevel > xrpl.json
 test.unit_test > xrpl.basics
@@ -144,6 +150,8 @@ xrpl.json > xrpl.basics
 xrpl.ledger > xrpl.basics
 xrpl.ledger > xrpl.protocol
 xrpl.net > xrpl.basics
+xrpl.nodestore > xrpl.basics
+xrpl.nodestore > xrpl.protocol
 xrpl.protocol > xrpl.basics
 xrpl.protocol > xrpl.json
 xrpl.resource > xrpl.basics
@@ -152,17 +160,21 @@ xrpl.resource > xrpl.protocol
 xrpl.server > xrpl.basics
 xrpl.server > xrpl.json
 xrpl.server > xrpl.protocol
+xrpl.shamap > xrpl.basics
+xrpl.shamap > xrpl.nodestore
+xrpl.shamap > xrpl.protocol
 xrpld.app > test.unit_test
 xrpld.app > xrpl.basics
 xrpld.app > xrpld.conditions
 xrpld.app > xrpld.consensus
-xrpld.app > xrpld.nodestore
 xrpld.app > xrpld.perflog
 xrpld.app > xrpl.json
 xrpld.app > xrpl.ledger
 xrpld.app > xrpl.net
+xrpld.app > xrpl.nodestore
 xrpld.app > xrpl.protocol
 xrpld.app > xrpl.resource
+xrpld.app > xrpl.shamap
 xrpld.conditions > xrpl.basics
 xrpld.conditions > xrpl.protocol
 xrpld.consensus > xrpl.basics
@@ -172,11 +184,6 @@ xrpld.core > xrpl.basics
 xrpld.core > xrpl.json
 xrpld.core > xrpl.net
 xrpld.core > xrpl.protocol
-xrpld.nodestore > xrpl.basics
-xrpld.nodestore > xrpld.core
-xrpld.nodestore > xrpld.unity
-xrpld.nodestore > xrpl.json
-xrpld.nodestore > xrpl.protocol
 xrpld.overlay > xrpl.basics
 xrpld.overlay > xrpld.core
 xrpld.overlay > xrpld.peerfinder
@@ -192,13 +199,11 @@ xrpld.perflog > xrpl.basics
 xrpld.perflog > xrpl.json
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpld.core
-xrpld.rpc > xrpld.nodestore
 xrpld.rpc > xrpl.json
 xrpld.rpc > xrpl.ledger
 xrpld.rpc > xrpl.net
+xrpld.rpc > xrpl.nodestore
 xrpld.rpc > xrpl.protocol
 xrpld.rpc > xrpl.resource
 xrpld.rpc > xrpl.server
-xrpld.shamap > xrpl.basics
-xrpld.shamap > xrpld.nodestore
-xrpld.shamap > xrpl.protocol
+xrpld.shamap > xrpl.shamap
diff --git a/cmake/RippledCore.cmake b/cmake/RippledCore.cmake
index 481b6e3cea..05bbde8463 100644
--- a/cmake/RippledCore.cmake
+++ b/cmake/RippledCore.cmake
@@ -53,14 +53,15 @@ add_library(xrpl.imports.main INTERFACE)
 
 target_link_libraries(xrpl.imports.main
   INTERFACE
-    LibArchive::LibArchive
-    OpenSSL::Crypto
-    Ripple::boost
-    Ripple::opts
-    Ripple::syslibs
     absl::random_random
     date::date
     ed25519::ed25519
+    LibArchive::LibArchive
+    OpenSSL::Crypto
+    Ripple::boost
+    Ripple::libs
+    Ripple::opts
+    Ripple::syslibs
     secp256k1::secp256k1
     xrpl.libpb
     xxHash::xxhash
@@ -111,6 +112,21 @@ target_link_libraries(xrpl.libxrpl.net PUBLIC
 add_module(xrpl server)
 target_link_libraries(xrpl.libxrpl.server PUBLIC xrpl.libxrpl.protocol)
 
+add_module(xrpl nodestore)
+target_link_libraries(xrpl.libxrpl.nodestore PUBLIC
+        xrpl.libxrpl.basics
+        xrpl.libxrpl.json
+        xrpl.libxrpl.protocol
+)
+
+add_module(xrpl shamap)
+target_link_libraries(xrpl.libxrpl.shamap PUBLIC
+        xrpl.libxrpl.basics
+        xrpl.libxrpl.crypto
+        xrpl.libxrpl.protocol
+        xrpl.libxrpl.nodestore
+)
+
 add_module(xrpl ledger)
 target_link_libraries(xrpl.libxrpl.ledger PUBLIC
   xrpl.libxrpl.basics
@@ -136,6 +152,8 @@ target_link_modules(xrpl PUBLIC
   protocol
   resource
   server
+  nodestore
+  shamap
   net
   ledger
 )
diff --git a/cmake/RippledInstall.cmake b/cmake/RippledInstall.cmake
index 50f09d5a4b..013e3f54b2 100644
--- a/cmake/RippledInstall.cmake
+++ b/cmake/RippledInstall.cmake
@@ -8,20 +8,23 @@ install (
   TARGETS
     common
     opts
-    ripple_syslibs
     ripple_boost
+    ripple_libs
+    ripple_syslibs
     xrpl.imports.main
     xrpl.libpb
+    xrpl.libxrpl
     xrpl.libxrpl.basics
     xrpl.libxrpl.beast
     xrpl.libxrpl.crypto
     xrpl.libxrpl.json
+    xrpl.libxrpl.ledger
+    xrpl.libxrpl.net
+    xrpl.libxrpl.nodestore
     xrpl.libxrpl.protocol
     xrpl.libxrpl.resource
-    xrpl.libxrpl.ledger
     xrpl.libxrpl.server
-    xrpl.libxrpl.net
-    xrpl.libxrpl
+    xrpl.libxrpl.shamap
     antithesis-sdk-cpp
   EXPORT RippleExports
   LIBRARY DESTINATION lib
diff --git a/src/xrpld/unity/rocksdb.h b/include/xrpl/basics/rocksdb.h
similarity index 100%
rename from src/xrpld/unity/rocksdb.h
rename to include/xrpl/basics/rocksdb.h
diff --git a/src/xrpld/nodestore/Backend.h b/include/xrpl/nodestore/Backend.h
similarity index 99%
rename from src/xrpld/nodestore/Backend.h
rename to include/xrpl/nodestore/Backend.h
index 1f9a62716c..23c0285a1d 100644
--- a/src/xrpld/nodestore/Backend.h
+++ b/include/xrpl/nodestore/Backend.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_BACKEND_H_INCLUDED
 #define RIPPLE_NODESTORE_BACKEND_H_INCLUDED
 
-#include <xrpld/nodestore/Types.h>
+#include <xrpl/nodestore/Types.h>
 
 #include <cstdint>
 
diff --git a/src/xrpld/nodestore/Database.h b/include/xrpl/nodestore/Database.h
similarity index 98%
rename from src/xrpld/nodestore/Database.h
rename to include/xrpl/nodestore/Database.h
index 403a5ea5ee..165d1f74c9 100644
--- a/src/xrpld/nodestore/Database.h
+++ b/include/xrpl/nodestore/Database.h
@@ -20,13 +20,12 @@
 #ifndef RIPPLE_NODESTORE_DATABASE_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASE_H_INCLUDED
 
-#include <xrpld/nodestore/Backend.h>
-#include <xrpld/nodestore/NodeObject.h>
-#include <xrpld/nodestore/Scheduler.h>
-
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/TaggedCache.ipp>
+#include <xrpl/nodestore/Backend.h>
+#include <xrpl/nodestore/NodeObject.h>
+#include <xrpl/nodestore/Scheduler.h>
 #include <xrpl/protocol/SystemParameters.h>
 
 #include <condition_variable>
diff --git a/src/xrpld/nodestore/DatabaseRotating.h b/include/xrpl/nodestore/DatabaseRotating.h
similarity index 98%
rename from src/xrpld/nodestore/DatabaseRotating.h
rename to include/xrpl/nodestore/DatabaseRotating.h
index 3e8c6a7d5f..f63e99401d 100644
--- a/src/xrpld/nodestore/DatabaseRotating.h
+++ b/include/xrpl/nodestore/DatabaseRotating.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED
 
-#include <xrpld/nodestore/Database.h>
+#include <xrpl/nodestore/Database.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/DummyScheduler.h b/include/xrpl/nodestore/DummyScheduler.h
similarity index 97%
rename from src/xrpld/nodestore/DummyScheduler.h
rename to include/xrpl/nodestore/DummyScheduler.h
index 4e6fab7827..0e9815f309 100644
--- a/src/xrpld/nodestore/DummyScheduler.h
+++ b/include/xrpl/nodestore/DummyScheduler.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED
 #define RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED
 
-#include <xrpld/nodestore/Scheduler.h>
+#include <xrpl/nodestore/Scheduler.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/Factory.h b/include/xrpl/nodestore/Factory.h
similarity index 97%
rename from src/xrpld/nodestore/Factory.h
rename to include/xrpl/nodestore/Factory.h
index b0768907da..a7ea4310fa 100644
--- a/src/xrpld/nodestore/Factory.h
+++ b/include/xrpl/nodestore/Factory.h
@@ -20,11 +20,10 @@
 #ifndef RIPPLE_NODESTORE_FACTORY_H_INCLUDED
 #define RIPPLE_NODESTORE_FACTORY_H_INCLUDED
 
-#include <xrpld/nodestore/Backend.h>
-#include <xrpld/nodestore/Scheduler.h>
-
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/nodestore/Backend.h>
+#include <xrpl/nodestore/Scheduler.h>
 
 #include <nudb/store.hpp>
 
diff --git a/src/xrpld/nodestore/Manager.h b/include/xrpl/nodestore/Manager.h
similarity index 97%
rename from src/xrpld/nodestore/Manager.h
rename to include/xrpl/nodestore/Manager.h
index 89ed165b48..bf5213a508 100644
--- a/src/xrpld/nodestore/Manager.h
+++ b/include/xrpl/nodestore/Manager.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NODESTORE_MANAGER_H_INCLUDED
 #define RIPPLE_NODESTORE_MANAGER_H_INCLUDED
 
-#include <xrpld/nodestore/DatabaseRotating.h>
-#include <xrpld/nodestore/Factory.h>
+#include <xrpl/nodestore/DatabaseRotating.h>
+#include <xrpl/nodestore/Factory.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/nodestore/NodeObject.h b/include/xrpl/nodestore/NodeObject.h
similarity index 100%
rename from src/xrpld/nodestore/NodeObject.h
rename to include/xrpl/nodestore/NodeObject.h
diff --git a/src/xrpld/nodestore/README.md b/include/xrpl/nodestore/README.md
similarity index 100%
rename from src/xrpld/nodestore/README.md
rename to include/xrpl/nodestore/README.md
diff --git a/src/xrpld/nodestore/Scheduler.h b/include/xrpl/nodestore/Scheduler.h
similarity index 98%
rename from src/xrpld/nodestore/Scheduler.h
rename to include/xrpl/nodestore/Scheduler.h
index 663db7eb74..fb4aa6bdfc 100644
--- a/src/xrpld/nodestore/Scheduler.h
+++ b/include/xrpl/nodestore/Scheduler.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED
 #define RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED
 
-#include <xrpld/nodestore/Task.h>
+#include <xrpl/nodestore/Task.h>
 
 #include <chrono>
 
diff --git a/src/xrpld/nodestore/Task.h b/include/xrpl/nodestore/Task.h
similarity index 100%
rename from src/xrpld/nodestore/Task.h
rename to include/xrpl/nodestore/Task.h
diff --git a/src/xrpld/nodestore/Types.h b/include/xrpl/nodestore/Types.h
similarity index 97%
rename from src/xrpld/nodestore/Types.h
rename to include/xrpl/nodestore/Types.h
index 5e22eb4ddf..ea17a8f1ae 100644
--- a/src/xrpld/nodestore/Types.h
+++ b/include/xrpl/nodestore/Types.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_TYPES_H_INCLUDED
 #define RIPPLE_NODESTORE_TYPES_H_INCLUDED
 
-#include <xrpld/nodestore/NodeObject.h>
+#include <xrpl/nodestore/NodeObject.h>
 
 #include <vector>
 
diff --git a/src/xrpld/nodestore/detail/BatchWriter.h b/include/xrpl/nodestore/detail/BatchWriter.h
similarity index 96%
rename from src/xrpld/nodestore/detail/BatchWriter.h
rename to include/xrpl/nodestore/detail/BatchWriter.h
index 15ba508f64..941ecdfe18 100644
--- a/src/xrpld/nodestore/detail/BatchWriter.h
+++ b/include/xrpl/nodestore/detail/BatchWriter.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED
 #define RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED
 
-#include <xrpld/nodestore/Scheduler.h>
-#include <xrpld/nodestore/Task.h>
-#include <xrpld/nodestore/Types.h>
+#include <xrpl/nodestore/Scheduler.h>
+#include <xrpl/nodestore/Task.h>
+#include <xrpl/nodestore/Types.h>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.h b/include/xrpl/nodestore/detail/DatabaseNodeImp.h
similarity index 99%
rename from src/xrpld/nodestore/detail/DatabaseNodeImp.h
rename to include/xrpl/nodestore/detail/DatabaseNodeImp.h
index 160bf92d5e..ff43bd253e 100644
--- a/src/xrpld/nodestore/detail/DatabaseNodeImp.h
+++ b/include/xrpl/nodestore/detail/DatabaseNodeImp.h
@@ -20,10 +20,9 @@
 #ifndef RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED
 
-#include <xrpld/nodestore/Database.h>
-
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/chrono.h>
+#include <xrpl/nodestore/Database.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DatabaseRotatingImp.h b/include/xrpl/nodestore/detail/DatabaseRotatingImp.h
similarity index 98%
rename from src/xrpld/nodestore/detail/DatabaseRotatingImp.h
rename to include/xrpl/nodestore/detail/DatabaseRotatingImp.h
index d9f114f503..0f81ac873c 100644
--- a/src/xrpld/nodestore/detail/DatabaseRotatingImp.h
+++ b/include/xrpl/nodestore/detail/DatabaseRotatingImp.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED
 
-#include <xrpld/nodestore/DatabaseRotating.h>
+#include <xrpl/nodestore/DatabaseRotating.h>
 
 #include <mutex>
 
diff --git a/src/xrpld/nodestore/detail/DecodedBlob.h b/include/xrpl/nodestore/detail/DecodedBlob.h
similarity index 98%
rename from src/xrpld/nodestore/detail/DecodedBlob.h
rename to include/xrpl/nodestore/detail/DecodedBlob.h
index d52f20c4ee..635f2a196b 100644
--- a/src/xrpld/nodestore/detail/DecodedBlob.h
+++ b/include/xrpl/nodestore/detail/DecodedBlob.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED
 #define RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED
 
-#include <xrpld/nodestore/NodeObject.h>
+#include <xrpl/nodestore/NodeObject.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/EncodedBlob.h b/include/xrpl/nodestore/detail/EncodedBlob.h
similarity index 99%
rename from src/xrpld/nodestore/detail/EncodedBlob.h
rename to include/xrpl/nodestore/detail/EncodedBlob.h
index a238f2b856..d1f465d0cd 100644
--- a/src/xrpld/nodestore/detail/EncodedBlob.h
+++ b/include/xrpl/nodestore/detail/EncodedBlob.h
@@ -20,9 +20,8 @@
 #ifndef RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED
 #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED
 
-#include <xrpld/nodestore/NodeObject.h>
-
 #include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/nodestore/NodeObject.h>
 
 #include <boost/align/align_up.hpp>
 
diff --git a/src/xrpld/nodestore/detail/ManagerImp.h b/include/xrpl/nodestore/detail/ManagerImp.h
similarity index 96%
rename from src/xrpld/nodestore/detail/ManagerImp.h
rename to include/xrpl/nodestore/detail/ManagerImp.h
index 92411cc760..e8ebbc3e11 100644
--- a/src/xrpld/nodestore/detail/ManagerImp.h
+++ b/include/xrpl/nodestore/detail/ManagerImp.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED
 
-#include <xrpld/nodestore/Manager.h>
+#include <xrpl/nodestore/Manager.h>
 
 namespace ripple {
 
@@ -39,7 +39,7 @@ public:
     static void
     missing_backend();
 
-    ManagerImp() = default;
+    ManagerImp();
 
     ~ManagerImp() = default;
 
diff --git a/src/xrpld/nodestore/detail/codec.h b/include/xrpl/nodestore/detail/codec.h
similarity index 99%
rename from src/xrpld/nodestore/detail/codec.h
rename to include/xrpl/nodestore/detail/codec.h
index 7bc3ab2caa..9c115277f8 100644
--- a/src/xrpld/nodestore/detail/codec.h
+++ b/include/xrpl/nodestore/detail/codec.h
@@ -23,11 +23,10 @@
 // Disable lz4 deprecation warning due to incompatibility with clang attributes
 #define LZ4_DISABLE_DEPRECATE_WARNINGS
 
-#include <xrpld/nodestore/NodeObject.h>
-#include <xrpld/nodestore/detail/varint.h>
-
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
+#include <xrpl/nodestore/NodeObject.h>
+#include <xrpl/nodestore/detail/varint.h>
 #include <xrpl/protocol/HashPrefix.h>
 
 #include <nudb/detail/field.hpp>
diff --git a/src/xrpld/nodestore/detail/varint.h b/include/xrpl/nodestore/detail/varint.h
similarity index 100%
rename from src/xrpld/nodestore/detail/varint.h
rename to include/xrpl/nodestore/detail/varint.h
diff --git a/src/xrpld/shamap/Family.h b/include/xrpl/shamap/Family.h
similarity index 95%
rename from src/xrpld/shamap/Family.h
rename to include/xrpl/shamap/Family.h
index eb04df05e4..5975321873 100644
--- a/src/xrpld/shamap/Family.h
+++ b/include/xrpl/shamap/Family.h
@@ -20,11 +20,10 @@
 #ifndef RIPPLE_SHAMAP_FAMILY_H_INCLUDED
 #define RIPPLE_SHAMAP_FAMILY_H_INCLUDED
 
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/shamap/FullBelowCache.h>
-#include <xrpld/shamap/TreeNodeCache.h>
-
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/shamap/FullBelowCache.h>
+#include <xrpl/shamap/TreeNodeCache.h>
 
 #include <cstdint>
 
diff --git a/src/xrpld/shamap/FullBelowCache.h b/include/xrpl/shamap/FullBelowCache.h
similarity index 100%
rename from src/xrpld/shamap/FullBelowCache.h
rename to include/xrpl/shamap/FullBelowCache.h
diff --git a/src/xrpld/shamap/README.md b/include/xrpl/shamap/README.md
similarity index 100%
rename from src/xrpld/shamap/README.md
rename to include/xrpl/shamap/README.md
diff --git a/src/xrpld/shamap/SHAMap.h b/include/xrpl/shamap/SHAMap.h
similarity index 98%
rename from src/xrpld/shamap/SHAMap.h
rename to include/xrpl/shamap/SHAMap.h
index 738cf96ecc..2bc003cd82 100644
--- a/src/xrpld/shamap/SHAMap.h
+++ b/include/xrpl/shamap/SHAMap.h
@@ -20,21 +20,19 @@
 #ifndef RIPPLE_SHAMAP_SHAMAP_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAP_H_INCLUDED
 
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/nodestore/NodeObject.h>
-#include <xrpld/shamap/Family.h>
-#include <xrpld/shamap/SHAMapAddNode.h>
-#include <xrpld/shamap/SHAMapInnerNode.h>
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapLeafNode.h>
-#include <xrpld/shamap/SHAMapMissingNode.h>
-#include <xrpld/shamap/SHAMapTreeNode.h>
-#include <xrpld/shamap/TreeNodeCache.h>
-
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/nodestore/NodeObject.h>
+#include <xrpl/shamap/Family.h>
+#include <xrpl/shamap/SHAMapAddNode.h>
+#include <xrpl/shamap/SHAMapInnerNode.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
+#include <xrpl/shamap/SHAMapMissingNode.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <set>
 #include <stack>
diff --git a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
similarity index 97%
rename from src/xrpld/shamap/SHAMapAccountStateLeafNode.h
rename to include/xrpl/shamap/SHAMapAccountStateLeafNode.h
index f6b5e0827c..a600ea222b 100644
--- a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
+++ b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
@@ -20,12 +20,11 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapLeafNode.h>
-
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/SHAMapAddNode.h b/include/xrpl/shamap/SHAMapAddNode.h
similarity index 100%
rename from src/xrpld/shamap/SHAMapAddNode.h
rename to include/xrpl/shamap/SHAMapAddNode.h
diff --git a/src/xrpld/shamap/SHAMapInnerNode.h b/include/xrpl/shamap/SHAMapInnerNode.h
similarity index 98%
rename from src/xrpld/shamap/SHAMapInnerNode.h
rename to include/xrpl/shamap/SHAMapInnerNode.h
index 5c064fd9da..58d7392cf4 100644
--- a/src/xrpld/shamap/SHAMapInnerNode.h
+++ b/include/xrpl/shamap/SHAMapInnerNode.h
@@ -20,10 +20,9 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapNodeID.h>
-#include <xrpld/shamap/detail/TaggedPointer.h>
-
 #include <xrpl/basics/IntrusivePointer.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
+#include <xrpl/shamap/detail/TaggedPointer.h>
 
 #include <atomic>
 #include <cstdint>
diff --git a/src/xrpld/shamap/SHAMapItem.h b/include/xrpl/shamap/SHAMapItem.h
similarity index 100%
rename from src/xrpld/shamap/SHAMapItem.h
rename to include/xrpl/shamap/SHAMapItem.h
diff --git a/src/xrpld/shamap/SHAMapLeafNode.h b/include/xrpl/shamap/SHAMapLeafNode.h
similarity index 96%
rename from src/xrpld/shamap/SHAMapLeafNode.h
rename to include/xrpl/shamap/SHAMapLeafNode.h
index 383da38fd4..5c853d6127 100644
--- a/src/xrpld/shamap/SHAMapLeafNode.h
+++ b/include/xrpl/shamap/SHAMapLeafNode.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapTreeNode.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <cstdint>
 
diff --git a/src/xrpld/shamap/SHAMapMissingNode.h b/include/xrpl/shamap/SHAMapMissingNode.h
similarity index 98%
rename from src/xrpld/shamap/SHAMapMissingNode.h
rename to include/xrpl/shamap/SHAMapMissingNode.h
index 73ffe0090a..c41e6f2602 100644
--- a/src/xrpld/shamap/SHAMapMissingNode.h
+++ b/include/xrpl/shamap/SHAMapMissingNode.h
@@ -20,9 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapTreeNode.h>
-
 #include <xrpl/basics/base_uint.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <iosfwd>
 #include <stdexcept>
diff --git a/src/xrpld/shamap/SHAMapNodeID.h b/include/xrpl/shamap/SHAMapNodeID.h
similarity index 100%
rename from src/xrpld/shamap/SHAMapNodeID.h
rename to include/xrpl/shamap/SHAMapNodeID.h
diff --git a/src/xrpld/shamap/SHAMapSyncFilter.h b/include/xrpl/shamap/SHAMapSyncFilter.h
similarity index 97%
rename from src/xrpld/shamap/SHAMapSyncFilter.h
rename to include/xrpl/shamap/SHAMapSyncFilter.h
index a2ac2f99e8..43d5941466 100644
--- a/src/xrpld/shamap/SHAMapSyncFilter.h
+++ b/include/xrpl/shamap/SHAMapSyncFilter.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapTreeNode.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <optional>
 
diff --git a/src/xrpld/shamap/SHAMapTreeNode.h b/include/xrpl/shamap/SHAMapTreeNode.h
similarity index 98%
rename from src/xrpld/shamap/SHAMapTreeNode.h
rename to include/xrpl/shamap/SHAMapTreeNode.h
index 2c4a349019..c1351112c2 100644
--- a/src/xrpld/shamap/SHAMapTreeNode.h
+++ b/include/xrpl/shamap/SHAMapTreeNode.h
@@ -20,13 +20,12 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapNodeID.h>
-
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/IntrusiveRefCounts.h>
 #include <xrpl/basics/SHAMapHash.h>
 #include <xrpl/protocol/Serializer.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
 
 #include <cstdint>
 #include <string>
diff --git a/src/xrpld/shamap/SHAMapTxLeafNode.h b/include/xrpl/shamap/SHAMapTxLeafNode.h
similarity index 97%
rename from src/xrpld/shamap/SHAMapTxLeafNode.h
rename to include/xrpl/shamap/SHAMapTxLeafNode.h
index 50f426a581..f5b406d1de 100644
--- a/src/xrpld/shamap/SHAMapTxLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxLeafNode.h
@@ -20,12 +20,11 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapLeafNode.h>
-
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
similarity index 97%
rename from src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
rename to include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
index cc34d8f4ae..f14726b0f2 100644
--- a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
@@ -20,12 +20,11 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapLeafNode.h>
-
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/TreeNodeCache.h b/include/xrpl/shamap/TreeNodeCache.h
similarity index 97%
rename from src/xrpld/shamap/TreeNodeCache.h
rename to include/xrpl/shamap/TreeNodeCache.h
index b41ae5e99e..e1c612586e 100644
--- a/src/xrpld/shamap/TreeNodeCache.h
+++ b/include/xrpl/shamap/TreeNodeCache.h
@@ -20,10 +20,9 @@
 #ifndef RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED
 #define RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapTreeNode.h>
-
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/TaggedCache.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/TaggedPointer.h b/include/xrpl/shamap/detail/TaggedPointer.h
similarity index 99%
rename from src/xrpld/shamap/detail/TaggedPointer.h
rename to include/xrpl/shamap/detail/TaggedPointer.h
index 11ab1f57fc..54aef85fa6 100644
--- a/src/xrpld/shamap/detail/TaggedPointer.h
+++ b/include/xrpl/shamap/detail/TaggedPointer.h
@@ -20,9 +20,8 @@
 #ifndef RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED
 #define RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED
 
-#include <xrpld/shamap/SHAMapTreeNode.h>
-
 #include <xrpl/basics/IntrusivePointer.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <array>
 #include <cstdint>
diff --git a/src/xrpld/shamap/detail/TaggedPointer.ipp b/include/xrpl/shamap/detail/TaggedPointer.ipp
similarity index 99%
rename from src/xrpld/shamap/detail/TaggedPointer.ipp
rename to include/xrpl/shamap/detail/TaggedPointer.ipp
index f5d40f24fa..3efcfb6ffe 100644
--- a/src/xrpld/shamap/detail/TaggedPointer.ipp
+++ b/include/xrpl/shamap/detail/TaggedPointer.ipp
@@ -17,10 +17,9 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMapInnerNode.h>
-#include <xrpld/shamap/detail/TaggedPointer.h>
-
 #include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/shamap/SHAMapInnerNode.h>
+#include <xrpl/shamap/detail/TaggedPointer.h>
 
 #include <boost/pool/pool_alloc.hpp>
 
diff --git a/src/xrpld/nodestore/detail/BatchWriter.cpp b/src/libxrpl/nodestore/BatchWriter.cpp
similarity index 98%
rename from src/xrpld/nodestore/detail/BatchWriter.cpp
rename to src/libxrpl/nodestore/BatchWriter.cpp
index 9fd90f82e7..14947b5d21 100644
--- a/src/xrpld/nodestore/detail/BatchWriter.cpp
+++ b/src/libxrpl/nodestore/BatchWriter.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/BatchWriter.h>
+#include <xrpl/nodestore/detail/BatchWriter.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/Database.cpp b/src/libxrpl/nodestore/Database.cpp
similarity index 99%
rename from src/xrpld/nodestore/detail/Database.cpp
rename to src/libxrpl/nodestore/Database.cpp
index 4edafcddca..14f3299d1f 100644
--- a/src/xrpld/nodestore/detail/Database.cpp
+++ b/src/libxrpl/nodestore/Database.cpp
@@ -17,11 +17,10 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/Database.h>
-
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/nodestore/Database.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
similarity index 99%
rename from src/xrpld/nodestore/detail/DatabaseNodeImp.cpp
rename to src/libxrpl/nodestore/DatabaseNodeImp.cpp
index 2502d52815..99b27f25b1 100644
--- a/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
+#include <xrpl/nodestore/detail/DatabaseNodeImp.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
similarity index 99%
rename from src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp
rename to src/libxrpl/nodestore/DatabaseRotatingImp.cpp
index a4828ab2c2..60a25ff870 100644
--- a/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
+#include <xrpl/nodestore/detail/DatabaseRotatingImp.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DecodedBlob.cpp b/src/libxrpl/nodestore/DecodedBlob.cpp
similarity index 98%
rename from src/xrpld/nodestore/detail/DecodedBlob.cpp
rename to src/libxrpl/nodestore/DecodedBlob.cpp
index adec27a68f..6d3019dc20 100644
--- a/src/xrpld/nodestore/detail/DecodedBlob.cpp
+++ b/src/libxrpl/nodestore/DecodedBlob.cpp
@@ -17,10 +17,9 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/DecodedBlob.h>
-
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/nodestore/detail/DecodedBlob.h>
 
 #include <algorithm>
 
diff --git a/src/xrpld/nodestore/detail/DummyScheduler.cpp b/src/libxrpl/nodestore/DummyScheduler.cpp
similarity index 96%
rename from src/xrpld/nodestore/detail/DummyScheduler.cpp
rename to src/libxrpl/nodestore/DummyScheduler.cpp
index 9df1374189..a70c2f35a4 100644
--- a/src/xrpld/nodestore/detail/DummyScheduler.cpp
+++ b/src/libxrpl/nodestore/DummyScheduler.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/DummyScheduler.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/ManagerImp.cpp b/src/libxrpl/nodestore/ManagerImp.cpp
similarity index 81%
rename from src/xrpld/nodestore/detail/ManagerImp.cpp
rename to src/libxrpl/nodestore/ManagerImp.cpp
index 24371dd58c..94abfd9aed 100644
--- a/src/xrpld/nodestore/detail/ManagerImp.cpp
+++ b/src/libxrpl/nodestore/ManagerImp.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
-#include <xrpld/nodestore/detail/ManagerImp.h>
+#include <xrpl/nodestore/detail/DatabaseNodeImp.h>
+#include <xrpl/nodestore/detail/ManagerImp.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 
@@ -41,6 +41,27 @@ ManagerImp::missing_backend()
         "please see the rippled-example.cfg file!");
 }
 
+// We shouldn't rely on global variables for lifetime management because their
+// lifetime is not well-defined. ManagerImp may get destroyed before the Factory
+// classes, and then, calling Manager::instance().erase() in the destructors of
+// the Factory classes is an undefined behaviour.
+void
+registerNuDBFactory(Manager& manager);
+void
+registerRocksDBFactory(Manager& manager);
+void
+registerNullFactory(Manager& manager);
+void
+registerMemoryFactory(Manager& manager);
+
+ManagerImp::ManagerImp()
+{
+    registerNuDBFactory(*this);
+    registerRocksDBFactory(*this);
+    registerNullFactory(*this);
+    registerMemoryFactory(*this);
+}
+
 std::unique_ptr<Backend>
 ManagerImp::make_Backend(
     Section const& parameters,
diff --git a/src/xrpld/nodestore/detail/NodeObject.cpp b/src/libxrpl/nodestore/NodeObject.cpp
similarity index 97%
rename from src/xrpld/nodestore/detail/NodeObject.cpp
rename to src/libxrpl/nodestore/NodeObject.cpp
index 0e81c047c6..6cf69ac87f 100644
--- a/src/xrpld/nodestore/detail/NodeObject.cpp
+++ b/src/libxrpl/nodestore/NodeObject.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/NodeObject.h>
+#include <xrpl/nodestore/NodeObject.h>
 
 #include <memory>
 
diff --git a/src/xrpld/nodestore/backend/MemoryFactory.cpp b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
similarity index 92%
rename from src/xrpld/nodestore/backend/MemoryFactory.cpp
rename to src/libxrpl/nodestore/backend/MemoryFactory.cpp
index dc3106cc91..c45debe1d0 100644
--- a/src/xrpld/nodestore/backend/MemoryFactory.cpp
+++ b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
@@ -17,10 +17,9 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/Factory.h>
-#include <xrpld/nodestore/Manager.h>
-
 #include <xrpl/basics/contract.h>
+#include <xrpl/nodestore/Factory.h>
+#include <xrpl/nodestore/Manager.h>
 
 #include <boost/beast/core/string.hpp>
 #include <boost/core/ignore_unused.hpp>
@@ -46,10 +45,10 @@ class MemoryFactory : public Factory
 private:
     std::mutex mutex_;
     std::map<std::string, MemoryDB, boost::beast::iless> map_;
+    Manager& manager_;
 
 public:
-    MemoryFactory();
-    ~MemoryFactory() override;
+    explicit MemoryFactory(Manager& manager);
 
     std::string
     getName() const override;
@@ -75,7 +74,14 @@ public:
     }
 };
 
-static MemoryFactory memoryFactory;
+MemoryFactory* memoryFactory = nullptr;
+
+void
+registerMemoryFactory(Manager& manager)
+{
+    static MemoryFactory instance{manager};
+    memoryFactory = &instance;
+}
 
 //------------------------------------------------------------------------------
 
@@ -112,9 +118,9 @@ public:
     }
 
     void
-    open(bool createIfMissing) override
+    open(bool) override
     {
-        db_ = &memoryFactory.open(name_);
+        db_ = &memoryFactory->open(name_);
     }
 
     bool
@@ -219,14 +225,9 @@ public:
 
 //------------------------------------------------------------------------------
 
-MemoryFactory::MemoryFactory()
+MemoryFactory::MemoryFactory(Manager& manager) : manager_(manager)
 {
-    Manager::instance().insert(*this);
-}
-
-MemoryFactory::~MemoryFactory()
-{
-    Manager::instance().erase(*this);
+    manager_.insert(*this);
 }
 
 std::string
diff --git a/src/xrpld/nodestore/backend/NuDBFactory.cpp b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
similarity index 96%
rename from src/xrpld/nodestore/backend/NuDBFactory.cpp
rename to src/libxrpl/nodestore/backend/NuDBFactory.cpp
index 9f8217f6bf..0202dfc4e9 100644
--- a/src/xrpld/nodestore/backend/NuDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
@@ -17,15 +17,14 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/Factory.h>
-#include <xrpld/nodestore/Manager.h>
-#include <xrpld/nodestore/detail/DecodedBlob.h>
-#include <xrpld/nodestore/detail/EncodedBlob.h>
-#include <xrpld/nodestore/detail/codec.h>
-
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/nodestore/Factory.h>
+#include <xrpl/nodestore/Manager.h>
+#include <xrpl/nodestore/detail/DecodedBlob.h>
+#include <xrpl/nodestore/detail/EncodedBlob.h>
+#include <xrpl/nodestore/detail/codec.h>
 
 #include <boost/filesystem.hpp>
 
@@ -427,15 +426,13 @@ private:
 
 class NuDBFactory : public Factory
 {
-public:
-    NuDBFactory()
-    {
-        Manager::instance().insert(*this);
-    }
+private:
+    Manager& manager_;
 
-    ~NuDBFactory() override
+public:
+    explicit NuDBFactory(Manager& manager) : manager_(manager)
     {
-        Manager::instance().erase(*this);
+        manager_.insert(*this);
     }
 
     std::string
@@ -470,7 +467,11 @@ public:
     }
 };
 
-static NuDBFactory nuDBFactory;
+void
+registerNuDBFactory(Manager& manager)
+{
+    static NuDBFactory instance{manager};
+}
 
 }  // namespace NodeStore
 }  // namespace ripple
diff --git a/src/xrpld/nodestore/backend/NullFactory.cpp b/src/libxrpl/nodestore/backend/NullFactory.cpp
similarity index 90%
rename from src/xrpld/nodestore/backend/NullFactory.cpp
rename to src/libxrpl/nodestore/backend/NullFactory.cpp
index 5aae8ca7cf..6408e4aad5 100644
--- a/src/xrpld/nodestore/backend/NullFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NullFactory.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/Factory.h>
-#include <xrpld/nodestore/Manager.h>
+#include <xrpl/nodestore/Factory.h>
+#include <xrpl/nodestore/Manager.h>
 
 #include <memory>
 
@@ -111,15 +111,13 @@ private:
 
 class NullFactory : public Factory
 {
-public:
-    NullFactory()
-    {
-        Manager::instance().insert(*this);
-    }
+private:
+    Manager& manager_;
 
-    ~NullFactory() override
+public:
+    explicit NullFactory(Manager& manager) : manager_(manager)
     {
-        Manager::instance().erase(*this);
+        manager_.insert(*this);
     }
 
     std::string
@@ -140,7 +138,11 @@ public:
     }
 };
 
-static NullFactory nullFactory;
+void
+registerNullFactory(Manager& manager)
+{
+    static NullFactory instance{manager};
+}
 
 }  // namespace NodeStore
 }  // namespace ripple
diff --git a/src/xrpld/nodestore/backend/RocksDBFactory.cpp b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
similarity index 96%
rename from src/xrpld/nodestore/backend/RocksDBFactory.cpp
rename to src/libxrpl/nodestore/backend/RocksDBFactory.cpp
index 57c136a10a..68fef494b6 100644
--- a/src/xrpld/nodestore/backend/RocksDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
@@ -17,20 +17,18 @@
 */
 //==============================================================================
 
-#include <xrpld/unity/rocksdb.h>
+#include <xrpl/basics/rocksdb.h>
 
 #if RIPPLE_ROCKSDB_AVAILABLE
-#include <xrpld/core/Config.h>  // VFALCO Bad dependency
-#include <xrpld/nodestore/Factory.h>
-#include <xrpld/nodestore/Manager.h>
-#include <xrpld/nodestore/detail/BatchWriter.h>
-#include <xrpld/nodestore/detail/DecodedBlob.h>
-#include <xrpld/nodestore/detail/EncodedBlob.h>
-
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/nodestore/Factory.h>
+#include <xrpl/nodestore/Manager.h>
+#include <xrpl/nodestore/detail/BatchWriter.h>
+#include <xrpl/nodestore/detail/DecodedBlob.h>
+#include <xrpl/nodestore/detail/EncodedBlob.h>
 
 #include <atomic>
 #include <memory>
@@ -461,17 +459,15 @@ public:
 
 class RocksDBFactory : public Factory
 {
+private:
+    Manager& manager_;
+
 public:
     RocksDBEnv m_env;
 
-    RocksDBFactory()
+    RocksDBFactory(Manager& manager) : manager_(manager)
     {
-        Manager::instance().insert(*this);
-    }
-
-    ~RocksDBFactory() override
-    {
-        Manager::instance().erase(*this);
+        manager_.insert(*this);
     }
 
     std::string
@@ -493,7 +489,11 @@ public:
     }
 };
 
-static RocksDBFactory rocksDBFactory;
+void
+registerRocksDBFactory(Manager& manager)
+{
+    static RocksDBFactory instance{manager};
+}
 
 }  // namespace NodeStore
 }  // namespace ripple
diff --git a/src/xrpld/shamap/detail/SHAMap.cpp b/src/libxrpl/shamap/SHAMap.cpp
similarity index 99%
rename from src/xrpld/shamap/detail/SHAMap.cpp
rename to src/libxrpl/shamap/SHAMap.cpp
index 026149be56..4d2100ceab 100644
--- a/src/xrpld/shamap/detail/SHAMap.cpp
+++ b/src/libxrpl/shamap/SHAMap.cpp
@@ -17,15 +17,14 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMap.h>
-#include <xrpld/shamap/SHAMapAccountStateLeafNode.h>
-#include <xrpld/shamap/SHAMapNodeID.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
-#include <xrpld/shamap/SHAMapTxLeafNode.h>
-#include <xrpld/shamap/SHAMapTxPlusMetaLeafNode.h>
-
 #include <xrpl/basics/TaggedCache.ipp>
 #include <xrpl/basics/contract.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapAccountStateLeafNode.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
+#include <xrpl/shamap/SHAMapTxLeafNode.h>
+#include <xrpl/shamap/SHAMapTxPlusMetaLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapDelta.cpp b/src/libxrpl/shamap/SHAMapDelta.cpp
similarity index 99%
rename from src/xrpld/shamap/detail/SHAMapDelta.cpp
rename to src/libxrpl/shamap/SHAMapDelta.cpp
index ebdaffad14..2fc3152fc3 100644
--- a/src/xrpld/shamap/detail/SHAMapDelta.cpp
+++ b/src/libxrpl/shamap/SHAMapDelta.cpp
@@ -17,10 +17,9 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMap.h>
-
 #include <xrpl/basics/IntrusivePointer.ipp>
 #include <xrpl/basics/contract.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <array>
 #include <stack>
diff --git a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp b/src/libxrpl/shamap/SHAMapInnerNode.cpp
similarity index 99%
rename from src/xrpld/shamap/detail/SHAMapInnerNode.cpp
rename to src/libxrpl/shamap/SHAMapInnerNode.cpp
index 6e9d447cf6..1b55887098 100644
--- a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
+++ b/src/libxrpl/shamap/SHAMapInnerNode.cpp
@@ -17,16 +17,15 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMapInnerNode.h>
-#include <xrpld/shamap/SHAMapTreeNode.h>
-#include <xrpld/shamap/detail/TaggedPointer.ipp>
-
 #include <xrpl/basics/IntrusivePointer.ipp>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/spinlock.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMapInnerNode.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
+#include <xrpl/shamap/detail/TaggedPointer.ipp>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp b/src/libxrpl/shamap/SHAMapLeafNode.cpp
similarity index 98%
rename from src/xrpld/shamap/detail/SHAMapLeafNode.cpp
rename to src/libxrpl/shamap/SHAMapLeafNode.cpp
index 10d61ff138..a6ba55a2c7 100644
--- a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp
+++ b/src/libxrpl/shamap/SHAMapLeafNode.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMapLeafNode.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapNodeID.cpp b/src/libxrpl/shamap/SHAMapNodeID.cpp
similarity index 98%
rename from src/xrpld/shamap/detail/SHAMapNodeID.cpp
rename to src/libxrpl/shamap/SHAMapNodeID.cpp
index efe4f95936..189a127620 100644
--- a/src/xrpld/shamap/detail/SHAMapNodeID.cpp
+++ b/src/libxrpl/shamap/SHAMapNodeID.cpp
@@ -17,12 +17,11 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMap.h>
-#include <xrpld/shamap/SHAMapNodeID.h>
-
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Serializer.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapSync.cpp b/src/libxrpl/shamap/SHAMapSync.cpp
similarity index 99%
rename from src/xrpld/shamap/detail/SHAMapSync.cpp
rename to src/libxrpl/shamap/SHAMapSync.cpp
index 8a7d75ccf8..e6049f1083 100644
--- a/src/xrpld/shamap/detail/SHAMapSync.cpp
+++ b/src/libxrpl/shamap/SHAMapSync.cpp
@@ -17,11 +17,10 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMap.h>
-#include <xrpld/shamap/SHAMapLeafNode.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
-
 #include <xrpl/basics/random.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp b/src/libxrpl/shamap/SHAMapTreeNode.cpp
similarity index 95%
rename from src/xrpld/shamap/detail/SHAMapTreeNode.cpp
rename to src/libxrpl/shamap/SHAMapTreeNode.cpp
index d1e74fd6a7..049a4da80f 100644
--- a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
+++ b/src/libxrpl/shamap/SHAMapTreeNode.cpp
@@ -17,18 +17,17 @@
 */
 //==============================================================================
 
-#include <xrpld/shamap/SHAMapAccountStateLeafNode.h>
-#include <xrpld/shamap/SHAMapInnerNode.h>
-#include <xrpld/shamap/SHAMapTreeNode.h>
-#include <xrpld/shamap/SHAMapTxLeafNode.h>
-#include <xrpld/shamap/SHAMapTxPlusMetaLeafNode.h>
-
 #include <xrpl/basics/IntrusivePointer.ipp>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMapAccountStateLeafNode.h>
+#include <xrpl/shamap/SHAMapInnerNode.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
+#include <xrpl/shamap/SHAMapTxLeafNode.h>
+#include <xrpl/shamap/SHAMapTxPlusMetaLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index 1e0ec4bcf0..29fbc8022c 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -25,8 +25,8 @@
 #include <xrpld/app/misc/SHAMapStore.h>
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/core/ConfigSections.h>
-#include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
 
+#include <xrpl/nodestore/detail/DatabaseRotatingImp.h>
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index f161f7a0c0..af5559b00f 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -20,12 +20,11 @@
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/nodestore/DummyScheduler.h>
-#include <xrpld/nodestore/Manager.h>
-#include <xrpld/unity/rocksdb.h>
-
 #include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/rocksdb.h>
 #include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/Manager.h>
 
 #include <algorithm>
 
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index d781bb0c78..0057d2658a 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -19,8 +19,8 @@
 
 #include <test/nodestore/TestBase.h>
 
-#include <xrpld/nodestore/detail/DecodedBlob.h>
-#include <xrpld/nodestore/detail/EncodedBlob.h>
+#include <xrpl/nodestore/detail/DecodedBlob.h>
+#include <xrpl/nodestore/detail/EncodedBlob.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index 5ecb5b94e8..a47dfeab1a 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -24,10 +24,10 @@
 #include <test/unit_test/SuiteJournal.h>
 
 #include <xrpld/core/DatabaseCon.h>
-#include <xrpld/nodestore/DummyScheduler.h>
-#include <xrpld/nodestore/Manager.h>
 
 #include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/Manager.h>
 
 namespace ripple {
 
diff --git a/src/test/nodestore/NuDBFactory_test.cpp b/src/test/nodestore/NuDBFactory_test.cpp
index db7d0d2999..387c83a446 100644
--- a/src/test/nodestore/NuDBFactory_test.cpp
+++ b/src/test/nodestore/NuDBFactory_test.cpp
@@ -20,12 +20,11 @@
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/nodestore/DummyScheduler.h>
-#include <xrpld/nodestore/Manager.h>
-
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/Manager.h>
 
 #include <memory>
 #include <sstream>
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index 634f2bf005..8c44e9d918 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -20,15 +20,14 @@
 #ifndef RIPPLE_NODESTORE_BASE_H_INCLUDED
 #define RIPPLE_NODESTORE_BASE_H_INCLUDED
 
-#include <xrpld/nodestore/Backend.h>
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/nodestore/Types.h>
-
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/utility/rngfill.h>
 #include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/nodestore/Backend.h>
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/nodestore/Types.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 1ba5903cbe..b2acb8eac3 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -20,9 +20,6 @@
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/nodestore/DummyScheduler.h>
-#include <xrpld/nodestore/Manager.h>
-
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/safe_cast.h>
@@ -30,6 +27,8 @@
 #include <xrpl/beast/unit_test/thread.h>
 #include <xrpl/beast/utility/temp_dir.h>
 #include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/Manager.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index ea5f23548a..3aeacb35f0 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -17,14 +17,13 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/codec.h>
-#include <xrpld/unity/rocksdb.h>
-
 #include <xrpl/basics/contract.h>
+#include <xrpl/basics/rocksdb.h>
 #include <xrpl/beast/clock/basic_seconds_clock.h>
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/rfc2616.h>
 #include <xrpl/beast/unit_test.h>
+#include <xrpl/nodestore/detail/codec.h>
 
 #include <boost/beast/core/string.hpp>
 #include <boost/regex.hpp>
diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp
index f047616d79..3baf3c6d67 100644
--- a/src/test/nodestore/varint_test.cpp
+++ b/src/test/nodestore/varint_test.cpp
@@ -17,9 +17,8 @@
 */
 //==============================================================================
 
-#include <xrpld/nodestore/detail/varint.h>
-
 #include <xrpl/beast/unit_test.h>
+#include <xrpl/nodestore/detail/varint.h>
 
 #include <array>
 #include <vector>
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index 4bfbcae4f0..9c1ec7cd3d 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -30,7 +30,6 @@
 #include <xrpld/overlay/detail/Handshake.h>
 #include <xrpld/overlay/detail/ProtocolMessage.h>
 #include <xrpld/overlay/detail/ZeroCopyStream.h>
-#include <xrpld/shamap/SHAMapNodeID.h>
 
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
@@ -42,6 +41,7 @@
 #include <xrpl/protocol/digest.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/messages.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
 
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index 04385f9441..7ee5c6730a 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -20,15 +20,14 @@
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/shamap/SHAMap.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
-
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/xor_shift_engine.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
 
 #include <functional>
 #include <stdexcept>
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index c3af07f036..05fc265ff9 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -20,12 +20,11 @@
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/shamap/SHAMap.h>
-#include <xrpld/shamap/SHAMapItem.h>
-
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapItem.h>
 
 namespace ripple {
 namespace tests {
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 1a15310b58..462b42b6cb 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -20,12 +20,11 @@
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
 
-#include <xrpld/shamap/SHAMap.h>
-
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 namespace tests {
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index 47308a82f8..6c7fcf4c39 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -20,11 +20,10 @@
 #ifndef RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 #define RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 
-#include <xrpld/nodestore/DummyScheduler.h>
-#include <xrpld/nodestore/Manager.h>
-#include <xrpld/shamap/Family.h>
-
 #include <xrpl/basics/chrono.h>
+#include <xrpl/nodestore/DummyScheduler.h>
+#include <xrpl/nodestore/Manager.h>
+#include <xrpl/shamap/Family.h>
 
 namespace ripple {
 namespace tests {
diff --git a/src/xrpld/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h
index 7cdf15949d..f291c6c31b 100644
--- a/src/xrpld/app/consensus/RCLCensorshipDetector.h
+++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h
@@ -20,9 +20,8 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
 
-#include <xrpld/shamap/SHAMap.h>
-
 #include <xrpl/basics/algorithm.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <algorithm>
 #include <utility>
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index 38481d2363..19568fca82 100644
--- a/src/xrpld/app/consensus/RCLConsensus.h
+++ b/src/xrpld/app/consensus/RCLConsensus.h
@@ -28,10 +28,10 @@
 #include <xrpld/app/misc/NegativeUNLVote.h>
 #include <xrpld/consensus/Consensus.h>
 #include <xrpld/core/JobQueue.h>
-#include <xrpld/shamap/SHAMap.h>
 
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <atomic>
 #include <memory>
diff --git a/src/xrpld/app/consensus/RCLCxTx.h b/src/xrpld/app/consensus/RCLCxTx.h
index baa0899f02..94f43113a8 100644
--- a/src/xrpld/app/consensus/RCLCxTx.h
+++ b/src/xrpld/app/consensus/RCLCxTx.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED
 
-#include <xrpld/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/AccountStateSF.h b/src/xrpld/app/ledger/AccountStateSF.h
index 16cc686e3d..8a4e594f4a 100644
--- a/src/xrpld/app/ledger/AccountStateSF.h
+++ b/src/xrpld/app/ledger/AccountStateSF.h
@@ -21,8 +21,9 @@
 #define RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED
 
 #include <xrpld/app/ledger/AbstractFetchPackContainer.h>
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
+
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
index e62426b720..7d83b4c201 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
@@ -22,9 +22,9 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/core/JobQueue.h>
-#include <xrpld/nodestore/Database.h>
 
 #include <xrpl/basics/Log.h>
+#include <xrpl/nodestore/Database.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
 
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h
index 4a68f577ad..11add63db0 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.h
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h
@@ -21,9 +21,9 @@
 #define RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED
 
 #include <xrpld/app/main/Application.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
 
 #include <xrpl/basics/TaggedCache.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h
index 6feee44004..fc39f195ab 100644
--- a/src/xrpld/app/ledger/InboundTransactions.h
+++ b/src/xrpld/app/ledger/InboundTransactions.h
@@ -21,9 +21,9 @@
 #define RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED
 
 #include <xrpld/overlay/Peer.h>
-#include <xrpld/shamap/SHAMap.h>
 
 #include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <memory>
 
diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp
index 64a6b16cbc..cf99fbfaac 100644
--- a/src/xrpld/app/ledger/Ledger.cpp
+++ b/src/xrpld/app/ledger/Ledger.cpp
@@ -28,13 +28,13 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/core/SociDB.h>
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/to_string.h>
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/nodestore/detail/DatabaseNodeImp.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h
index 552f59ff19..5b74ee242a 100644
--- a/src/xrpld/app/ledger/Ledger.h
+++ b/src/xrpld/app/ledger/Ledger.h
@@ -22,7 +22,6 @@
 
 #include <xrpld/core/Config.h>
 #include <xrpld/core/TimeKeeper.h>
-#include <xrpld/shamap/SHAMap.h>
 
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -32,6 +31,7 @@
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxMeta.h>
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h
index f6993dc0e8..13e968e2f5 100644
--- a/src/xrpld/app/ledger/TransactionMaster.h
+++ b/src/xrpld/app/ledger/TransactionMaster.h
@@ -21,12 +21,12 @@
 #define RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED
 
 #include <xrpld/app/misc/Transaction.h>
-#include <xrpld/shamap/SHAMapItem.h>
-#include <xrpld/shamap/SHAMapTreeNode.h>
 
 #include <xrpl/basics/RangeSet.h>
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/TransactionStateSF.h b/src/xrpld/app/ledger/TransactionStateSF.h
index 721f187062..64dfed7142 100644
--- a/src/xrpld/app/ledger/TransactionStateSF.h
+++ b/src/xrpld/app/ledger/TransactionStateSF.h
@@ -21,8 +21,9 @@
 #define RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED
 
 #include <xrpld/app/ledger/AbstractFetchPackContainer.h>
-#include <xrpld/nodestore/Database.h>
-#include <xrpld/shamap/SHAMapSyncFilter.h>
+
+#include <xrpl/nodestore/Database.h>
+#include <xrpl/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index 47d546c3af..9bebb1ed38 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -25,12 +25,12 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/overlay/Overlay.h>
-#include <xrpld/shamap/SHAMapNodeID.h>
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/Fees.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
 
 #include <boost/iterator/function_output_iterator.hpp>
 
diff --git a/src/xrpld/app/ledger/detail/SkipListAcquire.h b/src/xrpld/app/ledger/detail/SkipListAcquire.h
index 0e97945174..02ab81ed6b 100644
--- a/src/xrpld/app/ledger/detail/SkipListAcquire.h
+++ b/src/xrpld/app/ledger/detail/SkipListAcquire.h
@@ -24,7 +24,8 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/detail/TimeoutCounter.h>
 #include <xrpld/app/main/Application.h>
-#include <xrpld/shamap/SHAMap.h>
+
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 class InboundLedgers;
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.h b/src/xrpld/app/ledger/detail/TransactionAcquire.h
index f0d9b40928..9289758727 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.h
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.h
@@ -21,7 +21,8 @@
 #define RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED
 
 #include <xrpld/overlay/PeerSet.h>
-#include <xrpld/shamap/SHAMap.h>
+
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index 616afc957d..12a5b3d409 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -48,7 +48,6 @@
 #include <xrpld/app/rdb/Wallet.h>
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/core/DatabaseCon.h>
-#include <xrpld/nodestore/DummyScheduler.h>
 #include <xrpld/overlay/Cluster.h>
 #include <xrpld/overlay/PeerReservationTable.h>
 #include <xrpld/overlay/PeerSet.h>
@@ -64,6 +63,7 @@
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/crypto/csprng.h>
 #include <xrpl/json/json_reader.h>
+#include <xrpl/nodestore/DummyScheduler.h>
 #include <xrpl/protocol/BuildInfo.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h
index b3a433fee8..6dc50097bb 100644
--- a/src/xrpld/app/main/Application.h
+++ b/src/xrpld/app/main/Application.h
@@ -22,11 +22,11 @@
 
 #include <xrpld/core/Config.h>
 #include <xrpld/overlay/PeerReservationTable.h>
-#include <xrpld/shamap/TreeNodeCache.h>
 
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/shamap/TreeNodeCache.h>
 
 #include <boost/asio.hpp>
 #include <boost/program_options.hpp>
diff --git a/src/xrpld/app/main/NodeStoreScheduler.h b/src/xrpld/app/main/NodeStoreScheduler.h
index c21cc93934..ffd024fe32 100644
--- a/src/xrpld/app/main/NodeStoreScheduler.h
+++ b/src/xrpld/app/main/NodeStoreScheduler.h
@@ -21,7 +21,8 @@
 #define RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED
 
 #include <xrpld/core/JobQueue.h>
-#include <xrpld/nodestore/Scheduler.h>
+
+#include <xrpl/nodestore/Scheduler.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h
index 543456785a..7992163567 100644
--- a/src/xrpld/app/misc/FeeVote.h
+++ b/src/xrpld/app/misc/FeeVote.h
@@ -20,10 +20,9 @@
 #ifndef RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED
 #define RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED
 
-#include <xrpld/shamap/SHAMap.h>
-
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/STValidation.h>
+#include <xrpl/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp
index 471c937472..d981ba200c 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.cpp
+++ b/src/xrpld/app/misc/NegativeUNLVote.cpp
@@ -20,7 +20,8 @@
 #include <xrpld/app/consensus/RCLValidations.h>
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/misc/NegativeUNLVote.h>
-#include <xrpld/shamap/SHAMapItem.h>
+
+#include <xrpl/shamap/SHAMapItem.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/SHAMapStore.h b/src/xrpld/app/misc/SHAMapStore.h
index d2836be287..1a0cbca5a5 100644
--- a/src/xrpld/app/misc/SHAMapStore.h
+++ b/src/xrpld/app/misc/SHAMapStore.h
@@ -21,7 +21,8 @@
 #define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED
 
 #include <xrpld/app/ledger/Ledger.h>
-#include <xrpld/nodestore/Manager.h>
+
+#include <xrpl/nodestore/Manager.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index 52ea40cf94..d775a2063a 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -23,11 +23,11 @@
 #include <xrpld/app/rdb/State.h>
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/core/ConfigSections.h>
-#include <xrpld/nodestore/Scheduler.h>
-#include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
-#include <xrpld/shamap/SHAMapMissingNode.h>
 
 #include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/nodestore/Scheduler.h>
+#include <xrpl/nodestore/detail/DatabaseRotatingImp.h>
+#include <xrpl/shamap/SHAMapMissingNode.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.h b/src/xrpld/app/misc/SHAMapStoreImp.h
index 2b618f6538..411035809b 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.h
+++ b/src/xrpld/app/misc/SHAMapStoreImp.h
@@ -24,8 +24,9 @@
 #include <xrpld/app/misc/SHAMapStore.h>
 #include <xrpld/app/rdb/State.h>
 #include <xrpld/core/DatabaseCon.h>
-#include <xrpld/nodestore/DatabaseRotating.h>
-#include <xrpld/nodestore/Scheduler.h>
+
+#include <xrpl/nodestore/DatabaseRotating.h>
+#include <xrpl/nodestore/Scheduler.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/src/xrpld/rpc/handlers/GetCounts.cpp b/src/xrpld/rpc/handlers/GetCounts.cpp
index 3c1d8cccdd..659e796e1d 100644
--- a/src/xrpld/rpc/handlers/GetCounts.cpp
+++ b/src/xrpld/rpc/handlers/GetCounts.cpp
@@ -23,11 +23,11 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
-#include <xrpld/nodestore/Database.h>
 #include <xrpld/rpc/Context.h>
 
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/nodestore/Database.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/shamap/detail/NodeFamily.cpp b/src/xrpld/shamap/NodeFamily.cpp
similarity index 98%
rename from src/xrpld/shamap/detail/NodeFamily.cpp
rename to src/xrpld/shamap/NodeFamily.cpp
index 6126534966..6d3b0e0dd5 100644
--- a/src/xrpld/shamap/detail/NodeFamily.cpp
+++ b/src/xrpld/shamap/NodeFamily.cpp
@@ -19,11 +19,10 @@
 
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/CollectorManager.h>
 #include <xrpld/app/main/Tuning.h>
 #include <xrpld/shamap/NodeFamily.h>
 
-#include <xrpl/basics/TaggedCache.ipp>
-
 namespace ripple {
 
 NodeFamily::NodeFamily(Application& app, CollectorManager& cm)
diff --git a/src/xrpld/shamap/NodeFamily.h b/src/xrpld/shamap/NodeFamily.h
index 4062ea2389..b96adb334e 100644
--- a/src/xrpld/shamap/NodeFamily.h
+++ b/src/xrpld/shamap/NodeFamily.h
@@ -20,8 +20,7 @@
 #ifndef RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED
 #define RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED
 
-#include <xrpld/app/main/CollectorManager.h>
-#include <xrpld/shamap/Family.h>
+#include <xrpl/shamap/Family.h>
 
 namespace ripple {