diff --git a/include/xrpl/basics/BasicConfig.h b/include/xrpl/basics/BasicConfig.h
index db293979f..8f522cdd2 100644
--- a/include/xrpl/basics/BasicConfig.h
+++ b/include/xrpl/basics/BasicConfig.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 #define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <algorithm>
diff --git a/include/xrpl/basics/Buffer.h b/include/xrpl/basics/Buffer.h
index 706b8b627..25ae8ca31 100644
--- a/include/xrpl/basics/Buffer.h
+++ b/include/xrpl/basics/Buffer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_BUFFER_H_INCLUDED
 #define RIPPLE_BASICS_BUFFER_H_INCLUDED
 
-#include <ripple/basics/Slice.h>
+#include <xrpl/basics/Slice.h>
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/include/xrpl/basics/CompressionAlgorithms.h b/include/xrpl/basics/CompressionAlgorithms.h
index eef260891..4defd5a49 100644
--- a/include/xrpl/basics/CompressionAlgorithms.h
+++ b/include/xrpl/basics/CompressionAlgorithms.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED
 #define RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 #include <algorithm>
 #include <cstdint>
 #include <lz4.h>
diff --git a/include/xrpl/basics/CountedObject.h b/include/xrpl/basics/CountedObject.h
index 690841fe1..9ea76aa3b 100644
--- a/include/xrpl/basics/CountedObject.h
+++ b/include/xrpl/basics/CountedObject.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 #include <atomic>
 #include <string>
 #include <utility>
diff --git a/include/xrpl/basics/Expected.h b/include/xrpl/basics/Expected.h
index bb699579b..745fa50a6 100644
--- a/include/xrpl/basics/Expected.h
+++ b/include/xrpl/basics/Expected.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_EXPECTED_H_INCLUDED
 #define RIPPLE_BASICS_EXPECTED_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 
 #include <boost/outcome.hpp>
 
diff --git a/include/xrpl/basics/FeeUnits.h b/include/xrpl/basics/FeeUnits.h
index 35e0ff24d..9d5e6e216 100644
--- a/include/xrpl/basics/FeeUnits.h
+++ b/include/xrpl/basics/FeeUnits.h
@@ -19,7 +19,7 @@
 #ifndef BASICS_FEES_H_INCLUDED
 #define BASICS_FEES_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
+#include <xrpl/basics/XRPAmount.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <limits>
 #include <utility>
diff --git a/include/xrpl/basics/IOUAmount.h b/include/xrpl/basics/IOUAmount.h
index 2380a7d15..221434aa8 100644
--- a/include/xrpl/basics/IOUAmount.h
+++ b/include/xrpl/basics/IOUAmount.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
 #define RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
 
-#include <ripple/basics/LocalValue.h>
-#include <ripple/basics/Number.h>
-#include <ripple/beast/utility/Zero.h>
+#include <xrpl/basics/LocalValue.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <boost/operators.hpp>
 #include <cstdint>
 #include <string>
diff --git a/include/xrpl/basics/KeyCache.h b/include/xrpl/basics/KeyCache.h
index d8fa4910a..1439a8b33 100644
--- a/include/xrpl/basics/KeyCache.h
+++ b/include/xrpl/basics/KeyCache.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_KEYCACHE_H
 #define RIPPLE_BASICS_KEYCACHE_H
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/base_uint.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/basics/Log.h b/include/xrpl/basics/Log.h
index 6722ab813..2dde9e461 100644
--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_LOG_H_INCLUDED
 #define RIPPLE_BASICS_LOG_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/filesystem.hpp>
 #include <fstream>
diff --git a/include/xrpl/basics/Number.h b/include/xrpl/basics/Number.h
index cdc25b3b2..30ce3f731 100644
--- a/include/xrpl/basics/Number.h
+++ b/include/xrpl/basics/Number.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_NUMBER_H_INCLUDED
 #define RIPPLE_BASICS_NUMBER_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
+#include <xrpl/basics/XRPAmount.h>
 #include <cstdint>
 #include <limits>
 #include <ostream>
diff --git a/include/xrpl/basics/RangeSet.h b/include/xrpl/basics/RangeSet.h
index 3a9e470dd..0ffed2db1 100644
--- a/include/xrpl/basics/RangeSet.h
+++ b/include/xrpl/basics/RangeSet.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_RANGESET_H_INCLUDED
 #define RIPPLE_BASICS_RANGESET_H_INCLUDED
 
-#include <ripple/beast/core/LexicalCast.h>
+#include <xrpl/beast/core/LexicalCast.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/icl/closed_interval.hpp>
diff --git a/include/xrpl/basics/Resolver.h b/include/xrpl/basics/Resolver.h
index abf040057..6cba352e0 100644
--- a/include/xrpl/basics/Resolver.h
+++ b/include/xrpl/basics/Resolver.h
@@ -23,7 +23,7 @@
 #include <functional>
 #include <vector>
 
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/basics/ResolverAsio.h b/include/xrpl/basics/ResolverAsio.h
index 191cdc097..51fcbdfb0 100644
--- a/include/xrpl/basics/ResolverAsio.h
+++ b/include/xrpl/basics/ResolverAsio.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED
 #define RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED
 
-#include <ripple/basics/Resolver.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/Resolver.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <boost/asio/io_service.hpp>
 
 namespace ripple {
diff --git a/include/xrpl/basics/SHAMapHash.h b/include/xrpl/basics/SHAMapHash.h
index 796510ba1..7e93ead78 100644
--- a/include/xrpl/basics/SHAMapHash.h
+++ b/include/xrpl/basics/SHAMapHash.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED
 #define RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 
 #include <ostream>
 
diff --git a/include/xrpl/basics/SlabAllocator.h b/include/xrpl/basics/SlabAllocator.h
index ece96d0b8..5c4cba343 100644
--- a/include/xrpl/basics/SlabAllocator.h
+++ b/include/xrpl/basics/SlabAllocator.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED
 #define RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 
 #include <boost/align.hpp>
 #include <boost/container/static_vector.hpp>
diff --git a/include/xrpl/basics/Slice.h b/include/xrpl/basics/Slice.h
index 0ba6a94b6..00126f888 100644
--- a/include/xrpl/basics/Slice.h
+++ b/include/xrpl/basics/Slice.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_SLICE_H_INCLUDED
 #define RIPPLE_BASICS_SLICE_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
 #include <algorithm>
 #include <array>
 #include <cassert>
diff --git a/include/xrpl/basics/StringUtilities.h b/include/xrpl/basics/StringUtilities.h
index 69314ce09..23d60e2db 100644
--- a/include/xrpl/basics/StringUtilities.h
+++ b/include/xrpl/basics/StringUtilities.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED
 #define RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/strHex.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/strHex.h>
 
 #include <boost/format.hpp>
 #include <boost/utility/string_view.hpp>
diff --git a/include/xrpl/basics/TaggedCache.h b/include/xrpl/basics/TaggedCache.h
index 6765ff16b..1fcdc3707 100644
--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED
 #define RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/insight/Insight.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/insight/Insight.h>
 #include <atomic>
 #include <functional>
 #include <mutex>
diff --git a/include/xrpl/basics/UnorderedContainers.h b/include/xrpl/basics/UnorderedContainers.h
index e929ebec8..b689a1b6a 100644
--- a/include/xrpl/basics/UnorderedContainers.h
+++ b/include/xrpl/basics/UnorderedContainers.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
 #define RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
 
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/basics/partitioned_unordered_map.h>
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/hash/xxhasher.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/basics/partitioned_unordered_map.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/hash/xxhasher.h>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/include/xrpl/basics/XRPAmount.h b/include/xrpl/basics/XRPAmount.h
index 08f82b175..1d3b32f16 100644
--- a/include/xrpl/basics/XRPAmount.h
+++ b/include/xrpl/basics/XRPAmount.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED
 #define RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/utility/Zero.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/json/json_value.h>
 
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/operators.hpp>
diff --git a/include/xrpl/basics/base_uint.h b/include/xrpl/basics/base_uint.h
index 40c6ca4f9..a2576b148 100644
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -25,12 +25,12 @@
 #ifndef RIPPLE_BASICS_BASE_UINT_H_INCLUDED
 #define RIPPLE_BASICS_BASE_UINT_H_INCLUDED
 
-#include <ripple/basics/Expected.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/beast/utility/Zero.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <boost/endian/conversion.hpp>
 #include <boost/functional/hash.hpp>
 #include <algorithm>
diff --git a/include/xrpl/basics/chrono.h b/include/xrpl/basics/chrono.h
index ea82f928b..d739b6bf4 100644
--- a/include/xrpl/basics/chrono.h
+++ b/include/xrpl/basics/chrono.h
@@ -22,9 +22,9 @@
 
 #include <date/date.h>
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/clock/basic_seconds_clock.h>
-#include <ripple/beast/clock/manual_clock.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/clock/basic_seconds_clock.h>
+#include <xrpl/beast/clock/manual_clock.h>
 
 #include <chrono>
 #include <cstdint>
diff --git a/include/xrpl/basics/contract.h b/include/xrpl/basics/contract.h
index 80aeee7a3..bdfc8aac3 100644
--- a/include/xrpl/basics/contract.h
+++ b/include/xrpl/basics/contract.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_CONTRACT_H_INCLUDED
 #define RIPPLE_BASICS_CONTRACT_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 #include <exception>
 #include <string>
 #include <typeinfo>
diff --git a/include/xrpl/basics/hardened_hash.h b/include/xrpl/basics/hardened_hash.h
index bc2040928..0b77b0a07 100644
--- a/include/xrpl/basics/hardened_hash.h
+++ b/include/xrpl/basics/hardened_hash.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED
 #define RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/xxhasher.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/xxhasher.h>
 
 #include <cstdint>
 #include <functional>
diff --git a/include/xrpl/basics/random.h b/include/xrpl/basics/random.h
index 3af8be541..87b303bf6 100644
--- a/include/xrpl/basics/random.h
+++ b/include/xrpl/basics/random.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED
 #define RIPPLE_BASICS_RANDOM_H_INCLUDED
 
-#include <ripple/beast/xor_shift_engine.h>
+#include <xrpl/beast/xor_shift_engine.h>
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
diff --git a/include/xrpl/basics/tagged_integer.h b/include/xrpl/basics/tagged_integer.h
index fe11f8827..3ab8c5340 100644
--- a/include/xrpl/basics/tagged_integer.h
+++ b/include/xrpl/basics/tagged_integer.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <boost/operators.hpp>
 #include <functional>
 #include <iostream>
diff --git a/include/xrpl/beast/clock/manual_clock.h b/include/xrpl/beast/clock/manual_clock.h
index 808b00710..97be8e79b 100644
--- a/include/xrpl/beast/clock/manual_clock.h
+++ b/include/xrpl/beast/clock/manual_clock.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
+#include <xrpl/beast/clock/abstract_clock.h>
 #include <cassert>
 
 namespace beast {
diff --git a/include/xrpl/beast/container/aged_container_utility.h b/include/xrpl/beast/container/aged_container_utility.h
index dc57c229f..b64cefbf5 100644
--- a/include/xrpl/beast/container/aged_container_utility.h
+++ b/include/xrpl/beast/container/aged_container_utility.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 
-#include <ripple/beast/container/aged_container.h>
+#include <xrpl/beast/container/aged_container.h>
 
 #include <type_traits>
 
diff --git a/include/xrpl/beast/container/aged_map.h b/include/xrpl/beast/container/aged_map.h
index f675846fa..5b56cde96 100644
--- a/include/xrpl/beast/container/aged_map.h
+++ b/include/xrpl/beast/container/aged_map.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_multimap.h b/include/xrpl/beast/container/aged_multimap.h
index b4668851c..aa6c01f5b 100644
--- a/include/xrpl/beast/container/aged_multimap.h
+++ b/include/xrpl/beast/container/aged_multimap.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_multiset.h b/include/xrpl/beast/container/aged_multiset.h
index 6d62bcbeb..d43cc8d5a 100644
--- a/include/xrpl/beast/container/aged_multiset.h
+++ b/include/xrpl/beast/container/aged_multiset.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_set.h b/include/xrpl/beast/container/aged_set.h
index 0a9d82f6c..aa31a47af 100644
--- a/include/xrpl/beast/container/aged_set.h
+++ b/include/xrpl/beast/container/aged_set.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_SET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_unordered_map.h b/include/xrpl/beast/container/aged_unordered_map.h
index 1b6a147ef..b466c87b3 100644
--- a/include/xrpl/beast/container/aged_unordered_map.h
+++ b/include/xrpl/beast/container/aged_unordered_map.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_unordered_multimap.h b/include/xrpl/beast/container/aged_unordered_multimap.h
index 1298cd51d..e64c8415c 100644
--- a/include/xrpl/beast/container/aged_unordered_multimap.h
+++ b/include/xrpl/beast/container/aged_unordered_multimap.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_unordered_multiset.h b/include/xrpl/beast/container/aged_unordered_multiset.h
index 5e9f682aa..499dc7d67 100644
--- a/include/xrpl/beast/container/aged_unordered_multiset.h
+++ b/include/xrpl/beast/container/aged_unordered_multiset.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/aged_unordered_set.h b/include/xrpl/beast/container/aged_unordered_set.h
index adb411c34..45fc6cd0e 100644
--- a/include/xrpl/beast/container/aged_unordered_set.h
+++ b/include/xrpl/beast/container/aged_unordered_set.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>
diff --git a/include/xrpl/beast/container/detail/aged_ordered_container.h b/include/xrpl/beast/container/detail/aged_ordered_container.h
index 10dca962b..90a8ea147 100644
--- a/include/xrpl/beast/container/detail/aged_ordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_ordered_container.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/container/aged_container.h>
-#include <ripple/beast/container/detail/aged_associative_container.h>
-#include <ripple/beast/container/detail/aged_container_iterator.h>
-#include <ripple/beast/container/detail/empty_base_optimization.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/container/aged_container.h>
+#include <xrpl/beast/container/detail/aged_associative_container.h>
+#include <xrpl/beast/container/detail/aged_container_iterator.h>
+#include <xrpl/beast/container/detail/empty_base_optimization.h>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/version.hpp>
diff --git a/include/xrpl/beast/container/detail/aged_unordered_container.h b/include/xrpl/beast/container/detail/aged_unordered_container.h
index fcdccd2a6..45efb3f55 100644
--- a/include/xrpl/beast/container/detail/aged_unordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_unordered_container.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/container/aged_container.h>
-#include <ripple/beast/container/detail/aged_associative_container.h>
-#include <ripple/beast/container/detail/aged_container_iterator.h>
-#include <ripple/beast/container/detail/empty_base_optimization.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/container/aged_container.h>
+#include <xrpl/beast/container/detail/aged_associative_container.h>
+#include <xrpl/beast/container/detail/aged_container_iterator.h>
+#include <xrpl/beast/container/detail/empty_base_optimization.h>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <algorithm>
diff --git a/include/xrpl/beast/hash/uhash.h b/include/xrpl/beast/hash/uhash.h
index 921ea3c98..ab3eaad03 100644
--- a/include/xrpl/beast/hash/uhash.h
+++ b/include/xrpl/beast/hash/uhash.h
@@ -21,8 +21,8 @@
 #ifndef BEAST_HASH_UHASH_H_INCLUDED
 #define BEAST_HASH_UHASH_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/xxhasher.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/xxhasher.h>
 
 namespace beast {
 
diff --git a/include/xrpl/beast/insight/Collector.h b/include/xrpl/beast/insight/Collector.h
index a71b1092c..eab2bd7d7 100644
--- a/include/xrpl/beast/insight/Collector.h
+++ b/include/xrpl/beast/insight/Collector.h
@@ -20,11 +20,11 @@
 #ifndef BEAST_INSIGHT_COLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_COLLECTOR_H_INCLUDED
 
-#include <ripple/beast/insight/Counter.h>
-#include <ripple/beast/insight/Event.h>
-#include <ripple/beast/insight/Gauge.h>
-#include <ripple/beast/insight/Hook.h>
-#include <ripple/beast/insight/Meter.h>
+#include <xrpl/beast/insight/Counter.h>
+#include <xrpl/beast/insight/Event.h>
+#include <xrpl/beast/insight/Gauge.h>
+#include <xrpl/beast/insight/Hook.h>
+#include <xrpl/beast/insight/Meter.h>
 
 #include <string>
 
diff --git a/include/xrpl/beast/insight/Counter.h b/include/xrpl/beast/insight/Counter.h
index 069505e4c..3f3a251de 100644
--- a/include/xrpl/beast/insight/Counter.h
+++ b/include/xrpl/beast/insight/Counter.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_COUNTER_H_INCLUDED
 #define BEAST_INSIGHT_COUNTER_H_INCLUDED
 
-#include <ripple/beast/insight/CounterImpl.h>
+#include <xrpl/beast/insight/CounterImpl.h>
 
 #include <memory>
 
diff --git a/include/xrpl/beast/insight/Event.h b/include/xrpl/beast/insight/Event.h
index 5319a9a66..407dd233e 100644
--- a/include/xrpl/beast/insight/Event.h
+++ b/include/xrpl/beast/insight/Event.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_EVENT_H_INCLUDED
 #define BEAST_INSIGHT_EVENT_H_INCLUDED
 
-#include <ripple/beast/insight/EventImpl.h>
+#include <xrpl/beast/insight/EventImpl.h>
 
 #include <chrono>
 #include <memory>
diff --git a/include/xrpl/beast/insight/Gauge.h b/include/xrpl/beast/insight/Gauge.h
index 76f840807..b1e8bedfa 100644
--- a/include/xrpl/beast/insight/Gauge.h
+++ b/include/xrpl/beast/insight/Gauge.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_GAUGE_H_INCLUDED
 #define BEAST_INSIGHT_GAUGE_H_INCLUDED
 
-#include <ripple/beast/insight/GaugeImpl.h>
+#include <xrpl/beast/insight/GaugeImpl.h>
 
 #include <memory>
 
diff --git a/include/xrpl/beast/insight/Group.h b/include/xrpl/beast/insight/Group.h
index a37656b81..f11b1397c 100644
--- a/include/xrpl/beast/insight/Group.h
+++ b/include/xrpl/beast/insight/Group.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_GROUP_H_INCLUDED
 #define BEAST_INSIGHT_GROUP_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Collector.h>
 
 #include <memory>
 #include <string>
diff --git a/include/xrpl/beast/insight/Groups.h b/include/xrpl/beast/insight/Groups.h
index 817ad87bd..456deb790 100644
--- a/include/xrpl/beast/insight/Groups.h
+++ b/include/xrpl/beast/insight/Groups.h
@@ -20,8 +20,8 @@
 #ifndef BEAST_INSIGHT_GROUPS_H_INCLUDED
 #define BEAST_INSIGHT_GROUPS_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/beast/insight/Group.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Group.h>
 
 #include <memory>
 #include <string>
diff --git a/include/xrpl/beast/insight/Hook.h b/include/xrpl/beast/insight/Hook.h
index 04647f4b6..affa42bb8 100644
--- a/include/xrpl/beast/insight/Hook.h
+++ b/include/xrpl/beast/insight/Hook.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_HOOK_H_INCLUDED
 #define BEAST_INSIGHT_HOOK_H_INCLUDED
 
-#include <ripple/beast/insight/HookImpl.h>
+#include <xrpl/beast/insight/HookImpl.h>
 
 #include <memory>
 
diff --git a/include/xrpl/beast/insight/Insight.h b/include/xrpl/beast/insight/Insight.h
index f34f73174..1c2c1375a 100644
--- a/include/xrpl/beast/insight/Insight.h
+++ b/include/xrpl/beast/insight/Insight.h
@@ -20,18 +20,18 @@
 #ifndef BEAST_INSIGHT_H_INCLUDED
 #define BEAST_INSIGHT_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/beast/insight/Counter.h>
-#include <ripple/beast/insight/CounterImpl.h>
-#include <ripple/beast/insight/Event.h>
-#include <ripple/beast/insight/EventImpl.h>
-#include <ripple/beast/insight/Gauge.h>
-#include <ripple/beast/insight/GaugeImpl.h>
-#include <ripple/beast/insight/Group.h>
-#include <ripple/beast/insight/Groups.h>
-#include <ripple/beast/insight/Hook.h>
-#include <ripple/beast/insight/HookImpl.h>
-#include <ripple/beast/insight/NullCollector.h>
-#include <ripple/beast/insight/StatsDCollector.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Counter.h>
+#include <xrpl/beast/insight/CounterImpl.h>
+#include <xrpl/beast/insight/Event.h>
+#include <xrpl/beast/insight/EventImpl.h>
+#include <xrpl/beast/insight/Gauge.h>
+#include <xrpl/beast/insight/GaugeImpl.h>
+#include <xrpl/beast/insight/Group.h>
+#include <xrpl/beast/insight/Groups.h>
+#include <xrpl/beast/insight/Hook.h>
+#include <xrpl/beast/insight/HookImpl.h>
+#include <xrpl/beast/insight/NullCollector.h>
+#include <xrpl/beast/insight/StatsDCollector.h>
 
 #endif
diff --git a/include/xrpl/beast/insight/Meter.h b/include/xrpl/beast/insight/Meter.h
index 376dcae05..febd5cb3d 100644
--- a/include/xrpl/beast/insight/Meter.h
+++ b/include/xrpl/beast/insight/Meter.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include <ripple/beast/insight/MeterImpl.h>
+#include <xrpl/beast/insight/MeterImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/include/xrpl/beast/insight/NullCollector.h b/include/xrpl/beast/insight/NullCollector.h
index db9815383..4379c3ceb 100644
--- a/include/xrpl/beast/insight/NullCollector.h
+++ b/include/xrpl/beast/insight/NullCollector.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Collector.h>
 
 namespace beast {
 namespace insight {
diff --git a/include/xrpl/beast/insight/StatsDCollector.h b/include/xrpl/beast/insight/StatsDCollector.h
index d95aee04d..78195048d 100644
--- a/include/xrpl/beast/insight/StatsDCollector.h
+++ b/include/xrpl/beast/insight/StatsDCollector.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED
 #define BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Collector.h>
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace beast {
 namespace insight {
diff --git a/include/xrpl/beast/net/IPAddress.h b/include/xrpl/beast/net/IPAddress.h
index d8820ec40..f3a1a7348 100644
--- a/include/xrpl/beast/net/IPAddress.h
+++ b/include/xrpl/beast/net/IPAddress.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_NET_IPADDRESS_H_INCLUDED
 #define BEAST_NET_IPADDRESS_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/net/IPAddressV4.h>
-#include <ripple/beast/net/IPAddressV6.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/net/IPAddressV4.h>
+#include <xrpl/beast/net/IPAddressV6.h>
 #include <boost/asio/ip/address.hpp>
 #include <boost/functional/hash.hpp>
 #include <cassert>
diff --git a/include/xrpl/beast/net/IPAddressConversion.h b/include/xrpl/beast/net/IPAddressConversion.h
index e37dd5b6c..982a8e50f 100644
--- a/include/xrpl/beast/net/IPAddressConversion.h
+++ b/include/xrpl/beast/net/IPAddressConversion.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_NET_IPADDRESSCONVERSION_H_INCLUDED
 #define BEAST_NET_IPADDRESSCONVERSION_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 
 #include <sstream>
 
diff --git a/include/xrpl/beast/net/IPAddressV4.h b/include/xrpl/beast/net/IPAddressV4.h
index 2c6f6a8cc..7711a970d 100644
--- a/include/xrpl/beast/net/IPAddressV4.h
+++ b/include/xrpl/beast/net/IPAddressV4.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_NET_IPADDRESSV4_H_INCLUDED
 #define BEAST_NET_IPADDRESSV4_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <boost/asio/ip/address_v4.hpp>
 #include <cstdint>
 #include <functional>
diff --git a/include/xrpl/beast/net/IPEndpoint.h b/include/xrpl/beast/net/IPEndpoint.h
index 19ce36dcc..e66e7f4ca 100644
--- a/include/xrpl/beast/net/IPEndpoint.h
+++ b/include/xrpl/beast/net/IPEndpoint.h
@@ -20,9 +20,9 @@
 #ifndef BEAST_NET_IPENDPOINT_H_INCLUDED
 #define BEAST_NET_IPENDPOINT_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/net/IPAddress.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/net/IPAddress.h>
 
 #include <cstdint>
 #include <ios>
diff --git a/include/xrpl/beast/test/fail_counter.h b/include/xrpl/beast/test/fail_counter.h
index 8a11602e2..65b4ac79c 100644
--- a/include/xrpl/beast/test/fail_counter.h
+++ b/include/xrpl/beast/test/fail_counter.h
@@ -9,7 +9,7 @@
 #define BEAST_TEST_FAIL_COUNTER_HPP
 
 #include <boost/throw_exception.hpp>
-#include <beast/core/error.hpp>
+#include <xrpl/beast/core/error.hpp>
 
 namespace beast {
 namespace test {
diff --git a/include/xrpl/beast/test/fail_stream.h b/include/xrpl/beast/test/fail_stream.h
index a1465f006..cc117f175 100644
--- a/include/xrpl/beast/test/fail_stream.h
+++ b/include/xrpl/beast/test/fail_stream.h
@@ -9,12 +9,12 @@
 #define BEAST_TEST_FAIL_STREAM_HPP
 
 #include <boost/optional.hpp>
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/detail/type_traits.hpp>
-#include <beast/core/error.hpp>
-#include <beast/test/fail_counter.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <xrpl/beast/core/async_result.hpp>
+#include <xrpl/beast/core/bind_handler.hpp>
+#include <xrpl/beast/core/detail/type_traits.hpp>
+#include <xrpl/beast/core/error.hpp>
+#include <xrpl/beast/test/fail_counter.hpp>
+#include <xrpl/beast/websocket/teardown.hpp>
 
 namespace beast {
 namespace test {
diff --git a/include/xrpl/beast/test/pipe_stream.h b/include/xrpl/beast/test/pipe_stream.h
index 1aaaadfa4..20574e9a8 100644
--- a/include/xrpl/beast/test/pipe_stream.h
+++ b/include/xrpl/beast/test/pipe_stream.h
@@ -12,13 +12,13 @@
 #include <boost/asio/io_service.hpp>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/flat_buffer.hpp>
-#include <beast/core/string.hpp>
-#include <beast/core/type_traits.hpp>
-#include <beast/test/fail_counter.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <xrpl/beast/core/async_result.hpp>
+#include <xrpl/beast/core/bind_handler.hpp>
+#include <xrpl/beast/core/flat_buffer.hpp>
+#include <xrpl/beast/core/string.hpp>
+#include <xrpl/beast/core/type_traits.hpp>
+#include <xrpl/beast/test/fail_counter.hpp>
+#include <xrpl/beast/websocket/teardown.hpp>
 #include <condition_variable>
 #include <limits>
 #include <mutex>
diff --git a/include/xrpl/beast/test/string_iostream.h b/include/xrpl/beast/test/string_iostream.h
index 56f741be0..67822f81c 100644
--- a/include/xrpl/beast/test/string_iostream.h
+++ b/include/xrpl/beast/test/string_iostream.h
@@ -11,11 +11,11 @@
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/buffer_prefix.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <xrpl/beast/core/async_result.hpp>
+#include <xrpl/beast/core/bind_handler.hpp>
+#include <xrpl/beast/core/buffer_prefix.hpp>
+#include <xrpl/beast/core/error.hpp>
+#include <xrpl/beast/websocket/teardown.hpp>
 #include <string>
 
 namespace beast {
diff --git a/include/xrpl/beast/test/string_istream.h b/include/xrpl/beast/test/string_istream.h
index 81f354699..ba0bf34cc 100644
--- a/include/xrpl/beast/test/string_istream.h
+++ b/include/xrpl/beast/test/string_istream.h
@@ -11,10 +11,10 @@
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <xrpl/beast/core/async_result.hpp>
+#include <xrpl/beast/core/bind_handler.hpp>
+#include <xrpl/beast/core/error.hpp>
+#include <xrpl/beast/websocket/teardown.hpp>
 #include <string>
 
 namespace beast {
diff --git a/include/xrpl/beast/test/string_ostream.h b/include/xrpl/beast/test/string_ostream.h
index 4cca9e7fc..a14839c5c 100644
--- a/include/xrpl/beast/test/string_ostream.h
+++ b/include/xrpl/beast/test/string_ostream.h
@@ -11,11 +11,11 @@
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/buffer_prefix.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <xrpl/beast/core/async_result.hpp>
+#include <xrpl/beast/core/bind_handler.hpp>
+#include <xrpl/beast/core/buffer_prefix.hpp>
+#include <xrpl/beast/core/error.hpp>
+#include <xrpl/beast/websocket/teardown.hpp>
 #include <string>
 
 namespace beast {
diff --git a/include/xrpl/beast/unit_test.h b/include/xrpl/beast/unit_test.h
index 70747ea34..eff82583e 100644
--- a/include/xrpl/beast/unit_test.h
+++ b/include/xrpl/beast/unit_test.h
@@ -20,16 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include <ripple/beast/unit_test/amount.h>
-#include <ripple/beast/unit_test/global_suites.h>
-#include <ripple/beast/unit_test/match.h>
-#include <ripple/beast/unit_test/recorder.h>
-#include <ripple/beast/unit_test/reporter.h>
-#include <ripple/beast/unit_test/results.h>
-#include <ripple/beast/unit_test/runner.h>
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/beast/unit_test/suite_info.h>
-#include <ripple/beast/unit_test/suite_list.h>
+#include <xrpl/beast/unit_test/amount.h>
+#include <xrpl/beast/unit_test/global_suites.h>
+#include <xrpl/beast/unit_test/match.h>
+#include <xrpl/beast/unit_test/recorder.h>
+#include <xrpl/beast/unit_test/reporter.h>
+#include <xrpl/beast/unit_test/results.h>
+#include <xrpl/beast/unit_test/runner.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/unit_test/suite_info.h>
+#include <xrpl/beast/unit_test/suite_list.h>
 
 #ifndef BEAST_EXPECT
 #define BEAST_EXPECT_S1(x) #x
diff --git a/include/xrpl/beast/unit_test/global_suites.h b/include/xrpl/beast/unit_test/global_suites.h
index 3fcdcc052..64bbbc7a2 100644
--- a/include/xrpl/beast/unit_test/global_suites.h
+++ b/include/xrpl/beast/unit_test/global_suites.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 #define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 
-#include <ripple/beast/unit_test/suite_list.h>
+#include <xrpl/beast/unit_test/suite_list.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/include/xrpl/beast/unit_test/match.h b/include/xrpl/beast/unit_test/match.h
index 306bc5699..e8e12bd55 100644
--- a/include/xrpl/beast/unit_test/match.h
+++ b/include/xrpl/beast/unit_test/match.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_MATCH_HPP
 #define BEAST_UNIT_TEST_MATCH_HPP
 
-#include <ripple/beast/unit_test/suite_info.h>
+#include <xrpl/beast/unit_test/suite_info.h>
 #include <string>
 
 namespace beast {
diff --git a/include/xrpl/beast/unit_test/recorder.h b/include/xrpl/beast/unit_test/recorder.h
index 439e194c3..fbe6ab6c1 100644
--- a/include/xrpl/beast/unit_test/recorder.h
+++ b/include/xrpl/beast/unit_test/recorder.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_RECORDER_HPP
 #define BEAST_UNIT_TEST_RECORDER_HPP
 
-#include <ripple/beast/unit_test/results.h>
-#include <ripple/beast/unit_test/runner.h>
+#include <xrpl/beast/unit_test/results.h>
+#include <xrpl/beast/unit_test/runner.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/include/xrpl/beast/unit_test/reporter.h b/include/xrpl/beast/unit_test/reporter.h
index 76b65a8b1..956def1c3 100644
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_REPORTER_HPP
 #define BEAST_UNIT_TEST_REPORTER_HPP
 
-#include <ripple/beast/unit_test/amount.h>
-#include <ripple/beast/unit_test/recorder.h>
+#include <xrpl/beast/unit_test/amount.h>
+#include <xrpl/beast/unit_test/recorder.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <algorithm>
diff --git a/include/xrpl/beast/unit_test/results.h b/include/xrpl/beast/unit_test/results.h
index dd43fb17a..96fedc9b7 100644
--- a/include/xrpl/beast/unit_test/results.h
+++ b/include/xrpl/beast/unit_test/results.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_RESULTS_HPP
 #define BEAST_UNIT_TEST_RESULTS_HPP
 
-#include <ripple/beast/unit_test/detail/const_container.h>
+#include <xrpl/beast/unit_test/detail/const_container.h>
 
 #include <string>
 #include <vector>
diff --git a/include/xrpl/beast/unit_test/runner.h b/include/xrpl/beast/unit_test/runner.h
index bdee7aee5..6330f2c8c 100644
--- a/include/xrpl/beast/unit_test/runner.h
+++ b/include/xrpl/beast/unit_test/runner.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 
-#include <ripple/beast/unit_test/suite_info.h>
+#include <xrpl/beast/unit_test/suite_info.h>
 #include <boost/assert.hpp>
 #include <mutex>
 #include <ostream>
diff --git a/include/xrpl/beast/unit_test/suite.h b/include/xrpl/beast/unit_test/suite.h
index 23c4c4fad..d49730d4d 100644
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_SUITE_HPP
 #define BEAST_UNIT_TEST_SUITE_HPP
 
-#include <ripple/beast/unit_test/runner.h>
+#include <xrpl/beast/unit_test/runner.h>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
@@ -646,7 +646,7 @@ suite::run(runner& r)
 #define BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Class, Module, Library, Priority)
 
 #else
-#include <ripple/beast/unit_test/global_suites.h>
+#include <xrpl/beast/unit_test/global_suites.h>
 #define BEAST_DEFINE_TESTSUITE(Class, Module, Library) \
     BEAST_DEFINE_TESTSUITE_INSERT(Class, Module, Library, false, 0)
 #define BEAST_DEFINE_TESTSUITE_MANUAL(Class, Module, Library) \
diff --git a/include/xrpl/beast/unit_test/suite_list.h b/include/xrpl/beast/unit_test/suite_list.h
index a1aed563c..5856b4c7d 100644
--- a/include/xrpl/beast/unit_test/suite_list.h
+++ b/include/xrpl/beast/unit_test/suite_list.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP
 #define BEAST_UNIT_TEST_SUITE_LIST_HPP
 
-#include <ripple/beast/unit_test/detail/const_container.h>
-#include <ripple/beast/unit_test/suite_info.h>
+#include <xrpl/beast/unit_test/detail/const_container.h>
+#include <xrpl/beast/unit_test/suite_info.h>
 #include <boost/assert.hpp>
 #include <set>
 #include <typeindex>
diff --git a/include/xrpl/beast/unit_test/thread.h b/include/xrpl/beast/unit_test/thread.h
index 8b2d024a8..e94108f78 100644
--- a/include/xrpl/beast/unit_test/thread.h
+++ b/include/xrpl/beast/unit_test/thread.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_THREAD_HPP
 #define BEAST_UNIT_TEST_THREAD_HPP
 
-#include <ripple/beast/unit_test/suite.h>
+#include <xrpl/beast/unit_test/suite.h>
 #include <functional>
 #include <thread>
 #include <utility>
diff --git a/include/xrpl/beast/utility/PropertyStream.h b/include/xrpl/beast/utility/PropertyStream.h
index dbcc8a2d7..5eaf70453 100644
--- a/include/xrpl/beast/utility/PropertyStream.h
+++ b/include/xrpl/beast/utility/PropertyStream.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
 #define BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
 
-#include <ripple/beast/core/List.h>
+#include <xrpl/beast/core/List.h>
 
 #include <cstdint>
 #include <mutex>
diff --git a/include/xrpl/beast/utility/WrappedSink.h b/include/xrpl/beast/utility/WrappedSink.h
index ba714248a..f22455a52 100644
--- a/include/xrpl/beast/utility/WrappedSink.h
+++ b/include/xrpl/beast/utility/WrappedSink.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED
 #define BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace beast {
 
diff --git a/include/xrpl/json/JsonPropertyStream.h b/include/xrpl/json/JsonPropertyStream.h
index 0f25e59eb..fdc219719 100644
--- a/include/xrpl/json/JsonPropertyStream.h
+++ b/include/xrpl/json/JsonPropertyStream.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED
 #define RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED
 
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/json/Object.h b/include/xrpl/json/Object.h
index 045010333..ec60e5620 100644
--- a/include/xrpl/json/Object.h
+++ b/include/xrpl/json/Object.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_JSON_OBJECT_H_INCLUDED
 #define RIPPLE_JSON_OBJECT_H_INCLUDED
 
-#include <ripple/json/Writer.h>
+#include <xrpl/json/Writer.h>
 #include <memory>
 
 namespace Json {
diff --git a/include/xrpl/json/Writer.h b/include/xrpl/json/Writer.h
index 5801caf85..882e94409 100644
--- a/include/xrpl/json/Writer.h
+++ b/include/xrpl/json/Writer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_JSON_WRITER_H_INCLUDED
 #define RIPPLE_JSON_WRITER_H_INCLUDED
 
-#include <ripple/basics/ToString.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/Output.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/ToString.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/Output.h>
+#include <xrpl/json/json_value.h>
 #include <memory>
 
 namespace Json {
diff --git a/include/xrpl/json/detail/json_assert.h b/include/xrpl/json/detail/json_assert.h
index b7297e016..c401ccf72 100644
--- a/include/xrpl/json/detail/json_assert.h
+++ b/include/xrpl/json/detail/json_assert.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_JSON_JSON_ASSERT_H_INCLUDED
 #define RIPPLE_JSON_JSON_ASSERT_H_INCLUDED
 
-#include <ripple/json/json_errors.h>
+#include <xrpl/json/json_errors.h>
 
 #define JSON_ASSERT_UNREACHABLE assert(false)
 #define JSON_ASSERT(condition) \
diff --git a/include/xrpl/json/json_reader.h b/include/xrpl/json/json_reader.h
index caa657eb7..6fb07c318 100644
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -22,8 +22,8 @@
 
 #define CPPTL_JSON_READER_H_INCLUDED
 
-#include <ripple/json/json_forwards.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/json/json_value.h>
 #include <boost/asio/buffer.hpp>
 #include <stack>
 
diff --git a/include/xrpl/json/json_value.h b/include/xrpl/json/json_value.h
index c8312e514..c2f9184d7 100644
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_JSON_JSON_VALUE_H_INCLUDED
 #define RIPPLE_JSON_JSON_VALUE_H_INCLUDED
 
-#include <ripple/json/json_forwards.h>
+#include <xrpl/json/json_forwards.h>
 #include <cstring>
 #include <map>
 #include <string>
diff --git a/include/xrpl/json/json_writer.h b/include/xrpl/json/json_writer.h
index d1ddcd4de..86a5ecd98 100644
--- a/include/xrpl/json/json_writer.h
+++ b/include/xrpl/json/json_writer.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_JSON_JSON_WRITER_H_INCLUDED
 #define RIPPLE_JSON_JSON_WRITER_H_INCLUDED
 
-#include <ripple/json/json_forwards.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/json/json_value.h>
 #include <ostream>
 #include <vector>
 
diff --git a/include/xrpl/protocol/AMMCore.h b/include/xrpl/protocol/AMMCore.h
index 816bf8621..32988af5f 100644
--- a/include/xrpl/protocol/AMMCore.h
+++ b/include/xrpl/protocol/AMMCore.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PROTOCOL_AMMCORE_H_INCLUDED
 #define RIPPLE_PROTOCOL_AMMCORE_H_INCLUDED
 
-#include <ripple/basics/Number.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/AccountID.h b/include/xrpl/protocol/AccountID.h
index 27e1f4522..ebe7f014d 100644
--- a/include/xrpl/protocol/AccountID.h
+++ b/include/xrpl/protocol/AccountID.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_PROTOCOL_ACCOUNTID_H_INCLUDED
 #define RIPPLE_PROTOCOL_ACCOUNTID_H_INCLUDED
 
-#include <ripple/protocol/tokens.h>
+#include <xrpl/protocol/tokens.h>
 // VFALCO Uncomment when the header issues are resolved
 //#include <ripple/protocol/PublicKey.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/json_get_or_throw.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/json_get_or_throw.h>
 
 #include <cstddef>
 #include <mutex>
diff --git a/include/xrpl/protocol/AmountConversions.h b/include/xrpl/protocol/AmountConversions.h
index dc0defe69..0348e3c97 100644
--- a/include/xrpl/protocol/AmountConversions.h
+++ b/include/xrpl/protocol/AmountConversions.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED
 #define RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/protocol/STAmount.h>
 
 #include <type_traits>
 
diff --git a/include/xrpl/protocol/Book.h b/include/xrpl/protocol/Book.h
index 609989062..164a5ccfa 100644
--- a/include/xrpl/protocol/Book.h
+++ b/include/xrpl/protocol/Book.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_BOOK_H_INCLUDED
 #define RIPPLE_PROTOCOL_BOOK_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/Issue.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/Issue.h>
 #include <boost/utility/base_from_member.hpp>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/ErrorCodes.h b/include/xrpl/protocol/ErrorCodes.h
index 48010658d..d42dca070 100644
--- a/include/xrpl/protocol/ErrorCodes.h
+++ b/include/xrpl/protocol/ErrorCodes.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_ERRORCODES_H_INCLUDED
 #define RIPPLE_PROTOCOL_ERRORCODES_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h
index 422229249..33575f8f4 100644
--- a/include/xrpl/protocol/Feature.h
+++ b/include/xrpl/protocol/Feature.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_FEATURE_H_INCLUDED
 #define RIPPLE_PROTOCOL_FEATURE_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 #include <boost/container/flat_map.hpp>
 #include <array>
 #include <bitset>
diff --git a/include/xrpl/protocol/Fees.h b/include/xrpl/protocol/Fees.h
index d155b869d..7b4671a91 100644
--- a/include/xrpl/protocol/Fees.h
+++ b/include/xrpl/protocol/Fees.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_FEES_H_INCLUDED
 #define RIPPLE_PROTOCOL_FEES_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
+#include <xrpl/basics/XRPAmount.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/HashPrefix.h b/include/xrpl/protocol/HashPrefix.h
index 5d45b72f3..ea8e05dd3 100644
--- a/include/xrpl/protocol/HashPrefix.h
+++ b/include/xrpl/protocol/HashPrefix.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED
 #define RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/Import.h b/include/xrpl/protocol/Import.h
index 0d32eeef8..26f5b7463 100644
--- a/include/xrpl/protocol/Import.h
+++ b/include/xrpl/protocol/Import.h
@@ -21,10 +21,10 @@
 #define RIPPLE_PROTOCOL_IMPORT_H_INCLUDED
 
 // #include <ripple/basics/Log.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_reader.h>
+#include <xrpl/app/misc/Manifest.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_reader.h>
 #include <charconv>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h
index 1c5b63f33..0bc1339c9 100644
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_PROTOCOL_INDEXES_H_INCLUDED
 #define RIPPLE_PROTOCOL_INDEXES_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/protocol/Book.h>
-#include <ripple/protocol/Keylet.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/InnerObjectFormats.h b/include/xrpl/protocol/InnerObjectFormats.h
index 33a155d03..06ca5af38 100644
--- a/include/xrpl/protocol/InnerObjectFormats.h
+++ b/include/xrpl/protocol/InnerObjectFormats.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_INNER_OBJECT_FORMATS_H_INCLUDED
 #define RIPPLE_PROTOCOL_INNER_OBJECT_FORMATS_H_INCLUDED
 
-#include <ripple/protocol/KnownFormats.h>
+#include <xrpl/protocol/KnownFormats.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/Issue.h b/include/xrpl/protocol/Issue.h
index 1956b942e..a18502f21 100644
--- a/include/xrpl/protocol/Issue.h
+++ b/include/xrpl/protocol/Issue.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_ISSUE_H_INCLUDED
 #define RIPPLE_PROTOCOL_ISSUE_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/UintTypes.h>
 
 #include <cassert>
 #include <functional>
diff --git a/include/xrpl/protocol/Keylet.h b/include/xrpl/protocol/Keylet.h
index 1c08ce855..d3bda1033 100644
--- a/include/xrpl/protocol/Keylet.h
+++ b/include/xrpl/protocol/Keylet.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_KEYLET_H_INCLUDED
 #define RIPPLE_PROTOCOL_KEYLET_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/protocol/LedgerFormats.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/KnownFormats.h b/include/xrpl/protocol/KnownFormats.h
index b59742259..5f5a04be1 100644
--- a/include/xrpl/protocol/KnownFormats.h
+++ b/include/xrpl/protocol/KnownFormats.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED
 #define RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/type_name.h>
-#include <ripple/protocol/SOTemplate.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/type_name.h>
+#include <xrpl/protocol/SOTemplate.h>
 #include <boost/container/flat_map.hpp>
 #include <algorithm>
 #include <forward_list>
diff --git a/include/xrpl/protocol/LedgerFormats.h b/include/xrpl/protocol/LedgerFormats.h
index fb8e2d54b..409d55f91 100644
--- a/include/xrpl/protocol/LedgerFormats.h
+++ b/include/xrpl/protocol/LedgerFormats.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED
 #define RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED
 
-#include <ripple/protocol/KnownFormats.h>
+#include <xrpl/protocol/KnownFormats.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/LedgerHeader.h b/include/xrpl/protocol/LedgerHeader.h
index 2adcfcfd2..663eb709b 100644
--- a/include/xrpl/protocol/LedgerHeader.h
+++ b/include/xrpl/protocol/LedgerHeader.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_PROTOCOL_LEDGERHEADER_H_INCLUDED
 #define RIPPLE_PROTOCOL_LEDGERHEADER_H_INCLUDED
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/MultiApiJson.h b/include/xrpl/protocol/MultiApiJson.h
index b6d1843ae..4514c54ea 100644
--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED
 #define RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ApiVersion.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ApiVersion.h>
 
 #include <array>
 #include <cassert>
diff --git a/include/xrpl/protocol/NFTSyntheticSerializer.h b/include/xrpl/protocol/NFTSyntheticSerializer.h
index f9a0cd50a..e57b3ff71 100644
--- a/include/xrpl/protocol/NFTSyntheticSerializer.h
+++ b/include/xrpl/protocol/NFTSyntheticSerializer.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_NFTSYNTHETICSERIALIZER_H_INCLUDED
 #define RIPPLE_PROTOCOL_NFTSYNTHETICSERIALIZER_H_INCLUDED
 
-#include <ripple/json/json_forwards.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>
 
 #include <memory>
 
diff --git a/include/xrpl/protocol/NFTokenID.h b/include/xrpl/protocol/NFTokenID.h
index f29713aba..b9ea75d20 100644
--- a/include/xrpl/protocol/NFTokenID.h
+++ b/include/xrpl/protocol/NFTokenID.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_NFTOKENID_H_INCLUDED
 #define RIPPLE_PROTOCOL_NFTOKENID_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/json/json_forwards.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>
 
 #include <memory>
 #include <optional>
diff --git a/include/xrpl/protocol/NFTokenOfferID.h b/include/xrpl/protocol/NFTokenOfferID.h
index 777324f42..9645b0b34 100644
--- a/include/xrpl/protocol/NFTokenOfferID.h
+++ b/include/xrpl/protocol/NFTokenOfferID.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_NFTOKENOFFERID_H_INCLUDED
 #define RIPPLE_PROTOCOL_NFTOKENOFFERID_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/json/json_forwards.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>
 
 #include <memory>
 #include <optional>
diff --git a/include/xrpl/protocol/PayChan.h b/include/xrpl/protocol/PayChan.h
index f3d48556f..c0edfc6ef 100644
--- a/include/xrpl/protocol/PayChan.h
+++ b/include/xrpl/protocol/PayChan.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_PAYCHAN_H_INCLUDED
 #define RIPPLE_PROTOCOL_PAYCHAN_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/Protocol.h b/include/xrpl/protocol/Protocol.h
index 9c37f81af..6ccd39bd6 100644
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED
 #define RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/base_uint.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/PublicKey.h b/include/xrpl/protocol/PublicKey.h
index 9cf1a4569..c68656877 100644
--- a/include/xrpl/protocol/PublicKey.h
+++ b/include/xrpl/protocol/PublicKey.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_PROTOCOL_PUBLICKEY_H_INCLUDED
 #define RIPPLE_PROTOCOL_PUBLICKEY_H_INCLUDED
 
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/KeyType.h>
-#include <ripple/protocol/STExchange.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/json_get_or_throw.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/STExchange.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/json_get_or_throw.h>
+#include <xrpl/protocol/tokens.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/include/xrpl/protocol/Quality.h b/include/xrpl/protocol/Quality.h
index 06b8254df..1ee2cc9f6 100644
--- a/include/xrpl/protocol/Quality.h
+++ b/include/xrpl/protocol/Quality.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_QUALITY_H_INCLUDED
 #define RIPPLE_PROTOCOL_QUALITY_H_INCLUDED
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/STAmount.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/include/xrpl/protocol/QualityFunction.h b/include/xrpl/protocol/QualityFunction.h
index 5e08bdf8c..f71848814 100644
--- a/include/xrpl/protocol/QualityFunction.h
+++ b/include/xrpl/protocol/QualityFunction.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_QUALITYFUNCTION_H_INCLUDED
 #define RIPPLE_PROTOCOL_QUALITYFUNCTION_H_INCLUDED
 
-#include <ripple/basics/Number.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Quality.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/RPCErr.h b/include/xrpl/protocol/RPCErr.h
index bea3729c8..3ac019246 100644
--- a/include/xrpl/protocol/RPCErr.h
+++ b/include/xrpl/protocol/RPCErr.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NET_RPCERR_H_INCLUDED
 #define RIPPLE_NET_RPCERR_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/Rate.h b/include/xrpl/protocol/Rate.h
index 3524eabb6..b065acb23 100644
--- a/include/xrpl/protocol/Rate.h
+++ b/include/xrpl/protocol/Rate.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_RATE_H_INCLUDED
 #define RIPPLE_PROTOCOL_RATE_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <boost/operators.hpp>
 #include <cassert>
 #include <cstdint>
diff --git a/include/xrpl/protocol/RippleLedgerHash.h b/include/xrpl/protocol/RippleLedgerHash.h
index 2a7b57283..19ba803b8 100644
--- a/include/xrpl/protocol/RippleLedgerHash.h
+++ b/include/xrpl/protocol/RippleLedgerHash.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_RIPPLELEDGERHASH_H_INCLUDED
 #define RIPPLE_PROTOCOL_RIPPLELEDGERHASH_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/Rules.h b/include/xrpl/protocol/Rules.h
index a2b696bb5..7d6d9b0a9 100644
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_LEDGER_RULES_H_INCLUDED
 #define RIPPLE_LEDGER_RULES_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/protocol/STVector256.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/protocol/STVector256.h>
 
 #include <unordered_set>
 
diff --git a/include/xrpl/protocol/SField.h b/include/xrpl/protocol/SField.h
index 612a6e9cb..b8d289677 100644
--- a/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_SFIELD_H_INCLUDED
 #define RIPPLE_PROTOCOL_SFIELD_H_INCLUDED
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/json/json_value.h>
 
 #include <cstdint>
 #include <map>
diff --git a/include/xrpl/protocol/SOTemplate.h b/include/xrpl/protocol/SOTemplate.h
index 609c2d2c8..c0fcfb643 100644
--- a/include/xrpl/protocol/SOTemplate.h
+++ b/include/xrpl/protocol/SOTemplate.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_SOTEMPLATE_H_INCLUDED
 #define RIPPLE_PROTOCOL_SOTEMPLATE_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/SField.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/SField.h>
 #include <functional>
 #include <initializer_list>
 #include <memory>
diff --git a/include/xrpl/protocol/STAccount.h b/include/xrpl/protocol/STAccount.h
index c44327fe5..537a336e5 100644
--- a/include/xrpl/protocol/STAccount.h
+++ b/include/xrpl/protocol/STAccount.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/STBase.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/STBase.h>
 
 #include <string>
 
diff --git a/include/xrpl/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h
index 5e3c7b94b..b5a134a15 100644
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -20,16 +20,16 @@
 #ifndef RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/LocalValue.h>
-#include <ripple/basics/Number.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/json_get_or_throw.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/LocalValue.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/json_get_or_throw.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STArray.h b/include/xrpl/protocol/STArray.h
index f66aa690a..987e61326 100644
--- a/include/xrpl/protocol/STArray.h
+++ b/include/xrpl/protocol/STArray.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_STARRAY_H_INCLUDED
 #define RIPPLE_PROTOCOL_STARRAY_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/STObject.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/STObject.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STBase.h b/include/xrpl/protocol/STBase.h
index ec8c34a9d..e13ef6c5b 100644
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STBASE_H_INCLUDED
 #define RIPPLE_PROTOCOL_STBASE_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/Serializer.h>
 #include <memory>
 #include <ostream>
 #include <string>
diff --git a/include/xrpl/protocol/STBitString.h b/include/xrpl/protocol/STBitString.h
index decdfa648..7dc92303e 100644
--- a/include/xrpl/protocol/STBitString.h
+++ b/include/xrpl/protocol/STBitString.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED
 #define RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/beast/utility/Zero.h>
-#include <ripple/protocol/STBase.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/protocol/STBase.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STBlob.h b/include/xrpl/protocol/STBlob.h
index 3b2731be7..bdedbd921 100644
--- a/include/xrpl/protocol/STBlob.h
+++ b/include/xrpl/protocol/STBlob.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_STBLOB_H_INCLUDED
 #define RIPPLE_PROTOCOL_STBLOB_H_INCLUDED
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/STBase.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/STBase.h>
 
 #include <cassert>
 #include <cstring>
diff --git a/include/xrpl/protocol/STCurrency.h b/include/xrpl/protocol/STCurrency.h
index f855c2483..3383137fb 100644
--- a/include/xrpl/protocol/STCurrency.h
+++ b/include/xrpl/protocol/STCurrency.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PROTOCOL_STCURRENCY_H_INCLUDED
 #define RIPPLE_PROTOCOL_STCURRENCY_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STExchange.h b/include/xrpl/protocol/STExchange.h
index e22d75b08..e1a1215db 100644
--- a/include/xrpl/protocol/STExchange.h
+++ b/include/xrpl/protocol/STExchange.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_PROTOCOL_STEXCHANGE_H_INCLUDED
 #define RIPPLE_PROTOCOL_STEXCHANGE_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBlob.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/STObject.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBlob.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/STObject.h>
 #include <memory>
 #include <optional>
 #include <stdexcept>
diff --git a/include/xrpl/protocol/STInteger.h b/include/xrpl/protocol/STInteger.h
index aaf0f8c90..6bae2cc31 100644
--- a/include/xrpl/protocol/STInteger.h
+++ b/include/xrpl/protocol/STInteger.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED
 #define RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/STBase.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/STBase.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STIssue.h b/include/xrpl/protocol/STIssue.h
index 223798a89..a0dfbd4fa 100644
--- a/include/xrpl/protocol/STIssue.h
+++ b/include/xrpl/protocol/STIssue.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PROTOCOL_STISSUE_H_INCLUDED
 #define RIPPLE_PROTOCOL_STISSUE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STLedgerEntry.h b/include/xrpl/protocol/STLedgerEntry.h
index 6fd50aa15..6a57b3245 100644
--- a/include/xrpl/protocol/STLedgerEntry.h
+++ b/include/xrpl/protocol/STLedgerEntry.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED
 #define RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED
 
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STObject.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STObject.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STObject.h b/include/xrpl/protocol/STObject.h
index 38678f67a..5259994a9 100644
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -20,20 +20,20 @@
 #ifndef RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/SOTemplate.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STCurrency.h>
-#include <ripple/protocol/STIssue.h>
-#include <ripple/protocol/STPathSet.h>
-#include <ripple/protocol/STVector256.h>
-#include <ripple/protocol/impl/STVar.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/SOTemplate.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STCurrency.h>
+#include <xrpl/protocol/STIssue.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/detail/STVar.h>
 #include <boost/iterator/transform_iterator.hpp>
 #include <cassert>
 #include <optional>
diff --git a/include/xrpl/protocol/STParsedJSON.h b/include/xrpl/protocol/STParsedJSON.h
index 11cba5740..d2052bf1f 100644
--- a/include/xrpl/protocol/STParsedJSON.h
+++ b/include/xrpl/protocol/STParsedJSON.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED
 #define RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED
 
-#include <ripple/protocol/STArray.h>
+#include <xrpl/protocol/STArray.h>
 #include <optional>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/STPathSet.h b/include/xrpl/protocol/STPathSet.h
index 8102bc76e..473086368 100644
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED
 #define RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <cassert>
 #include <cstddef>
 #include <optional>
diff --git a/include/xrpl/protocol/STTx.h b/include/xrpl/protocol/STTx.h
index e166eb20d..08b9a1bad 100644
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_PROTOCOL_STTX_H_INCLUDED
 #define RIPPLE_PROTOCOL_STTX_H_INCLUDED
 
-#include <ripple/basics/Expected.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/SeqProxy.h>
-#include <ripple/protocol/TxFormats.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/SeqProxy.h>
+#include <xrpl/protocol/TxFormats.h>
 #include <boost/container/flat_set.hpp>
 
 #include <functional>
diff --git a/include/xrpl/protocol/STValidation.h b/include/xrpl/protocol/STValidation.h
index edd922e7b..6cae0971f 100644
--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PROTOCOL_STVALIDATION_H_INCLUDED
 #define RIPPLE_PROTOCOL_STVALIDATION_H_INCLUDED
 
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <cassert>
 #include <cstdint>
 #include <functional>
diff --git a/include/xrpl/protocol/STVector256.h b/include/xrpl/protocol/STVector256.h
index bf4a1cbec..e70297a40 100644
--- a/include/xrpl/protocol/STVector256.h
+++ b/include/xrpl/protocol/STVector256.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED
 #define RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STBitString.h>
-#include <ripple/protocol/STInteger.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STBitString.h>
+#include <xrpl/protocol/STInteger.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/STXChainBridge.h b/include/xrpl/protocol/STXChainBridge.h
index 537a1d160..38db1912c 100644
--- a/include/xrpl/protocol/STXChainBridge.h
+++ b/include/xrpl/protocol/STXChainBridge.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_STXCHAINBRIDGE_H_INCLUDED
 #define RIPPLE_PROTOCOL_STXCHAINBRIDGE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STIssue.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STIssue.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/SecretKey.h b/include/xrpl/protocol/SecretKey.h
index 824ae9b1e..67dc9c4ca 100644
--- a/include/xrpl/protocol/SecretKey.h
+++ b/include/xrpl/protocol/SecretKey.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_PROTOCOL_SECRETKEY_H_INCLUDED
 #define RIPPLE_PROTOCOL_SECRETKEY_H_INCLUDED
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/KeyType.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/Seed.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Seed.h>
+#include <xrpl/protocol/tokens.h>
 #include <array>
 #include <cstring>
 #include <string>
diff --git a/include/xrpl/protocol/Seed.h b/include/xrpl/protocol/Seed.h
index 2ebc64970..1d0a736db 100644
--- a/include/xrpl/protocol/Seed.h
+++ b/include/xrpl/protocol/Seed.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_SEED_H_INCLUDED
 #define RIPPLE_PROTOCOL_SEED_H_INCLUDED
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/tokens.h>
 #include <array>
 #include <optional>
 
diff --git a/include/xrpl/protocol/Serializer.h b/include/xrpl/protocol/Serializer.h
index e3ef00eaf..b85e8eb01 100644
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED
 #define RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/SField.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/SField.h>
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/include/xrpl/protocol/Sign.h b/include/xrpl/protocol/Sign.h
index 6af295304..30fbb2624 100644
--- a/include/xrpl/protocol/Sign.h
+++ b/include/xrpl/protocol/Sign.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_SIGN_H_INCLUDED
 #define RIPPLE_PROTOCOL_SIGN_H_INCLUDED
 
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <utility>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/SystemParameters.h b/include/xrpl/protocol/SystemParameters.h
index 50125d9fe..5b6d87185 100644
--- a/include/xrpl/protocol/SystemParameters.h
+++ b/include/xrpl/protocol/SystemParameters.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED
 #define RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/chrono.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/chrono.h>
 #include <cstdint>
 #include <string>
 
diff --git a/include/xrpl/protocol/TER.h b/include/xrpl/protocol/TER.h
index 10901c97b..2aa155a2f 100644
--- a/include/xrpl/protocol/TER.h
+++ b/include/xrpl/protocol/TER.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_TER_H_INCLUDED
 #define RIPPLE_PROTOCOL_TER_H_INCLUDED
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/json/json_value.h>
 
 #include <optional>
 #include <ostream>
diff --git a/include/xrpl/protocol/TxFormats.h b/include/xrpl/protocol/TxFormats.h
index 66f7b2626..fc27d444e 100644
--- a/include/xrpl/protocol/TxFormats.h
+++ b/include/xrpl/protocol/TxFormats.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED
 #define RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED
 
-#include <ripple/protocol/KnownFormats.h>
+#include <xrpl/protocol/KnownFormats.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/TxMeta.h b/include/xrpl/protocol/TxMeta.h
index 82fd62faa..40526e43b 100644
--- a/include/xrpl/protocol/TxMeta.h
+++ b/include/xrpl/protocol/TxMeta.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED
 #define RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/TER.h>
 #include <boost/container/flat_set.hpp>
 #include <optional>
 
diff --git a/include/xrpl/protocol/UintTypes.h b/include/xrpl/protocol/UintTypes.h
index 9743f7d49..5a69acecc 100644
--- a/include/xrpl/protocol/UintTypes.h
+++ b/include/xrpl/protocol/UintTypes.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED
 #define RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/utility/Zero.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/protocol/AccountID.h>
 
 namespace ripple {
 namespace detail {
diff --git a/include/xrpl/protocol/XChainAttestations.h b/include/xrpl/protocol/XChainAttestations.h
index b99a0b59a..721950ca9 100644
--- a/include/xrpl/protocol/XChainAttestations.h
+++ b/include/xrpl/protocol/XChainAttestations.h
@@ -20,16 +20,16 @@
 #ifndef RIPPLE_PROTOCOL_STXATTESTATIONS_H_INCLUDED
 #define RIPPLE_PROTOCOL_STXATTESTATIONS_H_INCLUDED
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Expected.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/TER.h>
 
 #include <boost/container/flat_set.hpp>
 #include <boost/container/vector.hpp>
diff --git a/include/xrpl/protocol/detail/STVar.h b/include/xrpl/protocol/detail/STVar.h
index 73863edbb..bee48aa53 100644
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STVAR_H_INCLUDED
 #define RIPPLE_PROTOCOL_STVAR_H_INCLUDED
 
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/Serializer.h>
 #include <cstddef>
 #include <cstdint>
 #include <typeinfo>
diff --git a/include/xrpl/protocol/detail/b58_utils.h b/include/xrpl/protocol/detail/b58_utils.h
index 1e7519f0e..b060fc7e1 100644
--- a/include/xrpl/protocol/detail/b58_utils.h
+++ b/include/xrpl/protocol/detail/b58_utils.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_B58_UTILS_H_INCLUDED
 #define RIPPLE_PROTOCOL_B58_UTILS_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/impl/token_errors.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/detail/token_errors.h>
 
 #include <boost/outcome.hpp>
 #include <boost/outcome/result.hpp>
diff --git a/include/xrpl/protocol/digest.h b/include/xrpl/protocol/digest.h
index 6507057dc..f3fc2ea5c 100644
--- a/include/xrpl/protocol/digest.h
+++ b/include/xrpl/protocol/digest.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_DIGEST_H_INCLUDED
 #define RIPPLE_PROTOCOL_DIGEST_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/crypto/secure_erase.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/crypto/secure_erase.h>
 #include <boost/endian/conversion.hpp>
 #include <algorithm>
 #include <array>
diff --git a/include/xrpl/protocol/json_get_or_throw.h b/include/xrpl/protocol/json_get_or_throw.h
index 86bd5924d..5277ee864 100644
--- a/include/xrpl/protocol/json_get_or_throw.h
+++ b/include/xrpl/protocol/json_get_or_throw.h
@@ -1,11 +1,11 @@
 #ifndef PROTOCOL_GET_OR_THROW_H_
 #define PROTOCOL_GET_OR_THROW_H_
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/SField.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 
 #include <charconv>
 #include <exception>
diff --git a/include/xrpl/protocol/jss.h b/include/xrpl/protocol/jss.h
index 3b2093e29..f4294f1e4 100644
--- a/include/xrpl/protocol/jss.h
+++ b/include/xrpl/protocol/jss.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED
 #define RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 namespace jss {
diff --git a/include/xrpl/protocol/messages.h b/include/xrpl/protocol/messages.h
index e9c9cf60b..640305185 100644
--- a/include/xrpl/protocol/messages.h
+++ b/include/xrpl/protocol/messages.h
@@ -31,6 +31,6 @@
 #undef TYPE_BOOL
 #endif
 
-#include <ripple/proto/ripple.pb.h>
+#include <xrpl/proto/ripple.pb.h>
 
 #endif
diff --git a/include/xrpl/protocol/nft.h b/include/xrpl/protocol/nft.h
index 2df8e0b89..839d872a6 100644
--- a/include/xrpl/protocol/nft.h
+++ b/include/xrpl/protocol/nft.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_NFT_H_INCLUDED
 #define RIPPLE_PROTOCOL_NFT_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/tagged_integer.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/tagged_integer.h>
+#include <xrpl/protocol/AccountID.h>
 
 #include <boost/endian/conversion.hpp>
 
diff --git a/include/xrpl/protocol/nftPageMask.h b/include/xrpl/protocol/nftPageMask.h
index a4890b460..1f8c39aa1 100644
--- a/include/xrpl/protocol/nftPageMask.h
+++ b/include/xrpl/protocol/nftPageMask.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_NFT_PAGE_MASK_H_INCLUDED
 #define RIPPLE_PROTOCOL_NFT_PAGE_MASK_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 #include <string_view>
 
 namespace ripple {
diff --git a/include/xrpl/protocol/serialize.h b/include/xrpl/protocol/serialize.h
index 93c59acfd..6d171c5e8 100644
--- a/include/xrpl/protocol/serialize.h
+++ b/include/xrpl/protocol/serialize.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_SERIALIZE_H_INCLUDED
 #define RIPPLE_PROTOCOL_SERIALIZE_H_INCLUDED
 
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/protocol/st.h b/include/xrpl/protocol/st.h
index 7d43ef75f..7b0e3a3b2 100644
--- a/include/xrpl/protocol/st.h
+++ b/include/xrpl/protocol/st.h
@@ -20,20 +20,20 @@
 #ifndef RIPPLE_PROTOCOL_ST_H_INCLUDED
 #define RIPPLE_PROTOCOL_ST_H_INCLUDED
 
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STBitString.h>
-#include <ripple/protocol/STBlob.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/STPathSet.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/STVector256.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STBitString.h>
+#include <xrpl/protocol/STBlob.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/STVector256.h>
 
 #endif
diff --git a/include/xrpl/protocol/tokens.h b/include/xrpl/protocol/tokens.h
index f51c3f96f..f0c4e79d4 100644
--- a/include/xrpl/protocol/tokens.h
+++ b/include/xrpl/protocol/tokens.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_TOKENS_H_INCLUDED
 #define RIPPLE_PROTOCOL_TOKENS_H_INCLUDED
 
-#include <ripple/basics/Expected.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/impl/token_errors.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/detail/token_errors.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/include/xrpl/resource/Consumer.h b/include/xrpl/resource/Consumer.h
index 34fb02ee6..00e4ad2c5 100644
--- a/include/xrpl/resource/Consumer.h
+++ b/include/xrpl/resource/Consumer.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_RESOURCE_CONSUMER_H_INCLUDED
 #define RIPPLE_RESOURCE_CONSUMER_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/resource/Charge.h>
-#include <ripple/resource/Disposition.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpl/resource/Disposition.h>
 
 namespace ripple {
 namespace Resource {
diff --git a/include/xrpl/resource/Fees.h b/include/xrpl/resource/Fees.h
index d3fd5f72c..d3750ec82 100644
--- a/include/xrpl/resource/Fees.h
+++ b/include/xrpl/resource/Fees.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_RESOURCE_FEES_H_INCLUDED
 #define RIPPLE_RESOURCE_FEES_H_INCLUDED
 
-#include <ripple/resource/Charge.h>
+#include <xrpl/resource/Charge.h>
 
 namespace ripple {
 namespace Resource {
diff --git a/include/xrpl/resource/Gossip.h b/include/xrpl/resource/Gossip.h
index 742fad640..6e2a86ecd 100644
--- a/include/xrpl/resource/Gossip.h
+++ b/include/xrpl/resource/Gossip.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_RESOURCE_GOSSIP_H_INCLUDED
 #define RIPPLE_RESOURCE_GOSSIP_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 
 namespace ripple {
 namespace Resource {
diff --git a/include/xrpl/resource/ResourceManager.h b/include/xrpl/resource/ResourceManager.h
index 10e20a82f..b33b141ee 100644
--- a/include/xrpl/resource/ResourceManager.h
+++ b/include/xrpl/resource/ResourceManager.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_RESOURCE_MANAGER_H_INCLUDED
 #define RIPPLE_RESOURCE_MANAGER_H_INCLUDED
 
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/json/json_value.h>
-#include <ripple/resource/Consumer.h>
-#include <ripple/resource/Gossip.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/resource/Consumer.h>
+#include <xrpl/resource/Gossip.h>
 #include <boost/utility/string_view.hpp>
 
 namespace ripple {
diff --git a/include/xrpl/resource/detail/Entry.h b/include/xrpl/resource/detail/Entry.h
index 126f25464..d4f32080d 100644
--- a/include/xrpl/resource/detail/Entry.h
+++ b/include/xrpl/resource/detail/Entry.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_RESOURCE_ENTRY_H_INCLUDED
 #define RIPPLE_RESOURCE_ENTRY_H_INCLUDED
 
-#include <ripple/basics/DecayingSample.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/core/List.h>
-#include <ripple/resource/impl/Key.h>
-#include <ripple/resource/impl/Tuning.h>
+#include <xrpl/basics/DecayingSample.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/core/List.h>
+#include <xrpl/resource/detail/Key.h>
+#include <xrpl/resource/detail/Tuning.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/include/xrpl/resource/detail/Import.h b/include/xrpl/resource/detail/Import.h
index 4eae3fafe..523156449 100644
--- a/include/xrpl/resource/detail/Import.h
+++ b/include/xrpl/resource/detail/Import.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RESOURCE_IMPORT_H_INCLUDED
 #define RIPPLE_RESOURCE_IMPORT_H_INCLUDED
 
-#include <ripple/resource/Consumer.h>
-#include <ripple/resource/impl/Entry.h>
+#include <xrpl/resource/Consumer.h>
+#include <xrpl/resource/detail/Entry.h>
 
 namespace ripple {
 namespace Resource {
diff --git a/include/xrpl/resource/detail/Key.h b/include/xrpl/resource/detail/Key.h
index 929c13eeb..3df2dce03 100644
--- a/include/xrpl/resource/detail/Key.h
+++ b/include/xrpl/resource/detail/Key.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RESOURCE_KEY_H_INCLUDED
 #define RIPPLE_RESOURCE_KEY_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/resource/impl/Kind.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/resource/detail/Kind.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/include/xrpl/resource/detail/Logic.h b/include/xrpl/resource/detail/Logic.h
index 07d89403b..a57e529e0 100644
--- a/include/xrpl/resource/detail/Logic.h
+++ b/include/xrpl/resource/detail/Logic.h
@@ -20,17 +20,17 @@
 #ifndef RIPPLE_RESOURCE_LOGIC_H_INCLUDED
 #define RIPPLE_RESOURCE_LOGIC_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/insight/Insight.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/resource/Gossip.h>
-#include <ripple/resource/impl/Import.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/insight/Insight.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpl/resource/Gossip.h>
+#include <xrpl/resource/detail/Import.h>
 #include <cassert>
 #include <mutex>
 
diff --git a/include/xrpl/server/Handoff.h b/include/xrpl/server/Handoff.h
index 2b80d6179..f57c9ef57 100644
--- a/include/xrpl/server/Handoff.h
+++ b/include/xrpl/server/Handoff.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SERVER_HANDOFF_H_INCLUDED
 #define RIPPLE_SERVER_HANDOFF_H_INCLUDED
 
-#include <ripple/server/Writer.h>
+#include <xrpl/server/Writer.h>
 #include <boost/beast/http/dynamic_body.hpp>
 #include <boost/beast/http/message.hpp>
 #include <memory>
diff --git a/include/xrpl/server/Port.h b/include/xrpl/server/Port.h
index 438d521ea..ed2ce0e3d 100644
--- a/include/xrpl/server/Port.h
+++ b/include/xrpl/server/Port.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SERVER_PORT_H_INCLUDED
 #define RIPPLE_SERVER_PORT_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/network_v4.hpp>
 #include <boost/asio/ip/network_v6.hpp>
diff --git a/include/xrpl/server/Server.h b/include/xrpl/server/Server.h
index a149e34fb..e8157c03c 100644
--- a/include/xrpl/server/Server.h
+++ b/include/xrpl/server/Server.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_SERVER_SERVER_H_INCLUDED
 #define RIPPLE_SERVER_SERVER_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/server/Port.h>
-#include <ripple/server/impl/ServerImpl.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/server/Port.h>
+#include <xrpl/server/detail/ServerImpl.h>
 #include <boost/asio/io_service.hpp>
 
 namespace ripple {
diff --git a/include/xrpl/server/Session.h b/include/xrpl/server/Session.h
index 3b22c06b0..25cf1ad74 100644
--- a/include/xrpl/server/Session.h
+++ b/include/xrpl/server/Session.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_SERVER_SESSION_H_INCLUDED
 #define RIPPLE_SERVER_SESSION_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/server/WSSession.h>
-#include <ripple/server/Writer.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/server/WSSession.h>
+#include <xrpl/server/Writer.h>
 #include <boost/beast/http/message.hpp>
 #include <functional>
 #include <memory>
diff --git a/include/xrpl/server/SimpleWriter.h b/include/xrpl/server/SimpleWriter.h
index 03582c001..0e3f63b0d 100644
--- a/include/xrpl/server/SimpleWriter.h
+++ b/include/xrpl/server/SimpleWriter.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED
 #define RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED
 
-#include <ripple/server/Writer.h>
+#include <xrpl/server/Writer.h>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/http/message.hpp>
diff --git a/include/xrpl/server/UDPDoor.h b/include/xrpl/server/UDPDoor.h
index 60e417d2c..6205dd168 100644
--- a/include/xrpl/server/UDPDoor.h
+++ b/include/xrpl/server/UDPDoor.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SERVER_UDPDOOR_H_INCLUDED
 #define RIPPLE_SERVER_UDPDOOR_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/server/impl/PlainHTTPPeer.h>
-#include <ripple/server/impl/SSLHTTPPeer.h>
-#include <ripple/server/impl/io_list.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/server/detail/PlainHTTPPeer.h>
+#include <xrpl/server/detail/SSLHTTPPeer.h>
+#include <xrpl/server/detail/io_list.h>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_context.hpp>
diff --git a/include/xrpl/server/WSSession.h b/include/xrpl/server/WSSession.h
index 812099108..d739afcef 100644
--- a/include/xrpl/server/WSSession.h
+++ b/include/xrpl/server/WSSession.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_SERVER_WSSESSION_H_INCLUDED
 #define RIPPLE_SERVER_WSSESSION_H_INCLUDED
 
-#include <ripple/server/Handoff.h>
-#include <ripple/server/Port.h>
-#include <ripple/server/Writer.h>
+#include <xrpl/server/Handoff.h>
+#include <xrpl/server/Port.h>
+#include <xrpl/server/Writer.h>
 
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/ip/tcp.hpp>
diff --git a/include/xrpl/server/detail/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h
index a6bbd18e1..171eb7134 100644
--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_SERVER_BASEHTTPPEER_H_INCLUDED
 #define RIPPLE_SERVER_BASEHTTPPEER_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/server/Session.h>
-#include <ripple/server/impl/io_list.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/server/Session.h>
+#include <xrpl/server/detail/io_list.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/ssl/stream.hpp>
diff --git a/include/xrpl/server/detail/BasePeer.h b/include/xrpl/server/detail/BasePeer.h
index bc5375b87..a90eaabf6 100644
--- a/include/xrpl/server/detail/BasePeer.h
+++ b/include/xrpl/server/detail/BasePeer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_SERVER_BASEPEER_H_INCLUDED
 #define RIPPLE_SERVER_BASEPEER_H_INCLUDED
 
-#include <ripple/beast/utility/WrappedSink.h>
-#include <ripple/server/Port.h>
-#include <ripple/server/impl/LowestLayer.h>
-#include <ripple/server/impl/io_list.h>
+#include <xrpl/beast/utility/WrappedSink.h>
+#include <xrpl/server/Port.h>
+#include <xrpl/server/detail/LowestLayer.h>
+#include <xrpl/server/detail/io_list.h>
 #include <boost/asio.hpp>
 #include <atomic>
 #include <cassert>
diff --git a/include/xrpl/server/detail/BaseWSPeer.h b/include/xrpl/server/detail/BaseWSPeer.h
index fd1722df0..4c4049a8b 100644
--- a/include/xrpl/server/detail/BaseWSPeer.h
+++ b/include/xrpl/server/detail/BaseWSPeer.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SERVER_BASEWSPEER_H_INCLUDED
 #define RIPPLE_SERVER_BASEWSPEER_H_INCLUDED
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/server/impl/BasePeer.h>
-#include <ripple/server/impl/LowestLayer.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/server/detail/BasePeer.h>
+#include <xrpl/server/detail/LowestLayer.h>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/websocket.hpp>
diff --git a/include/xrpl/server/detail/Door.h b/include/xrpl/server/detail/Door.h
index 94f397195..20bdf421e 100644
--- a/include/xrpl/server/detail/Door.h
+++ b/include/xrpl/server/detail/Door.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SERVER_DOOR_H_INCLUDED
 #define RIPPLE_SERVER_DOOR_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/server/impl/PlainHTTPPeer.h>
-#include <ripple/server/impl/SSLHTTPPeer.h>
-#include <ripple/server/impl/io_list.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/server/detail/PlainHTTPPeer.h>
+#include <xrpl/server/detail/SSLHTTPPeer.h>
+#include <xrpl/server/detail/io_list.h>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_context.hpp>
diff --git a/include/xrpl/server/detail/JSONRPCUtil.h b/include/xrpl/server/detail/JSONRPCUtil.h
index d6b67e123..7eb000962 100644
--- a/include/xrpl/server/detail/JSONRPCUtil.h
+++ b/include/xrpl/server/detail/JSONRPCUtil.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED
 #define RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED
 
-#include <ripple/json/Output.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/json/Output.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 
diff --git a/include/xrpl/server/detail/PlainHTTPPeer.h b/include/xrpl/server/detail/PlainHTTPPeer.h
index 4c593ce9c..d4b24c013 100644
--- a/include/xrpl/server/detail/PlainHTTPPeer.h
+++ b/include/xrpl/server/detail/PlainHTTPPeer.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_SERVER_PLAINHTTPPEER_H_INCLUDED
 #define RIPPLE_SERVER_PLAINHTTPPEER_H_INCLUDED
 
-#include <ripple/beast/rfc2616.h>
-#include <ripple/server/impl/BaseHTTPPeer.h>
-#include <ripple/server/impl/PlainWSPeer.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpl/server/detail/BaseHTTPPeer.h>
+#include <xrpl/server/detail/PlainWSPeer.h>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <memory>
 
diff --git a/include/xrpl/server/detail/PlainWSPeer.h b/include/xrpl/server/detail/PlainWSPeer.h
index 504b38baa..8bcddee7e 100644
--- a/include/xrpl/server/detail/PlainWSPeer.h
+++ b/include/xrpl/server/detail/PlainWSPeer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SERVER_PLAINWSPEER_H_INCLUDED
 #define RIPPLE_SERVER_PLAINWSPEER_H_INCLUDED
 
-#include <ripple/server/impl/BaseWSPeer.h>
+#include <xrpl/server/detail/BaseWSPeer.h>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <memory>
 
diff --git a/include/xrpl/server/detail/SSLHTTPPeer.h b/include/xrpl/server/detail/SSLHTTPPeer.h
index 8b5b4e38c..db6af46b5 100644
--- a/include/xrpl/server/detail/SSLHTTPPeer.h
+++ b/include/xrpl/server/detail/SSLHTTPPeer.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SERVER_SSLHTTPPEER_H_INCLUDED
 #define RIPPLE_SERVER_SSLHTTPPEER_H_INCLUDED
 
-#include <ripple/server/impl/BaseHTTPPeer.h>
-#include <ripple/server/impl/SSLWSPeer.h>
+#include <xrpl/server/detail/BaseHTTPPeer.h>
+#include <xrpl/server/detail/SSLWSPeer.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/stream.hpp>
diff --git a/include/xrpl/server/detail/SSLWSPeer.h b/include/xrpl/server/detail/SSLWSPeer.h
index 28c3184fc..9c88b2753 100644
--- a/include/xrpl/server/detail/SSLWSPeer.h
+++ b/include/xrpl/server/detail/SSLWSPeer.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SERVER_SSLWSPEER_H_INCLUDED
 #define RIPPLE_SERVER_SSLWSPEER_H_INCLUDED
 
-#include <ripple/server/WSSession.h>
-#include <ripple/server/impl/BaseHTTPPeer.h>
+#include <xrpl/server/WSSession.h>
+#include <xrpl/server/detail/BaseHTTPPeer.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/stream.hpp>
diff --git a/include/xrpl/server/detail/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h
index 8c0622396..89fb3a663 100644
--- a/include/xrpl/server/detail/ServerImpl.h
+++ b/include/xrpl/server/detail/ServerImpl.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SERVER_SERVERIMPL_H_INCLUDED
 #define RIPPLE_SERVER_SERVERIMPL_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/core/List.h>
-#include <ripple/server/Server.h>
-#include <ripple/server/impl/Door.h>
-#include <ripple/server/impl/UDPDoor.h>
-#include <ripple/server/impl/io_list.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/core/List.h>
+#include <xrpl/server/Server.h>
+#include <xrpl/server/detail/Door.h>
+#include <xrpl/server/detail/UDPDoor.h>
+#include <xrpl/server/detail/io_list.h>
 #include <boost/asio.hpp>
 #include <array>
 #include <chrono>
diff --git a/src/libxrpl/basics/Archive.cpp b/src/libxrpl/basics/Archive.cpp
index 73e14a936..e5672bd95 100644
--- a/src/libxrpl/basics/Archive.cpp
+++ b/src/libxrpl/basics/Archive.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Archive.h>
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/Archive.h>
+#include <xrpl/basics/contract.h>
 
 #include <archive.h>
 #include <archive_entry.h>
diff --git a/src/libxrpl/basics/BasicConfig.cpp b/src/libxrpl/basics/BasicConfig.cpp
index f557d2e6d..932eea346 100644
--- a/src/libxrpl/basics/BasicConfig.cpp
+++ b/src/libxrpl/basics/BasicConfig.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/StringUtilities.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/StringUtilities.h>
 #include <boost/regex.hpp>
 #include <algorithm>
 
diff --git a/src/libxrpl/basics/CountedObject.cpp b/src/libxrpl/basics/CountedObject.cpp
index 5b2509163..c18152938 100644
--- a/src/libxrpl/basics/CountedObject.cpp
+++ b/src/libxrpl/basics/CountedObject.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/CountedObject.h>
+#include <xrpl/basics/CountedObject.h>
 #include <algorithm>
 #include <type_traits>
 
diff --git a/src/libxrpl/basics/FileUtilities.cpp b/src/libxrpl/basics/FileUtilities.cpp
index d94f588f1..02139990a 100644
--- a/src/libxrpl/basics/FileUtilities.cpp
+++ b/src/libxrpl/basics/FileUtilities.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/FileUtilities.h>
+#include <xrpl/basics/FileUtilities.h>
 #include <fstream>
 
 namespace ripple {
diff --git a/src/libxrpl/basics/IOUAmount.cpp b/src/libxrpl/basics/IOUAmount.cpp
index e3c341105..a24e1b917 100644
--- a/src/libxrpl/basics/IOUAmount.cpp
+++ b/src/libxrpl/basics/IOUAmount.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/contract.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <algorithm>
 #include <iterator>
diff --git a/src/libxrpl/basics/Log.cpp b/src/libxrpl/basics/Log.cpp
index c023bc164..3d5963cc2 100644
--- a/src/libxrpl/basics/Log.cpp
+++ b/src/libxrpl/basics/Log.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/contract.h>
 #include <boost/algorithm/string.hpp>
 #include <cassert>
 #include <fstream>
diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp
index 9b3247536..14260b653 100644
--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Number.h>
+#include <xrpl/basics/Number.h>
 #include <boost/predef.h>
 #include <algorithm>
 #include <cassert>
diff --git a/src/libxrpl/basics/ResolverAsio.cpp b/src/libxrpl/basics/ResolverAsio.cpp
index f75a39030..53530da9d 100644
--- a/src/libxrpl/basics/ResolverAsio.cpp
+++ b/src/libxrpl/basics/ResolverAsio.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/ResolverAsio.h>
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/ResolverAsio.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 #include <boost/asio.hpp>
 #include <atomic>
 #include <cassert>
diff --git a/src/libxrpl/basics/StringUtilities.cpp b/src/libxrpl/basics/StringUtilities.cpp
index 67344b480..cd9bdfbd0 100644
--- a/src/libxrpl/basics/StringUtilities.cpp
+++ b/src/libxrpl/basics/StringUtilities.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/ToString.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/ToString.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
diff --git a/src/libxrpl/basics/UptimeClock.cpp b/src/libxrpl/basics/UptimeClock.cpp
index 2dacaef46..4394d02f7 100644
--- a/src/libxrpl/basics/UptimeClock.cpp
+++ b/src/libxrpl/basics/UptimeClock.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/UptimeClock.h>
+#include <xrpl/basics/UptimeClock.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/basics/base64.cpp b/src/libxrpl/basics/base64.cpp
index 4291a9955..a8b4e3529 100644
--- a/src/libxrpl/basics/base64.cpp
+++ b/src/libxrpl/basics/base64.cpp
@@ -54,7 +54,7 @@
 
 */
 
-#include <ripple/basics/base64.h>
+#include <xrpl/basics/base64.h>
 
 #include <cctype>
 #include <utility>
diff --git a/src/libxrpl/basics/contract.cpp b/src/libxrpl/basics/contract.cpp
index 3a50db380..fbda83c7a 100644
--- a/src/libxrpl/basics/contract.cpp
+++ b/src/libxrpl/basics/contract.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
 #include <cstdlib>
 #include <iostream>
 
diff --git a/src/libxrpl/basics/make_SSLContext.cpp b/src/libxrpl/basics/make_SSLContext.cpp
index 7d72d9e08..4a9ea321d 100644
--- a/src/libxrpl/basics/make_SSLContext.cpp
+++ b/src/libxrpl/basics/make_SSLContext.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/make_SSLContext.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/make_SSLContext.h>
 #include <ctime>
 #include <stdexcept>
 
diff --git a/src/libxrpl/basics/mulDiv.cpp b/src/libxrpl/basics/mulDiv.cpp
index a991b8bde..fbc373cd7 100644
--- a/src/libxrpl/basics/mulDiv.cpp
+++ b/src/libxrpl/basics/mulDiv.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/mulDiv.h>
+#include <xrpl/basics/mulDiv.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <optional>
 
diff --git a/src/libxrpl/basics/partitioned_unordered_map.cpp b/src/libxrpl/basics/partitioned_unordered_map.cpp
index 3ced32edd..a6d02cd2c 100644
--- a/src/libxrpl/basics/partitioned_unordered_map.cpp
+++ b/src/libxrpl/basics/partitioned_unordered_map.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/partitioned_unordered_map.h>
+#include <xrpl/basics/partitioned_unordered_map.h>
 
-#include <ripple/basics/SHAMapHash.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/SHAMapHash.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/protocol/Protocol.h>
 #include <limits>
 #include <string>
 
diff --git a/src/libxrpl/beast/clock/basic_seconds_clock.cpp b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
index 7c55a3f8b..f5af8bd16 100644
--- a/src/libxrpl/beast/clock/basic_seconds_clock.cpp
+++ b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/clock/basic_seconds_clock.h>
+#include <xrpl/beast/clock/basic_seconds_clock.h>
 
 #include <atomic>
 #include <cassert>
diff --git a/src/libxrpl/beast/core/CurrentThreadName.cpp b/src/libxrpl/beast/core/CurrentThreadName.cpp
index 80d275a1f..71b5d21fe 100644
--- a/src/libxrpl/beast/core/CurrentThreadName.cpp
+++ b/src/libxrpl/beast/core/CurrentThreadName.cpp
@@ -21,7 +21,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/CurrentThreadName.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
 #include <boost/predef.h>
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/beast/core/SemanticVersion.cpp b/src/libxrpl/beast/core/SemanticVersion.cpp
index 9d127a095..b33ed2f48 100644
--- a/src/libxrpl/beast/core/SemanticVersion.cpp
+++ b/src/libxrpl/beast/core/SemanticVersion.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/core/SemanticVersion.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/core/SemanticVersion.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/libxrpl/beast/insight/Collector.cpp b/src/libxrpl/beast/insight/Collector.cpp
index e0f0e6ec6..4fdf6de98 100644
--- a/src/libxrpl/beast/insight/Collector.cpp
+++ b/src/libxrpl/beast/insight/Collector.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Collector.h>
 
 namespace beast {
 namespace insight {
diff --git a/src/libxrpl/beast/insight/Groups.cpp b/src/libxrpl/beast/insight/Groups.cpp
index 7877034b9..fcf7e6578 100644
--- a/src/libxrpl/beast/insight/Groups.cpp
+++ b/src/libxrpl/beast/insight/Groups.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/insight/Group.h>
-#include <ripple/beast/insight/Groups.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/insight/Group.h>
+#include <xrpl/beast/insight/Groups.h>
 #include <memory>
 #include <unordered_map>
 
diff --git a/src/libxrpl/beast/insight/Hook.cpp b/src/libxrpl/beast/insight/Hook.cpp
index 53ae6475a..625388463 100644
--- a/src/libxrpl/beast/insight/Hook.cpp
+++ b/src/libxrpl/beast/insight/Hook.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/insight/Hook.h>
+#include <xrpl/beast/insight/Hook.h>
 
 namespace beast {
 namespace insight {
diff --git a/src/libxrpl/beast/insight/Metric.cpp b/src/libxrpl/beast/insight/Metric.cpp
index aa38e2f81..64a4082fc 100644
--- a/src/libxrpl/beast/insight/Metric.cpp
+++ b/src/libxrpl/beast/insight/Metric.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/insight/CounterImpl.h>
-#include <ripple/beast/insight/EventImpl.h>
-#include <ripple/beast/insight/GaugeImpl.h>
-#include <ripple/beast/insight/MeterImpl.h>
+#include <xrpl/beast/insight/CounterImpl.h>
+#include <xrpl/beast/insight/EventImpl.h>
+#include <xrpl/beast/insight/GaugeImpl.h>
+#include <xrpl/beast/insight/MeterImpl.h>
 
 namespace beast {
 namespace insight {
diff --git a/src/libxrpl/beast/insight/NullCollector.cpp b/src/libxrpl/beast/insight/NullCollector.cpp
index b859de552..637cd06ec 100644
--- a/src/libxrpl/beast/insight/NullCollector.cpp
+++ b/src/libxrpl/beast/insight/NullCollector.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/insight/NullCollector.h>
+#include <xrpl/beast/insight/NullCollector.h>
 
 namespace beast {
 namespace insight {
diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp
index 6949a7f86..76ae15b82 100644
--- a/src/libxrpl/beast/insight/StatsDCollector.cpp
+++ b/src/libxrpl/beast/insight/StatsDCollector.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/List.h>
-#include <ripple/beast/insight/CounterImpl.h>
-#include <ripple/beast/insight/EventImpl.h>
-#include <ripple/beast/insight/GaugeImpl.h>
-#include <ripple/beast/insight/HookImpl.h>
-#include <ripple/beast/insight/MeterImpl.h>
-#include <ripple/beast/insight/StatsDCollector.h>
-#include <ripple/beast/net/IPAddressConversion.h>
+#include <xrpl/beast/core/List.h>
+#include <xrpl/beast/insight/CounterImpl.h>
+#include <xrpl/beast/insight/EventImpl.h>
+#include <xrpl/beast/insight/GaugeImpl.h>
+#include <xrpl/beast/insight/HookImpl.h>
+#include <xrpl/beast/insight/MeterImpl.h>
+#include <xrpl/beast/insight/StatsDCollector.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <cassert>
 #include <climits>
diff --git a/src/libxrpl/beast/net/IPAddressConversion.cpp b/src/libxrpl/beast/net/IPAddressConversion.cpp
index 6353c50df..2ab84c370 100644
--- a/src/libxrpl/beast/net/IPAddressConversion.cpp
+++ b/src/libxrpl/beast/net/IPAddressConversion.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/net/IPAddressConversion.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
 
 namespace beast {
 namespace IP {
diff --git a/src/libxrpl/beast/net/IPAddressV4.cpp b/src/libxrpl/beast/net/IPAddressV4.cpp
index 7e428c422..835414798 100644
--- a/src/libxrpl/beast/net/IPAddressV4.cpp
+++ b/src/libxrpl/beast/net/IPAddressV4.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/net/IPAddressV4.h>
+#include <xrpl/beast/net/IPAddressV4.h>
 
 #include <sstream>
 #include <stdexcept>
diff --git a/src/libxrpl/beast/net/IPAddressV6.cpp b/src/libxrpl/beast/net/IPAddressV6.cpp
index 07dd2baae..f90a6d066 100644
--- a/src/libxrpl/beast/net/IPAddressV6.cpp
+++ b/src/libxrpl/beast/net/IPAddressV6.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/net/IPAddressV4.h>
-#include <ripple/beast/net/IPAddressV6.h>
+#include <xrpl/beast/net/IPAddressV4.h>
+#include <xrpl/beast/net/IPAddressV6.h>
 
 namespace beast {
 namespace IP {
diff --git a/src/libxrpl/beast/net/IPEndpoint.cpp b/src/libxrpl/beast/net/IPEndpoint.cpp
index 4ad71262c..490777111 100644
--- a/src/libxrpl/beast/net/IPEndpoint.cpp
+++ b/src/libxrpl/beast/net/IPEndpoint.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 #include <boost/algorithm/string.hpp>
 
 namespace beast {
diff --git a/src/libxrpl/beast/utility/src/beast_Journal.cpp b/src/libxrpl/beast/utility/src/beast_Journal.cpp
index 7c332bf6b..261e1f6cc 100644
--- a/src/libxrpl/beast/utility/src/beast_Journal.cpp
+++ b/src/libxrpl/beast/utility/src/beast_Journal.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <cassert>
 
 namespace beast {
diff --git a/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp b/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp
index ecd707e95..56e862ca8 100644
--- a/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp
+++ b/src/libxrpl/beast/utility/src/beast_PropertyStream.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/PropertyStream.h>
+#include <xrpl/beast/utility/PropertyStream.h>
 #include <algorithm>
 #include <cassert>
 #include <iostream>
diff --git a/src/libxrpl/crypto/RFC1751.cpp b/src/libxrpl/crypto/RFC1751.cpp
index 6b6b2c31f..1c6f28287 100644
--- a/src/libxrpl/crypto/RFC1751.cpp
+++ b/src/libxrpl/crypto/RFC1751.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/crypto/RFC1751.h>
+#include <xrpl/crypto/RFC1751.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/copied.hpp>
 #include <cassert>
diff --git a/src/libxrpl/crypto/csprng.cpp b/src/libxrpl/crypto/csprng.cpp
index 04b3b3fc3..480d561ea 100644
--- a/src/libxrpl/crypto/csprng.cpp
+++ b/src/libxrpl/crypto/csprng.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/crypto/csprng.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/crypto/csprng.h>
 #include <array>
 #include <cassert>
 #include <openssl/rand.h>
diff --git a/src/libxrpl/crypto/secure_erase.cpp b/src/libxrpl/crypto/secure_erase.cpp
index 8299ed7a6..93f189d51 100644
--- a/src/libxrpl/crypto/secure_erase.cpp
+++ b/src/libxrpl/crypto/secure_erase.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/crypto/secure_erase.h>
+#include <xrpl/crypto/secure_erase.h>
 #include <openssl/crypto.h>
 
 namespace ripple {
diff --git a/src/libxrpl/json/JsonPropertyStream.cpp b/src/libxrpl/json/JsonPropertyStream.cpp
index 3083deeee..19387013b 100644
--- a/src/libxrpl/json/JsonPropertyStream.cpp
+++ b/src/libxrpl/json/JsonPropertyStream.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/json/JsonPropertyStream.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/json/JsonPropertyStream.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/json/Object.cpp b/src/libxrpl/json/Object.cpp
index a855fc31a..179b0e31e 100644
--- a/src/libxrpl/json/Object.cpp
+++ b/src/libxrpl/json/Object.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/json/Object.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/Object.h>
 #include <cassert>
 
 namespace Json {
diff --git a/src/libxrpl/json/Output.cpp b/src/libxrpl/json/Output.cpp
index b32e9ad5a..c24c75b32 100644
--- a/src/libxrpl/json/Output.cpp
+++ b/src/libxrpl/json/Output.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/json/Output.h>
-#include <ripple/json/Writer.h>
+#include <xrpl/json/Output.h>
+#include <xrpl/json/Writer.h>
 
 namespace Json {
 
diff --git a/src/libxrpl/json/Writer.cpp b/src/libxrpl/json/Writer.cpp
index 44d106aa3..ba7336209 100644
--- a/src/libxrpl/json/Writer.cpp
+++ b/src/libxrpl/json/Writer.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/json/Output.h>
-#include <ripple/json/Writer.h>
+#include <xrpl/json/Output.h>
+#include <xrpl/json/Writer.h>
 #include <set>
 #include <stack>
 
diff --git a/src/libxrpl/json/json_reader.cpp b/src/libxrpl/json/json_reader.cpp
index 001049bcd..42488b3ec 100644
--- a/src/libxrpl/json/json_reader.cpp
+++ b/src/libxrpl/json/json_reader.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/json/json_reader.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/json_reader.h>
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/libxrpl/json/json_value.cpp b/src/libxrpl/json/json_value.cpp
index 024ad2c88..155c3e1e0 100644
--- a/src/libxrpl/json/json_value.cpp
+++ b/src/libxrpl/json/json_value.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/json/impl/json_assert.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/json/to_string.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/json/detail/json_assert.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/json/to_string.h>
 
 namespace Json {
 
diff --git a/src/libxrpl/json/json_valueiterator.cpp b/src/libxrpl/json/json_valueiterator.cpp
index 355bfad23..c1a1bcc56 100644
--- a/src/libxrpl/json/json_valueiterator.cpp
+++ b/src/libxrpl/json/json_valueiterator.cpp
@@ -19,7 +19,7 @@
 
 // included by json_value.cpp
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 
 namespace Json {
 
diff --git a/src/libxrpl/json/json_writer.cpp b/src/libxrpl/json/json_writer.cpp
index 4d696ab55..5459042cd 100644
--- a/src/libxrpl/json/json_writer.cpp
+++ b/src/libxrpl/json/json_writer.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_writer.h>
+#include <xrpl/json/json_writer.h>
 #include <cassert>
 #include <iomanip>
 #include <sstream>
diff --git a/src/libxrpl/json/to_string.cpp b/src/libxrpl/json/to_string.cpp
index b96541772..7bf582412 100644
--- a/src/libxrpl/json/to_string.cpp
+++ b/src/libxrpl/json/to_string.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_writer.h>
-#include <ripple/json/to_string.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/json/to_string.h>
 
 namespace Json {
 
diff --git a/src/libxrpl/protocol/AMMCore.cpp b/src/libxrpl/protocol/AMMCore.cpp
index b774ee4ee..7ac27041e 100644
--- a/src/libxrpl/protocol/AMMCore.cpp
+++ b/src/libxrpl/protocol/AMMCore.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/digest.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/AccountID.cpp b/src/libxrpl/protocol/AccountID.cpp
index acc1c4cd9..414a91996 100644
--- a/src/libxrpl/protocol/AccountID.cpp
+++ b/src/libxrpl/protocol/AccountID.cpp
@@ -16,12 +16,12 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/basics/spinlock.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/basics/spinlock.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/tokens.h>
 #include <array>
 #include <cstring>
 #include <mutex>
diff --git a/src/libxrpl/protocol/Book.cpp b/src/libxrpl/protocol/Book.cpp
index 3ad22675d..c096dba2b 100644
--- a/src/libxrpl/protocol/Book.cpp
+++ b/src/libxrpl/protocol/Book.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Book.h>
+#include <xrpl/protocol/Book.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp
index 11d34b2ad..fae79724a 100644
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/core/SemanticVersion.h>
-#include <ripple/protocol/BuildInfo.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/core/SemanticVersion.h>
+#include <xrpl/protocol/BuildInfo.h>
 #include <boost/preprocessor/stringize.hpp>
 #include <algorithm>
 #include <optional>
diff --git a/src/libxrpl/protocol/ErrorCodes.cpp b/src/libxrpl/protocol/ErrorCodes.cpp
index 9574675fb..c6c2fd7a3 100644
--- a/src/libxrpl/protocol/ErrorCodes.cpp
+++ b/src/libxrpl/protocol/ErrorCodes.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/ErrorCodes.h>
+#include <xrpl/protocol/ErrorCodes.h>
 #include <array>
 #include <cassert>
 #include <stdexcept>
diff --git a/src/libxrpl/protocol/Feature.cpp b/src/libxrpl/protocol/Feature.cpp
index 40af039df..dd4e595e5 100644
--- a/src/libxrpl/protocol/Feature.cpp
+++ b/src/libxrpl/protocol/Feature.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
+#include <xrpl/protocol/Feature.h>
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/digest.h>
 #include <boost/container_hash/hash.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/key_extractors.hpp>
diff --git a/src/libxrpl/protocol/Indexes.cpp b/src/libxrpl/protocol/Indexes.cpp
index 6a3cf1188..aea0fd4e2 100644
--- a/src/libxrpl/protocol/Indexes.cpp
+++ b/src/libxrpl/protocol/Indexes.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/SeqProxy.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/nftPageMask.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/SeqProxy.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/nftPageMask.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/libxrpl/protocol/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp
index 041615940..71296f7b3 100644
--- a/src/libxrpl/protocol/InnerObjectFormats.cpp
+++ b/src/libxrpl/protocol/InnerObjectFormats.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/InnerObjectFormats.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/SOTemplate.h>
+#include <xrpl/protocol/InnerObjectFormats.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/SOTemplate.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/Issue.cpp b/src/libxrpl/protocol/Issue.cpp
index 623ce24bb..70d2c013d 100644
--- a/src/libxrpl/protocol/Issue.cpp
+++ b/src/libxrpl/protocol/Issue.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Issue.h>
+#include <xrpl/protocol/Issue.h>
 
-#include <ripple/json/json_errors.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/json/json_errors.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/Keylet.cpp b/src/libxrpl/protocol/Keylet.cpp
index 2488e8b45..23847811d 100644
--- a/src/libxrpl/protocol/Keylet.cpp
+++ b/src/libxrpl/protocol/Keylet.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Keylet.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/LedgerFormats.cpp b/src/libxrpl/protocol/LedgerFormats.cpp
index 748545ff5..b257f3217 100644
--- a/src/libxrpl/protocol/LedgerFormats.cpp
+++ b/src/libxrpl/protocol/LedgerFormats.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/jss.h>
 #include <utility>
 
 namespace ripple {
diff --git a/src/libxrpl/protocol/LedgerHeader.cpp b/src/libxrpl/protocol/LedgerHeader.cpp
index 6d13db224..284c4dc05 100644
--- a/src/libxrpl/protocol/LedgerHeader.cpp
+++ b/src/libxrpl/protocol/LedgerHeader.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/LedgerHeader.h>
+#include <xrpl/protocol/LedgerHeader.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/NFTSyntheticSerializer.cpp b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
index e34397ada..03c9e79e2 100644
--- a/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
+++ b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/NFTSyntheticSerializer.h>
-#include <ripple/protocol/NFTokenID.h>
-#include <ripple/protocol/NFTokenOfferID.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/NFTSyntheticSerializer.h>
+#include <xrpl/protocol/NFTokenID.h>
+#include <xrpl/protocol/NFTokenOfferID.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/NFTokenID.cpp b/src/libxrpl/protocol/NFTokenID.cpp
index ea6ab984c..72fb8b87b 100644
--- a/src/libxrpl/protocol/NFTokenID.cpp
+++ b/src/libxrpl/protocol/NFTokenID.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/NFTokenID.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/NFTokenID.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/NFTokenOfferID.cpp b/src/libxrpl/protocol/NFTokenOfferID.cpp
index 51408bfb2..3d761e6b9 100644
--- a/src/libxrpl/protocol/NFTokenOfferID.cpp
+++ b/src/libxrpl/protocol/NFTokenOfferID.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/NFTokenOfferID.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/NFTokenOfferID.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp
index 22cb351e6..b2a5fc7ef 100644
--- a/src/libxrpl/protocol/PublicKey.cpp
+++ b/src/libxrpl/protocol/PublicKey.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/impl/secp256k1.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/detail/secp256k1.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <ed25519.h>
 
diff --git a/src/libxrpl/protocol/Quality.cpp b/src/libxrpl/protocol/Quality.cpp
index 2cb60f738..38b641328 100644
--- a/src/libxrpl/protocol/Quality.cpp
+++ b/src/libxrpl/protocol/Quality.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Quality.h>
+#include <xrpl/protocol/Quality.h>
 #include <cassert>
 #include <limits>
 
diff --git a/src/libxrpl/protocol/QualityFunction.cpp b/src/libxrpl/protocol/QualityFunction.cpp
index 292709284..64e5a3698 100644
--- a/src/libxrpl/protocol/QualityFunction.cpp
+++ b/src/libxrpl/protocol/QualityFunction.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/QualityFunction.h>
+#include <xrpl/protocol/QualityFunction.h>
 
-#include <ripple/protocol/Quality.h>
+#include <xrpl/protocol/Quality.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/RPCErr.cpp b/src/libxrpl/protocol/RPCErr.cpp
index 633a4135f..107940322 100644
--- a/src/libxrpl/protocol/RPCErr.cpp
+++ b/src/libxrpl/protocol/RPCErr.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/Rate2.cpp b/src/libxrpl/protocol/Rate2.cpp
index 340b6719b..d85a49a59 100644
--- a/src/libxrpl/protocol/Rate2.cpp
+++ b/src/libxrpl/protocol/Rate2.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/Rate.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rate.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/Rules.cpp b/src/libxrpl/protocol/Rules.cpp
index e65a9678f..f47e966e1 100644
--- a/src/libxrpl/protocol/Rules.cpp
+++ b/src/libxrpl/protocol/Rules.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/LocalValue.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Rules.h>
+#include <xrpl/basics/LocalValue.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Rules.h>
 
 #include <optional>
 
diff --git a/src/libxrpl/protocol/SField.cpp b/src/libxrpl/protocol/SField.cpp
index 96ee31b72..fe845d550 100644
--- a/src/libxrpl/protocol/SField.cpp
+++ b/src/libxrpl/protocol/SField.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/SField.h>
+#include <xrpl/protocol/SField.h>
 #include <cassert>
 #include <string>
 #include <string_view>
diff --git a/src/libxrpl/protocol/SOTemplate.cpp b/src/libxrpl/protocol/SOTemplate.cpp
index c1a627809..069a406a3 100644
--- a/src/libxrpl/protocol/SOTemplate.cpp
+++ b/src/libxrpl/protocol/SOTemplate.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/SOTemplate.h>
+#include <xrpl/protocol/SOTemplate.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STAccount.cpp b/src/libxrpl/protocol/STAccount.cpp
index 5881ae5b2..8ae43f768 100644
--- a/src/libxrpl/protocol/STAccount.cpp
+++ b/src/libxrpl/protocol/STAccount.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STAccount.h>
+#include <xrpl/protocol/STAccount.h>
 
 #include <cstring>
 
diff --git a/src/libxrpl/protocol/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp
index a02dc9e89..236603d6c 100644
--- a/src/libxrpl/protocol/STAmount.cpp
+++ b/src/libxrpl/protocol/STAmount.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/regex.hpp>
diff --git a/src/libxrpl/protocol/STArray.cpp b/src/libxrpl/protocol/STArray.cpp
index f1c545eda..c131c4a3f 100644
--- a/src/libxrpl/protocol/STArray.cpp
+++ b/src/libxrpl/protocol/STArray.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STBase.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STBase.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STBase.cpp b/src/libxrpl/protocol/STBase.cpp
index b49b65bf2..b7e9c94ca 100644
--- a/src/libxrpl/protocol/STBase.cpp
+++ b/src/libxrpl/protocol/STBase.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STBase.h>
+#include <xrpl/protocol/STBase.h>
 #include <boost/checked_delete.hpp>
 #include <cassert>
 #include <memory>
diff --git a/src/libxrpl/protocol/STBlob.cpp b/src/libxrpl/protocol/STBlob.cpp
index 871c535e9..63e7b4bf3 100644
--- a/src/libxrpl/protocol/STBlob.cpp
+++ b/src/libxrpl/protocol/STBlob.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/STBlob.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/STBlob.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STCurrency.cpp b/src/libxrpl/protocol/STCurrency.cpp
index d2bc1b3be..c8fc65013 100644
--- a/src/libxrpl/protocol/STCurrency.cpp
+++ b/src/libxrpl/protocol/STCurrency.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STCurrency.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/STCurrency.h>
+#include <xrpl/protocol/jss.h>
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp
index 2b154e369..7b7420006 100644
--- a/src/libxrpl/protocol/STInteger.cpp
+++ b/src/libxrpl/protocol/STInteger.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFormats.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFormats.h>
 #include <charconv>
 
 namespace ripple {
diff --git a/src/libxrpl/protocol/STIssue.cpp b/src/libxrpl/protocol/STIssue.cpp
index 356af4386..9dcee6498 100644
--- a/src/libxrpl/protocol/STIssue.cpp
+++ b/src/libxrpl/protocol/STIssue.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STIssue.h>
+#include <xrpl/protocol/STIssue.h>
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/jss.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
diff --git a/src/libxrpl/protocol/STLedgerEntry.cpp b/src/libxrpl/protocol/STLedgerEntry.cpp
index 10ec5627a..68d1455cb 100644
--- a/src/libxrpl/protocol/STLedgerEntry.cpp
+++ b/src/libxrpl/protocol/STLedgerEntry.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/format.hpp>
 #include <algorithm>
 #include <array>
diff --git a/src/libxrpl/protocol/STObject.cpp b/src/libxrpl/protocol/STObject.cpp
index 1cf404597..55636efa4 100644
--- a/src/libxrpl/protocol/STObject.cpp
+++ b/src/libxrpl/protocol/STObject.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/InnerObjectFormats.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STBlob.h>
-#include <ripple/protocol/STCurrency.h>
-#include <ripple/protocol/STObject.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/InnerObjectFormats.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STBlob.h>
+#include <xrpl/protocol/STCurrency.h>
+#include <xrpl/protocol/STObject.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STParsedJSON.cpp b/src/libxrpl/protocol/STParsedJSON.cpp
index 6727fe738..dec5e87ea 100644
--- a/src/libxrpl/protocol/STParsedJSON.cpp
+++ b/src/libxrpl/protocol/STParsedJSON.cpp
@@ -17,29 +17,29 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STBitString.h>
-#include <ripple/protocol/STBlob.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/STIssue.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/STPathSet.h>
-#include <ripple/protocol/STVector256.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFormats.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/XChainAttestations.h>
-#include <ripple/protocol/impl/STVar.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STBitString.h>
+#include <xrpl/protocol/STBlob.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/STIssue.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/XChainAttestations.h>
+#include <xrpl/protocol/detail/STVar.h>
 
 #include <cassert>
 #include <charconv>
diff --git a/src/libxrpl/protocol/STPathSet.cpp b/src/libxrpl/protocol/STPathSet.cpp
index cc1e367ba..b65846527 100644
--- a/src/libxrpl/protocol/STPathSet.cpp
+++ b/src/libxrpl/protocol/STPathSet.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/STPathSet.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 092502bed..daef1a0af 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -17,24 +17,24 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/app/hook/Enum.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/format.hpp>
 
 #include <array>
diff --git a/src/libxrpl/protocol/STValidation.cpp b/src/libxrpl/protocol/STValidation.cpp
index e62a81733..ca5ceb0d9 100644
--- a/src/libxrpl/protocol/STValidation.cpp
+++ b/src/libxrpl/protocol/STValidation.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/STValidation.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/STValidation.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STVar.cpp b/src/libxrpl/protocol/STVar.cpp
index adda16590..c8466259f 100644
--- a/src/libxrpl/protocol/STVar.cpp
+++ b/src/libxrpl/protocol/STVar.cpp
@@ -17,23 +17,23 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/impl/STVar.h>
+#include <xrpl/protocol/detail/STVar.h>
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STBitString.h>
-#include <ripple/protocol/STBlob.h>
-#include <ripple/protocol/STCurrency.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/STIssue.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STPathSet.h>
-#include <ripple/protocol/STVector256.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STBitString.h>
+#include <xrpl/protocol/STBlob.h>
+#include <xrpl/protocol/STCurrency.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/STIssue.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/XChainAttestations.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/libxrpl/protocol/STVector256.cpp b/src/libxrpl/protocol/STVector256.cpp
index 0ef1295b1..2d8bc4ee2 100644
--- a/src/libxrpl/protocol/STVector256.cpp
+++ b/src/libxrpl/protocol/STVector256.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/STVector256.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/STXChainBridge.cpp b/src/libxrpl/protocol/STXChainBridge.cpp
index 8ff19ca7e..2347e6337 100644
--- a/src/libxrpl/protocol/STXChainBridge.cpp
+++ b/src/libxrpl/protocol/STXChainBridge.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/STXChainBridge.h>
+#include <xrpl/protocol/STXChainBridge.h>
 
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/tokens.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/libxrpl/protocol/SecretKey.cpp b/src/libxrpl/protocol/SecretKey.cpp
index e83068610..bc42c1e78 100644
--- a/src/libxrpl/protocol/SecretKey.cpp
+++ b/src/libxrpl/protocol/SecretKey.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/crypto/secure_erase.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/impl/secp256k1.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/crypto/secure_erase.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/detail/secp256k1.h>
 #include <cstring>
 #include <ed25519.h>
 
diff --git a/src/libxrpl/protocol/Seed.cpp b/src/libxrpl/protocol/Seed.cpp
index 49da20a42..453b4593b 100644
--- a/src/libxrpl/protocol/Seed.cpp
+++ b/src/libxrpl/protocol/Seed.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/crypto/RFC1751.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/crypto/secure_erase.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Seed.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpl/crypto/RFC1751.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/crypto/secure_erase.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
+#include <xrpl/protocol/digest.h>
 #include <algorithm>
 #include <cstring>
 #include <iterator>
diff --git a/src/libxrpl/protocol/Serializer.cpp b/src/libxrpl/protocol/Serializer.cpp
index 42f79cfc5..b99375f80 100644
--- a/src/libxrpl/protocol/Serializer.cpp
+++ b/src/libxrpl/protocol/Serializer.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/digest.h>
 #include <type_traits>
 
 namespace ripple {
diff --git a/src/libxrpl/protocol/Sign.cpp b/src/libxrpl/protocol/Sign.cpp
index b6313827f..32645c376 100644
--- a/src/libxrpl/protocol/Sign.cpp
+++ b/src/libxrpl/protocol/Sign.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Sign.h>
+#include <xrpl/protocol/Sign.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/TER.cpp b/src/libxrpl/protocol/TER.cpp
index 7e229e65e..6d53fad16 100644
--- a/src/libxrpl/protocol/TER.cpp
+++ b/src/libxrpl/protocol/TER.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TER.h>
+#include <xrpl/protocol/TER.h>
 #include <boost/range/adaptor/transformed.hpp>
 #include <type_traits>
 
diff --git a/src/libxrpl/protocol/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp
index d0c98bd11..115907311 100644
--- a/src/libxrpl/protocol/TxFormats.cpp
+++ b/src/libxrpl/protocol/TxFormats.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFormats.h>
+#include <xrpl/protocol/TxFormats.h>
 
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/SOTemplate.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/SOTemplate.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/libxrpl/protocol/TxMeta.cpp b/src/libxrpl/protocol/TxMeta.cpp
index 506c7f2a7..8dfadd81f 100644
--- a/src/libxrpl/protocol/TxMeta.cpp
+++ b/src/libxrpl/protocol/TxMeta.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TxMeta.h>
 #include <string>
 
 namespace ripple {
diff --git a/src/libxrpl/protocol/UintTypes.cpp b/src/libxrpl/protocol/UintTypes.cpp
index 391b9c77f..aca087162 100644
--- a/src/libxrpl/protocol/UintTypes.cpp
+++ b/src/libxrpl/protocol/UintTypes.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/Zero.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <string_view>
 
 namespace ripple {
diff --git a/src/libxrpl/protocol/XChainAttestations.cpp b/src/libxrpl/protocol/XChainAttestations.cpp
index 591b20ad5..f87f1c3e6 100644
--- a/src/libxrpl/protocol/XChainAttestations.cpp
+++ b/src/libxrpl/protocol/XChainAttestations.cpp
@@ -17,23 +17,23 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpl/protocol/XChainAttestations.h>
 
-#include <ripple/basics/Expected.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/XChainAttestations.h>
-#include <ripple/protocol/json_get_or_throw.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/XChainAttestations.h>
+#include <xrpl/protocol/json_get_or_throw.h>
+#include <xrpl/protocol/jss.h>
 
 #include <algorithm>
 #include <optional>
diff --git a/src/libxrpl/protocol/digest.cpp b/src/libxrpl/protocol/digest.cpp
index 444a71fb8..237e7aa49 100644
--- a/src/libxrpl/protocol/digest.cpp
+++ b/src/libxrpl/protocol/digest.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/digest.h>
+#include <xrpl/protocol/digest.h>
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>
 #include <type_traits>
diff --git a/src/libxrpl/protocol/tokens.cpp b/src/libxrpl/protocol/tokens.cpp
index fcf3ce079..a757858fd 100644
--- a/src/libxrpl/protocol/tokens.cpp
+++ b/src/libxrpl/protocol/tokens.cpp
@@ -25,11 +25,11 @@
  * file COPYING or http://www.opensource.org/licenses/mit-license.php.
  */
 
-#include <ripple/protocol/tokens.h>
+#include <xrpl/protocol/tokens.h>
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/impl/b58_utils.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/detail/b58_utils.h>
 
 #include <boost/container/small_vector.hpp>
 #include <boost/endian.hpp>
diff --git a/src/libxrpl/resource/Charge.cpp b/src/libxrpl/resource/Charge.cpp
index 21cf2af3e..deec6b34e 100644
--- a/src/libxrpl/resource/Charge.cpp
+++ b/src/libxrpl/resource/Charge.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/resource/Charge.h>
+#include <xrpl/resource/Charge.h>
 #include <sstream>
 
 namespace ripple {
diff --git a/src/libxrpl/resource/Consumer.cpp b/src/libxrpl/resource/Consumer.cpp
index 34edbbfcc..b86525468 100644
--- a/src/libxrpl/resource/Consumer.cpp
+++ b/src/libxrpl/resource/Consumer.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/resource/Consumer.h>
-#include <ripple/resource/impl/Entry.h>
-#include <ripple/resource/impl/Logic.h>
+#include <xrpl/resource/Consumer.h>
+#include <xrpl/resource/detail/Entry.h>
+#include <xrpl/resource/detail/Logic.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/libxrpl/resource/Fees.cpp b/src/libxrpl/resource/Fees.cpp
index 0752e49ca..13ae38bc6 100644
--- a/src/libxrpl/resource/Fees.cpp
+++ b/src/libxrpl/resource/Fees.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/resource/Fees.h>
+#include <xrpl/resource/Fees.h>
 
 namespace ripple {
 namespace Resource {
diff --git a/src/libxrpl/resource/ResourceManager.cpp b/src/libxrpl/resource/ResourceManager.cpp
index ae4eaac23..d73ca0900 100644
--- a/src/libxrpl/resource/ResourceManager.cpp
+++ b/src/libxrpl/resource/ResourceManager.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/resource/impl/Logic.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpl/resource/detail/Logic.h>
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/system/error_code.hpp>
diff --git a/src/libxrpl/server/JSONRPCUtil.cpp b/src/libxrpl/server/JSONRPCUtil.cpp
index 12d12829c..ce173b1e9 100644
--- a/src/libxrpl/server/JSONRPCUtil.cpp
+++ b/src/libxrpl/server/JSONRPCUtil.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/server/impl/JSONRPCUtil.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/server/detail/JSONRPCUtil.h>
 #include <boost/algorithm/string.hpp>
 
 namespace ripple {
diff --git a/src/libxrpl/server/Port.cpp b/src/libxrpl/server/Port.cpp
index a3e88d5cd..4e65c80f5 100644
--- a/src/libxrpl/server/Port.cpp
+++ b/src/libxrpl/server/Port.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/server/Port.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpl/server/Port.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <sstream>
diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp
index e230ed4d3..c16541797 100644
--- a/src/test/app/AMMCalc_test.cpp
+++ b/src/test/app/AMMCalc_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpl/protocol/Quality.h>
 #include <test/jtx.h>
 
 #include <boost/regex.hpp>
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index c2060d572..16a7bd10a 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -16,19 +16,19 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/AMMOffer.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/impl/StrandFlow.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/AMMOffer.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/detail/StrandFlow.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index 43473a05f..453847b44 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -16,18 +16,18 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/AMMOffer.h>
-#include <ripple/app/tx/impl/AMMBid.h>
-#include <ripple/basics/Number.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/AMMOffer.h>
+#include <xrpld/app/tx/detail/AMMBid.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp
index 2a5f2c1cc..938ef9c2e 100644
--- a/src/test/app/AccountDelete_test.cpp
+++ b/src/test/app/AccountDelete_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp
index 1ac7c38d1..16477108a 100644
--- a/src/test/app/AccountTxPaging_test.cpp
+++ b/src/test/app/AccountTxPaging_test.cpp
@@ -16,14 +16,14 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 #include <cstdlib>
 #include <test/jtx.h>
 
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/rpc/GRPCTestClientBase.h>
 
 namespace ripple {
diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp
index 238e05ba5..b41eea079 100644
--- a/src/test/app/AmendmentTable_test.cpp
+++ b/src/test/app/AmendmentTable_test.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 #include <test/unit_test/SuiteJournal.h>
 
diff --git a/src/test/app/BaseFee_test.cpp b/src/test/app/BaseFee_test.cpp
index 0040142f2..13c5273d6 100644
--- a/src/test/app/BaseFee_test.cpp
+++ b/src/test/app/BaseFee_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 #include <test/jtx/TestHelpers.h>
diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp
index 8f0c0ec46..6b2deb237 100644
--- a/src/test/app/Check_test.cpp
+++ b/src/test/app/Check_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/ClaimReward_test.cpp b/src/test/app/ClaimReward_test.cpp
index b2c937ef7..907786d85 100644
--- a/src/test/app/ClaimReward_test.cpp
+++ b/src/test/app/ClaimReward_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/Clawback_test.cpp b/src/test/app/Clawback_test.cpp
index 630e4836d..e765504f4 100644
--- a/src/test/app/Clawback_test.cpp
+++ b/src/test/app/Clawback_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/random.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <initializer_list>
 #include <test/jtx.h>
 #include <test/jtx/trust.h>
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index 09cca1e82..83b891743 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -15,8 +15,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp
index 82e77a202..a44f79c90 100644
--- a/src/test/app/DID_test.cpp
+++ b/src/test/app/DID_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <algorithm>
diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp
index 6ae4bc8d6..48e72d285 100644
--- a/src/test/app/DNS_test.cpp
+++ b/src/test/app/DNS_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/detail/WorkSSL.h>
-#include <ripple/basics/StringUtilities.h>
+#include <xrpld/app/misc/detail/WorkSSL.h>
+#include <xrpl/basics/StringUtilities.h>
 #include <test/jtx.h>
 
 #include <condition_variable>
diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
index 316d95ba7..5edfcd1b7 100644
--- a/src/test/app/DeliverMin_test.cpp
+++ b/src/test/app/DeliverMin_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 641d2e61e..0a400053a 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
index ba08f4a0c..6d72240dd 100644
--- a/src/test/app/Discrepancy_test.cpp
+++ b/src/test/app/Discrepancy_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/PathSet.h>
diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index e116a7dc3..5ec73f6bd 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/applySteps.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/applySteps.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <algorithm>
diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp
index ad38aefb2..03ee8fa48 100644
--- a/src/test/app/FeeVote_test.cpp
+++ b/src/test/app/FeeVote_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/FeeVote.h>
-#include <ripple/basics/BasicConfig.h>
+#include <xrpld/app/misc/FeeVote.h>
+#include <xrpl/basics/BasicConfig.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index bb7b96f10..9ae34933b 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 
diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp
index 7eb4cafa6..07c104301 100644
--- a/src/test/app/Freeze_test.cpp
+++ b/src/test/app/Freeze_test.cpp
@@ -16,11 +16,11 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/GenesisMint_test.cpp b/src/test/app/GenesisMint_test.cpp
index 9904f3715..edaa7954b 100644
--- a/src/test/app/GenesisMint_test.cpp
+++ b/src/test/app/GenesisMint_test.cpp
@@ -15,8 +15,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <optional>
 #include <test/jtx.h>
 
diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp
index 96d14e824..1234bc5b9 100644
--- a/src/test/app/HashRouter_test.cpp
+++ b/src/test/app/HashRouter_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/app/Import_test.cpp b/src/test/app/Import_test.cpp
index 2bb56fbe9..972fcb3eb 100644
--- a/src/test/app/Import_test.cpp
+++ b/src/test/app/Import_test.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Import.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Import.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 
diff --git a/src/test/app/Invoke_test.cpp b/src/test/app/Invoke_test.cpp
index 06bc45a3f..0a57c1b68 100644
--- a/src/test/app/Invoke_test.cpp
+++ b/src/test/app/Invoke_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index 880cbea59..7117c778a 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerHistory.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/beast/insight/NullCollector.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/ledger/OpenView.h>
+#include <xrpld/app/ledger/LedgerHistory.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/beast/insight/NullCollector.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/ledger/OpenView.h>
 #include <chrono>
 #include <memory>
 #include <sstream>
diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp
index a5e64a4c9..843c844f3 100644
--- a/src/test/app/LedgerLoad_test.cpp
+++ b/src/test/app/LedgerLoad_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp
index 4e5a4c94c..065a54408 100644
--- a/src/test/app/LedgerMaster_test.cpp
+++ b/src/test/app/LedgerMaster_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
index 321376e45..cc5e8fc8e 100644
--- a/src/test/app/LedgerReplay_test.cpp
+++ b/src/test/app/LedgerReplay_test.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/BuildLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerReplay.h>
-#include <ripple/app/ledger/LedgerReplayTask.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/LedgerDeltaAcquire.h>
-#include <ripple/app/ledger/impl/LedgerReplayMsgHandler.h>
-#include <ripple/app/ledger/impl/SkipListAcquire.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/overlay/PeerSet.h>
-#include <ripple/overlay/impl/PeerImp.h>
+#include <xrpld/app/ledger/BuildLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
+#include <xrpld/app/ledger/LedgerReplayTask.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/LedgerDeltaAcquire.h>
+#include <xrpld/app/ledger/detail/LedgerReplayMsgHandler.h>
+#include <xrpld/app/ledger/detail/SkipListAcquire.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpld/overlay/PeerSet.h>
+#include <xrpld/overlay/detail/PeerImp.h>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
 
diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp
index f8e73cebd..23154edb4 100644
--- a/src/test/app/LoadFeeTrack_test.cpp
+++ b/src/test/app/LoadFeeTrack_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ReadView.h>
 
 namespace ripple {
 
diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp
index 0f21cab0d..bede33cd1 100644
--- a/src/test/app/Manifest_test.cpp
+++ b/src/test/app/Manifest_test.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/DBInit.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/STExchange.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Sign.h>
+#include <xrpld/app/main/DBInit.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/STExchange.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Sign.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/utility/in_place_factory.hpp>
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index 1e0e3d5df..6f71af9eb 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -15,9 +15,9 @@
 */
 //==============================================================================
 
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp
index 3ae421f29..a28a798ae 100644
--- a/src/test/app/NFTokenBurn_test.cpp
+++ b/src/test/app/NFTokenBurn_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <random>
diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp
index 8e6a9fe52..a9ba51345 100644
--- a/src/test/app/NFTokenDir_test.cpp
+++ b/src/test/app/NFTokenDir_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/nftPageMask.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/nftPageMask.h>
 #include <test/jtx.h>
 
 #include <initializer_list>
diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp
index 3c57811af..3ff351b8d 100644
--- a/src/test/app/NFToken_test.cpp
+++ b/src/test/app/NFToken_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/random.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <initializer_list>
diff --git a/src/test/app/NetworkID_test.cpp b/src/test/app/NetworkID_test.cpp
index 5dbbff0c5..db8ccbd83 100644
--- a/src/test/app/NetworkID_test.cpp
+++ b/src/test/app/NetworkID_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp
index ce25481cd..bf7125036 100644
--- a/src/test/app/OfferStream_test.cpp
+++ b/src/test/app/OfferStream_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/OfferStream.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpld/app/tx/detail/OfferStream.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index e9d8484bc..cc1e06903 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 #include <test/jtx/WSClient.h>
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 16a72de70..bed58fe23 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Oracle.h>
 
 namespace ripple {
diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 554033eb5..0ea19c9ab 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <algorithm>
 #include <test/jtx.h>
 
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index 0f9916cbc..f10f5232b 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/AccountCurrencies.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/paths/AccountCurrencies.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index cb9e268ba..16a5cf66c 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/chrono.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PayChan.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PayChan.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <chrono>
 #include <test/jtx.h>
 
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 735cf5f61..3c5cdf18c 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -15,18 +15,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 
diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp
index 78ca7cc05..ad3df1fa9 100644
--- a/src/test/app/PseudoTx_test.cpp
+++ b/src/test/app/PseudoTx_test.cpp
@@ -15,9 +15,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
 #include <string>
 #include <test/jtx.h>
 #include <vector>
diff --git a/src/test/app/RCLCensorshipDetector_test.cpp b/src/test/app/RCLCensorshipDetector_test.cpp
index 12bb3bbba..b5440b909 100644
--- a/src/test/app/RCLCensorshipDetector_test.cpp
+++ b/src/test/app/RCLCensorshipDetector_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLCensorshipDetector.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpld/app/consensus/RCLCensorshipDetector.h>
+#include <xrpl/beast/unit_test.h>
 #include <algorithm>
 #include <vector>
 
diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp
index 0380795a8..e9f0cfa12 100644
--- a/src/test/app/RCLValidations_test.cpp
+++ b/src/test/app/RCLValidations_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/ledger/View.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/ledger/View.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp
index 186162d50..a2a9ccf64 100644
--- a/src/test/app/ReducedOffer_test.cpp
+++ b/src/test/app/ReducedOffer_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <initializer_list>
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index 0b4cf2017..c4f338d67 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -15,11 +15,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
 
diff --git a/src/test/app/Remit_test.cpp b/src/test/app/Remit_test.cpp
index 8b615960f..221d12bd0 100644
--- a/src/test/app/Remit_test.cpp
+++ b/src/test/app/Remit_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/chrono.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <chrono>
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index 8a47b1869..441073714 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
 
diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp
index 8066ef0da..f9f4fbef4 100644
--- a/src/test/app/SetAuth_test.cpp
+++ b/src/test/app/SetAuth_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/SetHookTSH_test.cpp b/src/test/app/SetHookTSH_test.cpp
index 8a81fcd5e..c5f2ce6a8 100644
--- a/src/test/app/SetHookTSH_test.cpp
+++ b/src/test/app/SetHookTSH_test.cpp
@@ -18,13 +18,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/PayChan.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/PayChan.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 #include <test/jtx/TestHelpers.h>
diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp
index 7f94b62fd..c9cf89cad 100644
--- a/src/test/app/SetHook_test.cpp
+++ b/src/test/app/SetHook_test.cpp
@@ -16,13 +16,13 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/tx/impl/SetHook.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/tx/detail/SetHook.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/app/SetHook_wasm.h>
 #include <test/jtx.h>
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index 799b7797b..13dea01cf 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/SetRemarks_test.cpp b/src/test/app/SetRemarks_test.cpp
index 6f4a3b91e..b1deb4716 100644
--- a/src/test/app/SetRemarks_test.cpp
+++ b/src/test/app/SetRemarks_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <sstream>
 #include <test/jtx.h>
 
diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp
index cab0132ae..a6420a3f6 100644
--- a/src/test/app/SetTrust_test.cpp
+++ b/src/test/app/SetTrust_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/Taker_test.cpp b/src/test/app/Taker_test.cpp
index 0b69b25f2..89e44b2b9 100644
--- a/src/test/app/Taker_test.cpp
+++ b/src/test/app/Taker_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Taker.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpld/app/tx/detail/Taker.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/unit_test.h>
 #include <type_traits>
 
 namespace ripple {
diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp
index ae537a456..3099d02eb 100644
--- a/src/test/app/TheoreticalQuality_test.cpp
+++ b/src/test/app/TheoreticalQuality_test.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/app/paths/impl/StrandFlow.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/random.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpld/app/paths/detail/StrandFlow.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/random.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index 4e456a0b6..e18af99fc 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/Touch_test.cpp b/src/test/app/Touch_test.cpp
index ca8ef129b..e5f9850f9 100644
--- a/src/test/app/Touch_test.cpp
+++ b/src/test/app/Touch_test.cpp
@@ -18,12 +18,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/PayChan.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/PayChan.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 #include <test/jtx/TestHelpers.h>
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index 0353df906..595624b2f 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -15,8 +15,8 @@
 */
 //==============================================================================
 
-#include <ripple/core/JobQueue.h>
-#include <ripple/protocol/ErrorCodes.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/protocol/ErrorCodes.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp
index efa67a43f..72863a4fe 100644
--- a/src/test/app/TrustAndBalance_test.cpp
+++ b/src/test/app/TrustAndBalance_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index fa06a6a64..7f881bb2d 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/st.h>
 #include <test/jtx.h>
 #include <test/jtx/TestSuite.h>
 #include <test/jtx/WSClient.h>
diff --git a/src/test/app/URIToken_test.cpp b/src/test/app/URIToken_test.cpp
index 1703acde3..14aba561f 100644
--- a/src/test/app/URIToken_test.cpp
+++ b/src/test/app/URIToken_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/chrono.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <chrono>
diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp
index 99bd61882..ed3eadb25 100644
--- a/src/test/app/ValidatorKeys_test.cpp
+++ b/src/test/app/ValidatorKeys_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/misc/ValidatorKeys.h>
-#include <ripple/basics/base64.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
 #include <test/jtx/Env.h>
 
 #include <string>
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 638c2060d..212bffd83 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/overlay/impl/ProtocolMessage.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/messages.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpld/overlay/detail/ProtocolMessage.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/messages.h>
 #include <test/jtx.h>
 
 #include <boost/beast/core/multi_buffer.hpp>
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index 405d55724..1cbb14a73 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
diff --git a/src/test/app/Wildcard_test.cpp b/src/test/app/Wildcard_test.cpp
index fc330b449..7656ed6d0 100644
--- a/src/test/app/Wildcard_test.cpp
+++ b/src/test/app/Wildcard_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index f747eaa68..deaef499d 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/XChainAttestations.h>
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
diff --git a/src/test/app/XahauGenesis_test.cpp b/src/test/app/XahauGenesis_test.cpp
index d143591e0..4a67e75f2 100644
--- a/src/test/app/XahauGenesis_test.cpp
+++ b/src/test/app/XahauGenesis_test.cpp
@@ -15,17 +15,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/app/tx/impl/XahauGenesis.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/app/tx/detail/XahauGenesis.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <string>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp
index 61a512805..033154c78 100644
--- a/src/test/app/tx/apply_test.cpp
+++ b/src/test/app/tx/apply_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp
index 45d2147a0..da8bcc8f1 100644
--- a/src/test/basics/Buffer_test.cpp
+++ b/src/test/basics/Buffer_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/beast/unit_test.h>
 #include <cstdint>
 #include <type_traits>
 
diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp
index 70f0bdb83..1ae761f34 100644
--- a/src/test/basics/DetectCrash_test.cpp
+++ b/src/test/basics/DetectCrash_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test/suite.h>
+#include <xrpl/beast/unit_test/suite.h>
 
 #include <exception>
 
diff --git a/src/test/basics/Expected_test.cpp b/src/test/basics/Expected_test.cpp
index 1f16e724d..2c3b31a7f 100644
--- a/src/test/basics/Expected_test.cpp
+++ b/src/test/basics/Expected_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Expected.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/TER.h>
 #include <array>
 #include <cstdint>
 
diff --git a/src/test/basics/FeeUnits_test.cpp b/src/test/basics/FeeUnits_test.cpp
index 3ded58129..6608a0726 100644
--- a/src/test/basics/FeeUnits_test.cpp
+++ b/src/test/basics/FeeUnits_test.cpp
@@ -16,9 +16,9 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/SystemParameters.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <type_traits>
 
 namespace ripple {
diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp
index b9371d214..386226459 100644
--- a/src/test/basics/FileUtilities_test.cpp
+++ b/src/test/basics/FileUtilities_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/FileUtilities.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/FileUtilities.h>
+#include <xrpl/beast/unit_test.h>
 #include <fstream>
 #include <test/unit_test/FileDirGuard.h>
 
diff --git a/src/test/basics/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp
index a5f7d0456..6e7c66263 100644
--- a/src/test/basics/IOUAmount_test.cpp
+++ b/src/test/basics/IOUAmount_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp
index 7f3f13e27..4b2e50838 100644
--- a/src/test/basics/KeyCache_test.cpp
+++ b/src/test/basics/KeyCache_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/Protocol.h>
 #include <test/unit_test/SuiteJournal.h>
 
 namespace ripple {
diff --git a/src/test/basics/Number_test.cpp b/src/test/basics/Number_test.cpp
index 8c12ff7c5..cf626354e 100644
--- a/src/test/basics/Number_test.cpp
+++ b/src/test/basics/Number_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Number.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/STAmount.h>
 #include <sstream>
 #include <tuple>
 
diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp
index f0a664519..65cb95244 100644
--- a/src/test/basics/PerfLog_test.cpp
+++ b/src/test/basics/PerfLog_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/Handler.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/TestHelpers.h>
 
diff --git a/src/test/basics/RangeSet_test.cpp b/src/test/basics/RangeSet_test.cpp
index ccf76fad0..e0136ab89 100644
--- a/src/test/basics/RangeSet_test.cpp
+++ b/src/test/basics/RangeSet_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/RangeSet.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 class RangeSet_test : public beast::unit_test::suite
diff --git a/src/test/basics/Slice_test.cpp b/src/test/basics/Slice_test.cpp
index fb88315bd..a169de985 100644
--- a/src/test/basics/Slice_test.cpp
+++ b/src/test/basics/Slice_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Slice.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/beast/unit_test.h>
 #include <array>
 #include <cstdint>
 
diff --git a/src/test/basics/StringUtilities_test.cpp b/src/test/basics/StringUtilities_test.cpp
index 29808a712..cd18227a4 100644
--- a/src/test/basics/StringUtilities_test.cpp
+++ b/src/test/basics/StringUtilities_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/ToString.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/ToString.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp
index 6a5b44299..1fe47dd7d 100644
--- a/src/test/basics/TaggedCache_test.cpp
+++ b/src/test/basics/TaggedCache_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Protocol.h>
 #include <test/unit_test/SuiteJournal.h>
 
 namespace ripple {
diff --git a/src/test/basics/XRPAmount_test.cpp b/src/test/basics/XRPAmount_test.cpp
index 37c827180..c4c96dbfb 100644
--- a/src/test/basics/XRPAmount_test.cpp
+++ b/src/test/basics/XRPAmount_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/test/basics/base58_test.cpp b/src/test/basics/base58_test.cpp
index 8b79d2729..799f6537d 100644
--- a/src/test/basics/base58_test.cpp
+++ b/src/test/basics/base58_test.cpp
@@ -19,9 +19,9 @@
 
 #ifndef _MSC_VER
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/impl/b58_utils.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/detail/b58_utils.h>
+#include <xrpl/protocol/tokens.h>
 
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/random.hpp>
diff --git a/src/test/basics/base64_test.cpp b/src/test/basics/base64_test.cpp
index d9622a8c2..b6d67c7c0 100644
--- a/src/test/basics/base64_test.cpp
+++ b/src/test/basics/base64_test.cpp
@@ -26,8 +26,8 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#include <ripple/basics/base64.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 
diff --git a/src/test/basics/base_uint_test.cpp b/src/test/basics/base_uint_test.cpp
index 9b1f7696d..43000a112 100644
--- a/src/test/basics/base_uint_test.cpp
+++ b/src/test/basics/base_uint_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/beast/unit_test.h>
 #include <boost/endian/conversion.hpp>
 #include <complex>
 
diff --git a/src/test/basics/contract_test.cpp b/src/test/basics/contract_test.cpp
index 58844ba97..99f118794 100644
--- a/src/test/basics/contract_test.cpp
+++ b/src/test/basics/contract_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/unit_test.h>
 #include <string>
 
 namespace ripple {
diff --git a/src/test/basics/hardened_hash_test.cpp b/src/test/basics/hardened_hash_test.cpp
index 9296b7faf..343894e52 100644
--- a/src/test/basics/hardened_hash_test.cpp
+++ b/src/test/basics/hardened_hash_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/beast/unit_test.h>
 #include <boost/functional/hash.hpp>
 #include <array>
 #include <cstdint>
diff --git a/src/test/basics/join_test.cpp b/src/test/basics/join_test.cpp
index 730fcb693..1b0948282 100644
--- a/src/test/basics/join_test.cpp
+++ b/src/test/basics/join_test.cpp
@@ -19,8 +19,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <test/jtx/Account.h>
 
-#include <ripple/basics/join.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/join.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/basics/mulDiv_test.cpp b/src/test/basics/mulDiv_test.cpp
index f51b91fec..47332fd45 100644
--- a/src/test/basics/mulDiv_test.cpp
+++ b/src/test/basics/mulDiv_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/mulDiv.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/basics/scope_test.cpp b/src/test/basics/scope_test.cpp
index 414e67b5c..654f7e0a1 100644
--- a/src/test/basics/scope_test.cpp
+++ b/src/test/basics/scope_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/scope.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/scope.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/basics/tagged_integer_test.cpp b/src/test/basics/tagged_integer_test.cpp
index dd9d9022d..22cdc5ad5 100644
--- a/src/test/basics/tagged_integer_test.cpp
+++ b/src/test/basics/tagged_integer_test.cpp
@@ -18,8 +18,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/tagged_integer.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/tagged_integer.h>
+#include <xrpl/beast/unit_test.h>
 #include <type_traits>
 
 namespace ripple {
diff --git a/src/test/beast/IPEndpointCommon.h b/src/test/beast/IPEndpointCommon.h
index bf8e7613f..aa2c1e597 100644
--- a/src/test/beast/IPEndpointCommon.h
+++ b/src/test/beast/IPEndpointCommon.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/random.h>
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 
 namespace beast {
 namespace IP {
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index 1a29ddefa..6f41096d3 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -20,9 +20,9 @@
 // MODULES: ../impl/IPEndpoint.cpp ../impl/IPAddressV4.cpp
 // ../impl/IPAddressV6.cpp
 
-#include <ripple/basics/random.h>
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/beast/unit_test.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/predef.h>
diff --git a/src/test/beast/LexicalCast_test.cpp b/src/test/beast/LexicalCast_test.cpp
index 680dc6d69..22638f27e 100644
--- a/src/test/beast/LexicalCast_test.cpp
+++ b/src/test/beast/LexicalCast_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/xor_shift_engine.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/xor_shift_engine.h>
 
 namespace beast {
 
diff --git a/src/test/beast/SemanticVersion_test.cpp b/src/test/beast/SemanticVersion_test.cpp
index 5026f0fba..2f24a0c89 100644
--- a/src/test/beast/SemanticVersion_test.cpp
+++ b/src/test/beast/SemanticVersion_test.cpp
@@ -16,8 +16,8 @@ ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/core/SemanticVersion.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/core/SemanticVersion.h>
+#include <xrpl/beast/unit_test.h>
 namespace beast {
 
 class SemanticVersion_test : public unit_test::suite
diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp
index be1724081..e5736764e 100644
--- a/src/test/beast/aged_associative_container_test.cpp
+++ b/src/test/beast/aged_associative_container_test.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
 
-#include <ripple/beast/container/aged_map.h>
-#include <ripple/beast/container/aged_multimap.h>
-#include <ripple/beast/container/aged_multiset.h>
-#include <ripple/beast/container/aged_set.h>
-#include <ripple/beast/container/aged_unordered_map.h>
-#include <ripple/beast/container/aged_unordered_multimap.h>
-#include <ripple/beast/container/aged_unordered_multiset.h>
-#include <ripple/beast/container/aged_unordered_set.h>
+#include <xrpl/beast/container/aged_map.h>
+#include <xrpl/beast/container/aged_multimap.h>
+#include <xrpl/beast/container/aged_multiset.h>
+#include <xrpl/beast/container/aged_set.h>
+#include <xrpl/beast/container/aged_unordered_map.h>
+#include <xrpl/beast/container/aged_unordered_multimap.h>
+#include <xrpl/beast/container/aged_unordered_multiset.h>
+#include <xrpl/beast/container/aged_unordered_set.h>
 
 #include <list>
 #include <vector>
diff --git a/src/test/beast/beast_CurrentThreadName_test.cpp b/src/test/beast/beast_CurrentThreadName_test.cpp
index 6e46808f4..653b0a896 100644
--- a/src/test/beast/beast_CurrentThreadName_test.cpp
+++ b/src/test/beast/beast_CurrentThreadName_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/beast/unit_test.h>
 #include <atomic>
 #include <thread>
 
diff --git a/src/test/beast/beast_Journal_test.cpp b/src/test/beast/beast_Journal_test.cpp
index 9d3567c27..6f1652381 100644
--- a/src/test/beast/beast_Journal_test.cpp
+++ b/src/test/beast/beast_Journal_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace beast {
 
diff --git a/src/test/beast/beast_PropertyStream_test.cpp b/src/test/beast/beast_PropertyStream_test.cpp
index 2c4d32ce4..e91f527d3 100644
--- a/src/test/beast/beast_PropertyStream_test.cpp
+++ b/src/test/beast/beast_PropertyStream_test.cpp
@@ -16,8 +16,8 @@ ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/PropertyStream.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/PropertyStream.h>
 namespace beast {
 
 class PropertyStream_test : public unit_test::suite
diff --git a/src/test/beast/beast_Zero_test.cpp b/src/test/beast/beast_Zero_test.cpp
index 42b073437..b60716362 100644
--- a/src/test/beast/beast_Zero_test.cpp
+++ b/src/test/beast/beast_Zero_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/Zero.h>
+#include <xrpl/beast/utility/Zero.h>
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace beast {
 
diff --git a/src/test/beast/beast_abstract_clock_test.cpp b/src/test/beast/beast_abstract_clock_test.cpp
index eba9a3d77..a026df263 100644
--- a/src/test/beast/beast_abstract_clock_test.cpp
+++ b/src/test/beast/beast_abstract_clock_test.cpp
@@ -19,9 +19,9 @@
 
 // MODULES: ../impl/chrono_io.cpp
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
 #include <sstream>
 #include <string>
 #include <thread>
diff --git a/src/test/beast/beast_basic_seconds_clock_test.cpp b/src/test/beast/beast_basic_seconds_clock_test.cpp
index 5e55aab59..f3926634d 100644
--- a/src/test/beast/beast_basic_seconds_clock_test.cpp
+++ b/src/test/beast/beast_basic_seconds_clock_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 
-#include <ripple/beast/clock/basic_seconds_clock.h>
+#include <xrpl/beast/clock/basic_seconds_clock.h>
 
 namespace beast {
 
diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp
index 32206ced7..962281943 100644
--- a/src/test/beast/beast_io_latency_probe_test.cpp
+++ b/src/test/beast/beast_io_latency_probe_test.cpp
@@ -16,10 +16,10 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/asio/io_latency_probe.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/asio/io_latency_probe.h>
+#include <xrpl/beast/unit_test.h>
 
-#include <ripple/beast/test/yield_to.h>
+#include <xrpl/beast/test/yield_to.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/deadline_timer.hpp>
diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp
index 3f527907a..0d36cd769 100644
--- a/src/test/beast/define_print.cpp
+++ b/src/test/beast/define_print.cpp
@@ -5,9 +5,9 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <ripple/beast/unit_test/amount.h>
-#include <ripple/beast/unit_test/global_suites.h>
-#include <ripple/beast/unit_test/suite.h>
+#include <xrpl/beast/unit_test/amount.h>
+#include <xrpl/beast/unit_test/global_suites.h>
+#include <xrpl/beast/unit_test/suite.h>
 #include <string>
 
 // Include this .cpp in your project to gain access to the printing suite
diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp
index cf4bc8c7c..b10e6daa8 100644
--- a/src/test/conditions/PreimageSha256_test.cpp
+++ b/src/test/conditions/PreimageSha256_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/Fulfillment.h>
-#include <ripple/conditions/impl/PreimageSha256.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/Fulfillment.h>
+#include <xrpld/conditions/detail/PreimageSha256.h>
 #include <algorithm>
 #include <string>
 #include <utility>
diff --git a/src/test/consensus/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp
index a907b7c22..3b4d707e5 100644
--- a/src/test/consensus/ByzantineFailureSim_test.cpp
+++ b/src/test/consensus/ByzantineFailureSim_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/csf.h>
 #include <utility>
 
diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp
index 1ef1a718d..671737251 100644
--- a/src/test/consensus/Consensus_test.cpp
+++ b/src/test/consensus/Consensus_test.cpp
@@ -16,10 +16,10 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/consensus/Consensus.h>
-#include <ripple/consensus/ConsensusProposal.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/consensus/Consensus.h>
+#include <xrpld/consensus/ConsensusProposal.h>
 #include <test/csf.h>
 #include <test/unit_test/SuiteJournal.h>
 #include <utility>
diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp
index ef1ae8b87..9bec7fc63 100644
--- a/src/test/consensus/DistributedValidatorsSim_test.cpp
+++ b/src/test/consensus/DistributedValidatorsSim_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/csf.h>
 #include <utility>
 
diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp
index 98b0548bf..965deb204 100644
--- a/src/test/consensus/LedgerTiming_test.cpp
+++ b/src/test/consensus/LedgerTiming_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/unit_test.h>
-#include <ripple/consensus/LedgerTiming.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/consensus/LedgerTiming.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp
index 3feb3b099..dff309084 100644
--- a/src/test/consensus/LedgerTrie_test.cpp
+++ b/src/test/consensus/LedgerTrie_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/unit_test.h>
-#include <ripple/consensus/LedgerTrie.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/consensus/LedgerTrie.h>
 #include <random>
 #include <test/csf/ledgers.h>
 #include <unordered_map>
diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp
index 30bdfca11..05f8fd6ac 100644
--- a/src/test/consensus/NegativeUNL_test.cpp
+++ b/src/test/consensus/NegativeUNL_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/NegativeUNLVote.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/ledger/View.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/NegativeUNLVote.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/ledger/View.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp
index 4fe911eac..92a8dd74a 100644
--- a/src/test/consensus/ScaleFreeSim_test.cpp
+++ b/src/test/consensus/ScaleFreeSim_test.cpp
@@ -16,8 +16,8 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/csf.h>
 #include <test/csf/random.h>
 #include <utility>
diff --git a/src/test/consensus/UNLReport_test.cpp b/src/test/consensus/UNLReport_test.cpp
index e2a3021bd..ad1ccc912 100644
--- a/src/test/consensus/UNLReport_test.cpp
+++ b/src/test/consensus/UNLReport_test.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/NegativeUNLVote.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/NegativeUNLVote.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
 #include <string>
 #include <test/csf.h>
 #include <test/jtx.h>
diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp
index 7dc2086e5..57cee9d7c 100644
--- a/src/test/consensus/Validations_test.cpp
+++ b/src/test/consensus/Validations_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/tagged_integer.h>
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/consensus/Validations.h>
+#include <xrpl/basics/tagged_integer.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/consensus/Validations.h>
 #include <memory>
 #include <test/csf/Validation.h>
 #include <test/unit_test/SuiteJournal.h>
diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp
index c4199a0b0..922779476 100644
--- a/src/test/core/ClosureCounter_test.cpp
+++ b/src/test/core/ClosureCounter_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ClosureCounter.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ClosureCounter.h>
 #include <test/jtx/Env.h>
 
 #include <atomic>
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index 3d7991d74..e4a640fa9 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/server/Port.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/server/Port.h>
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <fstream>
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 6d1e5e333..fa694b6d2 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/core/JobQueue.h>
+#include <xrpld/core/JobQueue.h>
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/test/core/CryptoPRNG_test.cpp b/src/test/core/CryptoPRNG_test.cpp
index 11bf9b7a1..962da7406 100644
--- a/src/test/core/CryptoPRNG_test.cpp
+++ b/src/test/core/CryptoPRNG_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/crypto/csprng.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/crypto/csprng.h>
 #include <boost/filesystem.hpp>
 #include <fstream>
 #include <streambuf>
diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index cba021767..e484a4f9c 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/JobQueue.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/JobQueue.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp
index c0365ad9a..8e5c8530f 100644
--- a/src/test/core/SociDB_test.cpp
+++ b/src/test/core/SociDB_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/core/SociDB.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/core/SociDB.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <test/jtx/TestSuite.h>
diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp
index 155dd14f0..5cdc340aa 100644
--- a/src/test/core/Workers_test.cpp
+++ b/src/test/core/Workers_test.cpp
@@ -17,11 +17,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
 
-#include <ripple/basics/PerfLog.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/JobTypes.h>
-#include <ripple/core/impl/Workers.h>
-#include <ripple/json/json_value.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/JobTypes.h>
+#include <xrpld/core/detail/Workers.h>
+#include <xrpl/json/json_value.h>
 #include <chrono>
 #include <condition_variable>
 #include <cstdint>
diff --git a/src/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp
index f3b18216a..0eba8f06c 100644
--- a/src/test/csf/BasicNetwork_test.cpp
+++ b/src/test/csf/BasicNetwork_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <set>
 #include <test/csf/BasicNetwork.h>
 #include <test/csf/Scheduler.h>
diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp
index ac2063e49..37677e7bb 100644
--- a/src/test/csf/Digraph_test.cpp
+++ b/src/test/csf/Digraph_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <string>
 #include <test/csf/Digraph.h>
 #include <vector>
diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp
index bf392ec8a..c2d5f96e7 100644
--- a/src/test/csf/Histogram_test.cpp
+++ b/src/test/csf/Histogram_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/csf/Histogram.h>
 
 namespace ripple {
diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h
index 6d3008f73..612ce27b4 100644
--- a/src/test/csf/Peer.h
+++ b/src/test/csf/Peer.h
@@ -19,10 +19,10 @@
 #ifndef RIPPLE_TEST_CSF_PEER_H_INCLUDED
 #define RIPPLE_TEST_CSF_PEER_H_INCLUDED
 
-#include <ripple/beast/utility/WrappedSink.h>
-#include <ripple/consensus/Consensus.h>
-#include <ripple/consensus/Validations.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/beast/utility/WrappedSink.h>
+#include <xrpld/consensus/Consensus.h>
+#include <xrpld/consensus/Validations.h>
+#include <xrpl/protocol/PublicKey.h>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <algorithm>
diff --git a/src/test/csf/Proposal.h b/src/test/csf/Proposal.h
index d1cee16c1..ba53eabce 100644
--- a/src/test/csf/Proposal.h
+++ b/src/test/csf/Proposal.h
@@ -19,7 +19,7 @@
 #ifndef RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED
 #define RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED
 
-#include <ripple/consensus/ConsensusProposal.h>
+#include <xrpld/consensus/ConsensusProposal.h>
 #include <test/csf/Tx.h>
 #include <test/csf/Validation.h>
 #include <test/csf/ledgers.h>
diff --git a/src/test/csf/Scheduler.h b/src/test/csf/Scheduler.h
index 2dc24222b..62dff8640 100644
--- a/src/test/csf/Scheduler.h
+++ b/src/test/csf/Scheduler.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_CSF_SCHEDULER_H_INCLUDED
 #define RIPPLE_TEST_CSF_SCHEDULER_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/beast/clock/manual_clock.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/beast/clock/manual_clock.h>
 
 #include <boost/container/pmr/monotonic_buffer_resource.hpp>
 #include <boost/intrusive/set.hpp>
diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp
index ac9fab253..8d56d0b82 100644
--- a/src/test/csf/Scheduler_test.cpp
+++ b/src/test/csf/Scheduler_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/csf/Scheduler.h>
 
 #include <set>
diff --git a/src/test/csf/SimTime.h b/src/test/csf/SimTime.h
index 2e18a5f9e..930338108 100644
--- a/src/test/csf/SimTime.h
+++ b/src/test/csf/SimTime.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_CSF_SIMTIME_H_INCLUDED
 #define RIPPLE_TEST_CSF_SIMTIME_H_INCLUDED
 
-#include <ripple/beast/clock/manual_clock.h>
+#include <xrpl/beast/clock/manual_clock.h>
 #include <chrono>
 
 namespace ripple {
diff --git a/src/test/csf/Tx.h b/src/test/csf/Tx.h
index 7f3645a59..b21481dcb 100644
--- a/src/test/csf/Tx.h
+++ b/src/test/csf/Tx.h
@@ -18,8 +18,8 @@
 //==============================================================================
 #ifndef RIPPLE_TEST_CSF_TX_H_INCLUDED
 #define RIPPLE_TEST_CSF_TX_H_INCLUDED
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
 #include <boost/container/flat_set.hpp>
 #include <boost/iterator/function_output_iterator.hpp>
 #include <map>
diff --git a/src/test/csf/Validation.h b/src/test/csf/Validation.h
index aacb155fb..3ae5167a0 100644
--- a/src/test/csf/Validation.h
+++ b/src/test/csf/Validation.h
@@ -19,7 +19,7 @@
 #ifndef RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED
 #define RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED
 
-#include <ripple/basics/tagged_integer.h>
+#include <xrpl/basics/tagged_integer.h>
 #include <test/csf/ledgers.h>
 
 #include <memory>
diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h
index 352aa4cb8..6a5a28904 100644
--- a/src/test/csf/collectors.h
+++ b/src/test/csf/collectors.h
@@ -19,7 +19,7 @@
 #ifndef RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED
 #define RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
+#include <xrpl/basics/UnorderedContainers.h>
 #include <test/csf/Histogram.h>
 #include <test/csf/SimTime.h>
 #include <test/csf/events.h>
diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h
index 987c5e706..ba5b73161 100644
--- a/src/test/csf/ledgers.h
+++ b/src/test/csf/ledgers.h
@@ -19,12 +19,12 @@
 #ifndef RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED
 #define RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/comparators.h>
-#include <ripple/basics/tagged_integer.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/comparators.h>
+#include <xrpl/basics/tagged_integer.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpl/json/json_value.h>
 #include <boost/bimap/bimap.hpp>
 #include <optional>
 #include <set>
diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp
index bfdb64270..142532a7d 100644
--- a/src/test/json/Object_test.cpp
+++ b/src/test/json/Object_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/Object.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/Object.h>
 #include <test/json/TestOutputSuite.h>
 
 namespace Json {
diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp
index 670f9c191..ec5857c6d 100644
--- a/src/test/json/Output_test.cpp
+++ b/src/test/json/Output_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
 #include <test/json/TestOutputSuite.h>
 
 namespace Json {
diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h
index 0634f42a7..a14c70540 100644
--- a/src/test/json/TestOutputSuite.h
+++ b/src/test/json/TestOutputSuite.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED
 #define RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED
 
-#include <ripple/json/Output.h>
-#include <ripple/json/Writer.h>
+#include <xrpl/json/Output.h>
+#include <xrpl/json/Writer.h>
 #include <test/jtx/TestSuite.h>
 
 namespace ripple {
diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp
index 99450ffee..b7bc61675 100644
--- a/src/test/json/Writer_test.cpp
+++ b/src/test/json/Writer_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/Writer.h>
-#include <ripple/json/json_writer.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/Writer.h>
+#include <xrpl/json/json_writer.h>
 #include <test/json/TestOutputSuite.h>
 
 namespace Json {
diff --git a/src/test/json/json_value_test.cpp b/src/test/json/json_value_test.cpp
index 543a91a8a..dacc22cc0 100644
--- a/src/test/json/json_value_test.cpp
+++ b/src/test/json/json_value_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/type_name.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/json_writer.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/type_name.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/json_writer.h>
 
 #include <algorithm>
 #include <regex>
diff --git a/src/test/jtx.h b/src/test/jtx.h
index 2bee02802..0df74f6e3 100644
--- a/src/test/jtx.h
+++ b/src/test/jtx.h
@@ -22,7 +22,7 @@
 
 // Convenience header that includes everything
 
-#include <ripple/json/to_string.h>
+#include <xrpl/json/to_string.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/Env_ss.h>
diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h
index bb1032e00..8d19600ea 100644
--- a/src/test/jtx/AMM.h
+++ b/src/test/jtx/AMM.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_AMM_H_INCLUDED
 #define RIPPLE_TEST_JTX_AMM_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/rpc/GRPCHandlers.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpld/rpc/GRPCHandlers.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/multisign.h>
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index 5de805a10..b0ffabd0d 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -19,8 +19,8 @@
 #ifndef RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED
 #define RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED
 
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/ter.h>
diff --git a/src/test/jtx/AbstractClient.h b/src/test/jtx/AbstractClient.h
index 672ce422f..b447b9ded 100644
--- a/src/test/jtx/AbstractClient.h
+++ b/src/test/jtx/AbstractClient.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_ABSTRACTCLIENT_H_INCLUDED
 #define RIPPLE_TEST_ABSTRACTCLIENT_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/Account.h b/src/test/jtx/Account.h
index cca92e76f..bcf117d93 100644
--- a/src/test/jtx/Account.h
+++ b/src/test/jtx/Account.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_ACCOUNT_H_INCLUDED
 #define RIPPLE_TEST_JTX_ACCOUNT_H_INCLUDED
 
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/protocol/KeyType.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <string>
 #include <unordered_map>
 
diff --git a/src/test/jtx/CaptureLogs.h b/src/test/jtx/CaptureLogs.h
index 9a64396ab..62bf25bda 100644
--- a/src/test/jtx/CaptureLogs.h
+++ b/src/test/jtx/CaptureLogs.h
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
+#include <xrpl/basics/Log.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/CheckMessageLogs.h b/src/test/jtx/CheckMessageLogs.h
index 66f5f7e10..dc3253278 100644
--- a/src/test/jtx/CheckMessageLogs.h
+++ b/src/test/jtx/CheckMessageLogs.h
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
+#include <xrpl/basics/Log.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h
index 18a1f49c3..1c98b69ff 100644
--- a/src/test/jtx/Env.h
+++ b/src/test/jtx/Env.h
@@ -20,23 +20,23 @@
 #ifndef RIPPLE_TEST_JTX_ENV_H_INCLUDED
 #define RIPPLE_TEST_JTX_ENV_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/Pathfinder.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/Pathfinder.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <functional>
 #include <string>
 #include <test/jtx/AbstractClient.h>
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index 790680597..522e876d7 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <boost/lexical_cast.hpp>
diff --git a/src/test/jtx/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h
index bfd315457..7a57a7df2 100644
--- a/src/test/jtx/JSONRPCClient.h
+++ b/src/test/jtx/JSONRPCClient.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_HTTPCLIENT_H_INCLUDED
 #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED
 
-#include <ripple/core/Config.h>
+#include <xrpld/core/Config.h>
 #include <memory>
 #include <test/jtx/AbstractClient.h>
 
diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h
index 2eeb6ccf8..5fe541d2a 100644
--- a/src/test/jtx/JTx.h
+++ b/src/test/jtx/JTx.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_JTX_H_INCLUDED
 #define RIPPLE_TEST_JTX_JTX_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
 #include <test/jtx/basic_prop.h>
 #include <test/jtx/requires.h>
 
diff --git a/src/test/jtx/ManualTimeKeeper.h b/src/test/jtx/ManualTimeKeeper.h
index f3adb29b5..86477bf99 100644
--- a/src/test/jtx/ManualTimeKeeper.h
+++ b/src/test/jtx/ManualTimeKeeper.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_MANUALTIMEKEEPER_H_INCLUDED
 #define RIPPLE_TEST_MANUALTIMEKEEPER_H_INCLUDED
 
-#include <ripple/core/TimeKeeper.h>
+#include <xrpld/core/TimeKeeper.h>
 #include <atomic>
 
 namespace ripple {
diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h
index f578ceb19..f844432e6 100644
--- a/src/test/jtx/PathSet.h
+++ b/src/test/jtx/PathSet.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED
 #define RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index 4e687cc37..dc33c72ff 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -19,12 +19,12 @@
 #ifndef RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED
 #define RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 
 #include <vector>
diff --git a/src/test/jtx/TestSuite.h b/src/test/jtx/TestSuite.h
index 9bd8d50ab..22b8fb7e5 100644
--- a/src/test/jtx/TestSuite.h
+++ b/src/test/jtx/TestSuite.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_TESTSUITE_H_INCLUDED
 #define RIPPLE_BASICS_TESTSUITE_H_INCLUDED
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <string>
 
 namespace ripple {
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index f748fac01..460797977 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -19,12 +19,12 @@
 #ifndef RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED
 #define RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED
 
-#include <ripple/basics/base64.h>
-#include <ripple/basics/random.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Sign.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Sign.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
diff --git a/src/test/jtx/WSClient.h b/src/test/jtx/WSClient.h
index 8961522a0..ec5b21eba 100644
--- a/src/test/jtx/WSClient.h
+++ b/src/test/jtx/WSClient.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_WSCLIENT_H_INCLUDED
 #define RIPPLE_TEST_WSCLIENT_H_INCLUDED
 
-#include <ripple/core/Config.h>
+#include <xrpld/core/Config.h>
 #include <test/jtx/AbstractClient.h>
 
 #include <chrono>
diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp
index 85440003b..1dffd6fe1 100644
--- a/src/test/jtx/WSClient_test.cpp
+++ b/src/test/jtx/WSClient_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
index f8a8f67c7..2fecf13b6 100644
--- a/src/test/jtx/amount.h
+++ b/src/test/jtx/amount.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED
 #define RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED
 
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/STAmount.h>
 #include <cstdint>
 #include <ostream>
 #include <string>
diff --git a/src/test/jtx/attester.h b/src/test/jtx/attester.h
index 7741991b7..327fb2e48 100644
--- a/src/test/jtx/attester.h
+++ b/src/test/jtx/attester.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_ATTESTER_H_INCLUDED
 #define RIPPLE_TEST_JTX_ATTESTER_H_INCLUDED
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/protocol/AccountID.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/src/test/jtx/delivermin.h b/src/test/jtx/delivermin.h
index 579b66e97..f44e84c4a 100644
--- a/src/test/jtx/delivermin.h
+++ b/src/test/jtx/delivermin.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED
 #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/jtx/envconfig.h b/src/test/jtx/envconfig.h
index 5dcdf9aaf..5616f32b7 100644
--- a/src/test/jtx/envconfig.h
+++ b/src/test/jtx/envconfig.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_ENVCONFIG_H_INCLUDED
 #define RIPPLE_TEST_JTX_ENVCONFIG_H_INCLUDED
 
-#include <ripple/core/Config.h>
+#include <xrpld/core/Config.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/fee.h b/src/test/jtx/fee.h
index 58813409e..fe74db31f 100644
--- a/src/test/jtx/fee.h
+++ b/src/test/jtx/fee.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_FEE_H_INCLUDED
 #define RIPPLE_TEST_JTX_FEE_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/tags.h>
 
diff --git a/src/test/jtx/flags.h b/src/test/jtx/flags.h
index 27b6ea956..c9df429e8 100644
--- a/src/test/jtx/flags.h
+++ b/src/test/jtx/flags.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_FLAGS_H_INCLUDED
 #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/jtx/hook.h b/src/test/jtx/hook.h
index 6bad339cc..fe232098d 100644
--- a/src/test/jtx/hook.h
+++ b/src/test/jtx/hook.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_HOOK_H_INCLUDED
 #define RIPPLE_TEST_JTX_HOOK_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 #include <optional>
 #include <test/jtx/Account.h>
 
diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp
index a36384f4a..16902f922 100644
--- a/src/test/jtx/impl/AMM.cpp
+++ b/src/test/jtx/impl/AMM.cpp
@@ -19,11 +19,11 @@
 
 #include <test/jtx/AMM.h>
 
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index 187cb3cee..184a6352b 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -19,10 +19,10 @@
 
 #include <test/jtx/AMMTest.h>
 
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/pay.h>
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index a17186d4f..b005f436d 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index 4b67f428f..7d2eb019e 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -17,26 +17,26 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/HTTPClient.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/HTTPClient.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 #include <memory>
 #include <test/jtx/Env.h>
 #include <test/jtx/JSONRPCClient.h>
diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp
index 1e3664c60..50c07f141 100644
--- a/src/test/jtx/impl/JSONRPCClient.cpp
+++ b/src/test/jtx/impl/JSONRPCClient.cpp
@@ -16,10 +16,10 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/server/Port.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/server/Port.h>
 #include <boost/asio.hpp>
 #include <boost/beast/http/dynamic_body.hpp>
 #include <boost/beast/http/message.hpp>
diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp
index 34249a612..efde9e43f 100644
--- a/src/test/jtx/impl/Oracle.cpp
+++ b/src/test/jtx/impl/Oracle.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Oracle.h>
 
 #include <boost/lexical_cast/try_lexical_convert.hpp>
diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp
index c603620b9..abaa61e4f 100644
--- a/src/test/jtx/impl/TestHelpers.cpp
+++ b/src/test/jtx/impl/TestHelpers.cpp
@@ -19,7 +19,7 @@
 
 #include <test/jtx/TestHelpers.h>
 
-#include <ripple/protocol/TxFlags.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <test/jtx/offer.h>
 #include <test/jtx/owners.h>
 
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index e9b271681..4f7e57508 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/server/Port.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/server/Port.h>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/websocket.hpp>
 #include <test/jtx.h>
@@ -32,7 +32,7 @@
 
 #include <iostream>
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp
index ea104e22b..e548d4c7a 100644
--- a/src/test/jtx/impl/acctdelete.cpp
+++ b/src/test/jtx/impl/acctdelete.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/acctdelete.h>
 
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index 86f51d135..12f953f16 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/basics/safe_cast.h>
+#include <xrpl/basics/safe_cast.h>
 #include <cassert>
 #include <cmath>
 #include <iomanip>
diff --git a/src/test/jtx/impl/attester.cpp b/src/test/jtx/impl/attester.cpp
index dd00f536a..66be9da83 100644
--- a/src/test/jtx/impl/attester.cpp
+++ b/src/test/jtx/impl/attester.cpp
@@ -19,11 +19,11 @@
 
 #include <test/jtx/attester.h>
 
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/XChainAttestations.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/impl/check.cpp b/src/test/jtx/impl/check.cpp
index d862130bc..3856d6b09 100644
--- a/src/test/jtx/impl/check.cpp
+++ b/src/test/jtx/impl/check.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/check.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp
index 464c31e01..1c32aa1b3 100644
--- a/src/test/jtx/impl/delivermin.cpp
+++ b/src/test/jtx/impl/delivermin.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/delivermin.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/deposit.cpp b/src/test/jtx/impl/deposit.cpp
index 803705c8c..4d0352273 100644
--- a/src/test/jtx/impl/deposit.cpp
+++ b/src/test/jtx/impl/deposit.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/deposit.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/did.cpp b/src/test/jtx/impl/did.cpp
index 94dfcc327..74bc97238 100644
--- a/src/test/jtx/impl/did.cpp
+++ b/src/test/jtx/impl/did.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/did.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp
index 9846d900f..ab60daa87 100644
--- a/src/test/jtx/impl/envconfig.cpp
+++ b/src/test/jtx/impl/envconfig.cpp
@@ -19,7 +19,7 @@
 
 #include <test/jtx/envconfig.h>
 
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/core/ConfigSections.h>
 #include <test/jtx/amount.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp
index dea666cd3..8e80b5132 100644
--- a/src/test/jtx/impl/fee.cpp
+++ b/src/test/jtx/impl/fee.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/fee.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp
index c80e329fd..ccbffea34 100644
--- a/src/test/jtx/impl/flags.cpp
+++ b/src/test/jtx/impl/flags.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/flags.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/genesis.cpp b/src/test/jtx/impl/genesis.cpp
index 3b3d02ecc..7b1d54f09 100644
--- a/src/test/jtx/impl/genesis.cpp
+++ b/src/test/jtx/impl/genesis.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/genesis.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/hook.cpp b/src/test/jtx/impl/hook.cpp
index 08067a2a2..0e3e42e6e 100644
--- a/src/test/jtx/impl/hook.cpp
+++ b/src/test/jtx/impl/hook.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/jss.h>
 #include <stdexcept>
 #include <test/jtx/hook.h>
 
diff --git a/src/test/jtx/impl/import.cpp b/src/test/jtx/impl/import.cpp
index 9b227598a..7333ff7b5 100644
--- a/src/test/jtx/impl/import.cpp
+++ b/src/test/jtx/impl/import.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/import.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/invoke.cpp b/src/test/jtx/impl/invoke.cpp
index acdbdf5e3..573caed15 100644
--- a/src/test/jtx/impl/invoke.cpp
+++ b/src/test/jtx/impl/invoke.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/invoke.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp
index d5fb7bfae..64614cda2 100644
--- a/src/test/jtx/impl/jtx_json.cpp
+++ b/src/test/jtx/impl/jtx_json.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/json/json_reader.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/json_reader.h>
 #include <test/jtx/jtx_json.h>
 #include <test/jtx/utility.h>
 
diff --git a/src/test/jtx/impl/last_ledger_sequence.cpp b/src/test/jtx/impl/last_ledger_sequence.cpp
index b0d7bd5c5..77a428df7 100644
--- a/src/test/jtx/impl/last_ledger_sequence.cpp
+++ b/src/test/jtx/impl/last_ledger_sequence.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/last_ledger_sequence.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp
index 174a132eb..d03242f31 100644
--- a/src/test/jtx/impl/memo.cpp
+++ b/src/test/jtx/impl/memo.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/memo.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp
index 1e1f51417..c76d62221 100644
--- a/src/test/jtx/impl/multisign.cpp
+++ b/src/test/jtx/impl/multisign.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 #include <optional>
 #include <sstream>
 #include <test/jtx/multisign.h>
diff --git a/src/test/jtx/impl/network.cpp b/src/test/jtx/impl/network.cpp
index e08976ca3..935cf34c1 100644
--- a/src/test/jtx/impl/network.cpp
+++ b/src/test/jtx/impl/network.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx/network.h>
 
diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp
index e1c659465..96ea6da5e 100644
--- a/src/test/jtx/impl/offer.cpp
+++ b/src/test/jtx/impl/offer.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/offer.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp
index 5de9761a1..c7d68cf99 100644
--- a/src/test/jtx/impl/paths.cpp
+++ b/src/test/jtx/impl/paths.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Pathfinder.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/paths/Pathfinder.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/paths.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp
index 35df2ec19..f912cfbce 100644
--- a/src/test/jtx/impl/pay.cpp
+++ b/src/test/jtx/impl/pay.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/pay.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/paychan.cpp b/src/test/jtx/impl/paychan.cpp
index 50cbf209a..c640261df 100644
--- a/src/test/jtx/impl/paychan.cpp
+++ b/src/test/jtx/impl/paychan.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/paychan.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp
index e1837035e..a7eb52b95 100644
--- a/src/test/jtx/impl/quality2.cpp
+++ b/src/test/jtx/impl/quality2.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/SField.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/SField.h>
 #include <test/jtx/quality.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp
index cf4cd3211..9f8ae5d1b 100644
--- a/src/test/jtx/impl/rate.cpp
+++ b/src/test/jtx/impl/rate.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/jss.h>
 #include <stdexcept>
 #include <test/jtx/rate.h>
 
diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp
index 917fb4406..23194ae57 100644
--- a/src/test/jtx/impl/regkey.cpp
+++ b/src/test/jtx/impl/regkey.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/regkey.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/remarks.cpp b/src/test/jtx/impl/remarks.cpp
index ad49afb3b..d303609ea 100644
--- a/src/test/jtx/impl/remarks.cpp
+++ b/src/test/jtx/impl/remarks.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/remarks.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/remit.cpp b/src/test/jtx/impl/remit.cpp
index 7a2704eaa..27ca5a8c0 100644
--- a/src/test/jtx/impl/remit.cpp
+++ b/src/test/jtx/impl/remit.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/remit.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/reward.cpp b/src/test/jtx/impl/reward.cpp
index 9ff01ee69..34e3075c1 100644
--- a/src/test/jtx/impl/reward.cpp
+++ b/src/test/jtx/impl/reward.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/reward.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp
index a292e2a98..404c78634 100644
--- a/src/test/jtx/impl/sendmax.cpp
+++ b/src/test/jtx/impl/sendmax.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/sendmax.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp
index ca57e7922..843a989cb 100644
--- a/src/test/jtx/impl/seq.cpp
+++ b/src/test/jtx/impl/seq.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/seq.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp
index 33ec2c3b8..44fedfb7f 100644
--- a/src/test/jtx/impl/tag.cpp
+++ b/src/test/jtx/impl/tag.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/tag.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp
index 951c62ab7..3b62dd7f3 100644
--- a/src/test/jtx/impl/ticket.cpp
+++ b/src/test/jtx/impl/ticket.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/ticket.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp
index 12b738ca4..5faf56185 100644
--- a/src/test/jtx/impl/token.cpp
+++ b/src/test/jtx/impl/token.cpp
@@ -20,9 +20,9 @@
 #include <test/jtx/flags.h>
 #include <test/jtx/token.h>
 
-#include <ripple/app/tx/impl/NFTokenMint.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/detail/NFTokenMint.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp
index 4ceb10a23..0d1fef2ea 100644
--- a/src/test/jtx/impl/trust.cpp
+++ b/src/test/jtx/impl/trust.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/protocol/jss.h>
 #include <stdexcept>
 #include <test/jtx/trust.h>
 
diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp
index 5c78be8ba..e5ebb5f54 100644
--- a/src/test/jtx/impl/txflags.cpp
+++ b/src/test/jtx/impl/txflags.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/txflags.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/unl.cpp b/src/test/jtx/impl/unl.cpp
index 54d628cff..7630c9cb1 100644
--- a/src/test/jtx/impl/unl.cpp
+++ b/src/test/jtx/impl/unl.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/unl.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/uritoken.cpp b/src/test/jtx/impl/uritoken.cpp
index f1a91aec6..f6230c96e 100644
--- a/src/test/jtx/impl/uritoken.cpp
+++ b/src/test/jtx/impl/uritoken.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/uritoken.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp
index 196fd9258..0367e6d87 100644
--- a/src/test/jtx/impl/utility.cpp
+++ b/src/test/jtx/impl/utility.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/json/Object.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/Object.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 #include <cstring>
 #include <test/jtx/utility.h>
 
diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp
index 0b81ccdcd..ecd606f23 100644
--- a/src/test/jtx/impl/xchain_bridge.cpp
+++ b/src/test/jtx/impl/xchain_bridge.cpp
@@ -19,15 +19,15 @@
 
 #include <test/jtx/xchain_bridge.h>
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STInteger.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/XChainAttestations.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STInteger.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/XChainAttestations.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/attester.h>
 
diff --git a/src/test/jtx/jtx_json.h b/src/test/jtx/jtx_json.h
index 59cc09537..730ef0c6a 100644
--- a/src/test/jtx/jtx_json.h
+++ b/src/test/jtx/jtx_json.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_JSON_H_INCLUDED
 #define RIPPLE_TEST_JTX_JSON_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h
index 874f59722..d929b7e78 100644
--- a/src/test/jtx/offer.h
+++ b/src/test/jtx/offer.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_OFFER_H_INCLUDED
 #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h
index 9c802ec91..f7ee6b22a 100644
--- a/src/test/jtx/owners.h
+++ b/src/test/jtx/owners.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_OWNERS_H_INCLUDED
 #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED
 
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <cstdint>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/jtx/paths.h b/src/test/jtx/paths.h
index 240582825..fc80a3df7 100644
--- a/src/test/jtx/paths.h
+++ b/src/test/jtx/paths.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_PATHS_H_INCLUDED
 #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED
 
-#include <ripple/protocol/Issue.h>
+#include <xrpl/protocol/Issue.h>
 #include <test/jtx/Env.h>
 #include <type_traits>
 
diff --git a/src/test/jtx/pay.h b/src/test/jtx/pay.h
index f66075a3e..1b06d6628 100644
--- a/src/test/jtx/pay.h
+++ b/src/test/jtx/pay.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_PAY_H_INCLUDED
 #define RIPPLE_TEST_JTX_PAY_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 
diff --git a/src/test/jtx/paychan.h b/src/test/jtx/paychan.h
index dc961851c..f33ed15f1 100644
--- a/src/test/jtx/paychan.h
+++ b/src/test/jtx/paychan.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_PAYCHAN_H_INCLUDED
 #define RIPPLE_TEST_JTX_PAYCHAN_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 
 namespace ripple {
diff --git a/src/test/jtx/rate.h b/src/test/jtx/rate.h
index 6427b4988..36606216d 100644
--- a/src/test/jtx/rate.h
+++ b/src/test/jtx/rate.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_RATE_H_INCLUDED
 #define RIPPLE_TEST_JTX_RATE_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 #include <test/jtx/Account.h>
 
 namespace ripple {
diff --git a/src/test/jtx/regkey.h b/src/test/jtx/regkey.h
index 94869d1d0..7a1f0e2e0 100644
--- a/src/test/jtx/regkey.h
+++ b/src/test/jtx/regkey.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_REGKEY_H_INCLUDED
 #define RIPPLE_TEST_JTX_REGKEY_H_INCLUDED
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/tags.h>
 
diff --git a/src/test/jtx/remit.h b/src/test/jtx/remit.h
index 0ac5bc750..5c455df0b 100644
--- a/src/test/jtx/remit.h
+++ b/src/test/jtx/remit.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_REMIT_H_INCLUDED
 #define RIPPLE_TEST_JTX_REMIT_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/jtx/sendmax.h b/src/test/jtx/sendmax.h
index 41e09a431..27c0b763b 100644
--- a/src/test/jtx/sendmax.h
+++ b/src/test/jtx/sendmax.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED
 #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/jtx/token.h b/src/test/jtx/token.h
index 957e499ce..9b4f81b70 100644
--- a/src/test/jtx/token.h
+++ b/src/test/jtx/token.h
@@ -24,7 +24,7 @@
 #include <test/jtx/Env.h>
 #include <test/jtx/owners.h>
 
-#include <ripple/basics/strHex.h>
+#include <xrpl/basics/strHex.h>
 
 #include <initializer_list>
 
diff --git a/src/test/jtx/trust.h b/src/test/jtx/trust.h
index 5b6dd78b3..22400295a 100644
--- a/src/test/jtx/trust.h
+++ b/src/test/jtx/trust.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TEST_JTX_TRUST_H_INCLUDED
 #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 
 namespace ripple {
diff --git a/src/test/jtx/unl.h b/src/test/jtx/unl.h
index 2e0bae354..32b92c1cd 100644
--- a/src/test/jtx/unl.h
+++ b/src/test/jtx/unl.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_UNL_H_INCLUDED
 #define RIPPLE_TEST_JTX_UNL_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/jtx/uritoken.h b/src/test/jtx/uritoken.h
index c5af9c502..7c0ddf411 100644
--- a/src/test/jtx/uritoken.h
+++ b/src/test/jtx/uritoken.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TEST_JTX_URITOKEN_H_INCLUDED
 #define RIPPLE_TEST_JTX_URITOKEN_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/jtx/utility.h b/src/test/jtx/utility.h
index 42a2180ee..249b397a7 100644
--- a/src/test/jtx/utility.h
+++ b/src/test/jtx/utility.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TEST_JTX_UTILITY_H_INCLUDED
 #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <stdexcept>
 #include <test/jtx/Account.h>
 
diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h
index 8a398bc6f..1ffbae843 100644
--- a/src/test/jtx/xchain_bridge.h
+++ b/src/test/jtx/xchain_bridge.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED
 #define RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/XChainAttestations.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/multisign.h>
diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp
index c7dbea3d6..2082a9cea 100644
--- a/src/test/ledger/BookDirs_test.cpp
+++ b/src/test/ledger/BookDirs_test.cpp
@@ -15,8 +15,8 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/BookDirs.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/ledger/BookDirs.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp
index 42dcdab9b..273cb21ee 100644
--- a/src/test/ledger/Directory_test.cpp
+++ b/src/test/ledger/Directory_test.cpp
@@ -15,13 +15,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/random.h>
-#include <ripple/ledger/BookDirs.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/random.h>
+#include <xrpld/ledger/BookDirs.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/jss.h>
 #include <algorithm>
 #include <test/jtx.h>
 
diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp
index 86ceb508c..15dec0db1 100644
--- a/src/test/ledger/Invariants_test.cpp
+++ b/src/test/ledger/Invariants_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/apply.h>
-#include <ripple/app/tx/impl/ApplyContext.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index b5ad8c771..05bde8f29 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/Feature.h>
 #include <test/jtx/PathSet.h>
 
 namespace ripple {
diff --git a/src/test/ledger/PendingSaves_test.cpp b/src/test/ledger/PendingSaves_test.cpp
index d826d2019..1bd42a64a 100644
--- a/src/test/ledger/PendingSaves_test.cpp
+++ b/src/test/ledger/PendingSaves_test.cpp
@@ -15,8 +15,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpl/beast/unit_test.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index 4fd117a4c..959913434 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/basics/Log.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/ledger/View.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/ledger/View.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index bbb1eec8f..a84335846 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/ledger/OpenView.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
 #include <test/jtx.h>
 #include <type_traits>
 
diff --git a/src/test/net/DatabaseDownloader_test.cpp b/src/test/net/DatabaseDownloader_test.cpp
index 31c8abfd1..8ba921e23 100644
--- a/src/test/net/DatabaseDownloader_test.cpp
+++ b/src/test/net/DatabaseDownloader_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/net/DatabaseDownloader.h>
+#include <xrpld/net/DatabaseDownloader.h>
 #include <boost/filesystem/operations.hpp>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index 10ba4e4ad..05c1bd76e 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/unity/rocksdb.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/unity/rocksdb.h>
 #include <algorithm>
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index 92f2ae15a..0779d51d4 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/EncodedBlob.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/nodestore/detail/DecodedBlob.h>
+#include <xrpld/nodestore/detail/EncodedBlob.h>
 #include <test/nodestore/TestBase.h>
 
 namespace ripple {
diff --git a/src/test/nodestore/DatabaseShard_test.cpp b/src/test/nodestore/DatabaseShard_test.cpp
index 5c074b149..5c4d67a8c 100644
--- a/src/test/nodestore/DatabaseShard_test.cpp
+++ b/src/test/nodestore/DatabaseShard_test.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/Shard.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/detail/DecodedBlob.h>
+#include <xrpld/nodestore/detail/Shard.h>
+#include <xrpl/protocol/digest.h>
 #include <test/jtx.h>
 #include <test/jtx/CaptureLogs.h>
 #include <test/nodestore/TestBase.h>
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index fabd01cc8..07afe2058 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
 #include <test/jtx.h>
 #include <test/jtx/CheckMessageLogs.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index 9ccf2e169..44459e4fa 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_NODESTORE_BASE_H_INCLUDED
 #define RIPPLE_NODESTORE_BASE_H_INCLUDED
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/nodestore/Backend.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/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 <xrpld/nodestore/Backend.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/nodestore/Types.h>
 #include <boost/algorithm/string.hpp>
 #include <iomanip>
 
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 61cfb0994..8fcbd8ff7 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/thread.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/unity/rocksdb.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/unit_test/thread.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/beast/xor_shift_engine.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/unity/rocksdb.h>
 #include <boost/algorithm/string.hpp>
 #include <atomic>
 #include <chrono>
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index 4a9ee9f0a..cb0c72f48 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/clock/basic_seconds_clock.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/nodestore/impl/codec.h>
+#include <xrpl/basics/contract.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 <xrpld/nodestore/detail/codec.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
@@ -34,7 +34,7 @@
 #include <nudb/xxhasher.hpp>
 #include <sstream>
 
-#include <ripple/unity/rocksdb.h>
+#include <xrpld/unity/rocksdb.h>
 
 /*
 
diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp
index a84506b7e..0de3f6420 100644
--- a/src/test/nodestore/varint_test.cpp
+++ b/src/test/nodestore/varint_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/nodestore/impl/varint.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/nodestore/detail/varint.h>
 #include <array>
 #include <vector>
 
diff --git a/src/test/overlay/ProtocolVersion_test.cpp b/src/test/overlay/ProtocolVersion_test.cpp
index a5a26fe74..937550235 100644
--- a/src/test/overlay/ProtocolVersion_test.cpp
+++ b/src/test/overlay/ProtocolVersion_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/overlay/impl/ProtocolVersion.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/overlay/detail/ProtocolVersion.h>
 
 namespace ripple {
 
diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp
index afbc12a20..3a1dce7b0 100644
--- a/src/test/overlay/cluster_test.cpp
+++ b/src/test/overlay/cluster_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/ClusterNode.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/ClusterNode.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <test/jtx/TestSuite.h>
 #include <test/unit_test/SuiteJournal.h>
 
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index 81f21258e..d4f36389c 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -17,25 +17,25 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/Compression.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/impl/Handshake.h>
-#include <ripple/overlay/impl/ProtocolMessage.h>
-#include <ripple/overlay/impl/ZeroCopyStream.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/messages.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/Compression.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/detail/Handshake.h>
+#include <xrpld/overlay/detail/ProtocolMessage.h>
+#include <xrpld/overlay/detail/ZeroCopyStream.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/messages.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/endian/conversion.hpp>
diff --git a/src/test/overlay/handshake_test.cpp b/src/test/overlay/handshake_test.cpp
index 25bf20add..ed9040769 100644
--- a/src/test/overlay/handshake_test.cpp
+++ b/src/test/overlay/handshake_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/overlay/impl/Handshake.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/overlay/detail/Handshake.h>
 
 namespace ripple {
 
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index 025e3295f..2600594e0 100644
--- a/src/test/overlay/reduce_relay_test.cpp
+++ b/src/test/overlay/reduce_relay_test.cpp
@@ -16,14 +16,14 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/overlay/Slot.h>
-#include <ripple/overlay/impl/Handshake.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpld/overlay/Slot.h>
+#include <xrpld/overlay/detail/Handshake.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/messages.h>
 #include <test/jtx/Env.h>
 
 #include <boost/thread.hpp>
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 434b41008..888419283 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/make_SSLContext.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/beast/unit_test.h>
+#include <xrpl/basics/make_SSLContext.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/beast/unit_test.h>
 #include <test/jtx/envconfig.h>
 
 #include <boost/asio.hpp>
diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp
index 7b26ad096..dac9f32e3 100644
--- a/src/test/overlay/tx_reduce_relay_test.cpp
+++ b/src/test/overlay/tx_reduce_relay_test.cpp
@@ -16,11 +16,11 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/basics/make_SSLContext.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/overlay/impl/OverlayImpl.h>
-#include <ripple/overlay/impl/PeerImp.h>
-#include <ripple/peerfinder/impl/SlotImp.h>
+#include <xrpl/basics/make_SSLContext.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/overlay/detail/OverlayImpl.h>
+#include <xrpld/overlay/detail/PeerImp.h>
+#include <xrpld/peerfinder/detail/SlotImp.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp
index b6d193f21..b93647f54 100644
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/clock/manual_clock.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/peerfinder/impl/Livecache.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/clock/manual_clock.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/peerfinder/detail/Livecache.h>
 #include <boost/algorithm/string.hpp>
 #include <test/beast/IPEndpointCommon.h>
 #include <test/unit_test/SuiteJournal.h>
diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp
index feabe69b6..1f9588a0e 100644
--- a/src/test/peerfinder/PeerFinder_test.cpp
+++ b/src/test/peerfinder/PeerFinder_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/core/Config.h>
-#include <ripple/peerfinder/impl/Logic.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/peerfinder/detail/Logic.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <test/unit_test/SuiteJournal.h>
 
 namespace ripple {
diff --git a/src/test/protocol/ApiVersion_test.cpp b/src/test/protocol/ApiVersion_test.cpp
index 81ff0184e..7d634dc56 100644
--- a/src/test/protocol/ApiVersion_test.cpp
+++ b/src/test/protocol/ApiVersion_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/suite.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ApiVersion.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ApiVersion.h>
 
 #include <array>
 #include <cstdint>
diff --git a/src/test/protocol/BuildInfo_test.cpp b/src/test/protocol/BuildInfo_test.cpp
index e83711a3f..a1d19c428 100644
--- a/src/test/protocol/BuildInfo_test.cpp
+++ b/src/test/protocol/BuildInfo_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/BuildInfo.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/BuildInfo.h>
 
 namespace ripple {
 
diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp
index 1f71abb3a..7d787d921 100644
--- a/src/test/protocol/Hooks_test.cpp
+++ b/src/test/protocol/Hooks_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <functional>
 #include <test/jtx.h>
 #include <vector>
diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp
index 009ceef25..1302fe43e 100644
--- a/src/test/protocol/InnerObjectFormats_test.cpp
+++ b/src/test/protocol/InnerObjectFormats_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/json_reader.h>     // Json::Reader
-#include <ripple/protocol/ErrorCodes.h>  // RPC::containsError
-#include <ripple/protocol/InnerObjectFormats.h>
-#include <ripple/protocol/STParsedJSON.h>  // STParsedJSONObject
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/json_reader.h>     // Json::Reader
+#include <xrpl/protocol/ErrorCodes.h>  // RPC::containsError
+#include <xrpl/protocol/InnerObjectFormats.h>
+#include <xrpl/protocol/STParsedJSON.h>  // STParsedJSONObject
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp
index 44eb6e0c0..7ec1507e0 100644
--- a/src/test/protocol/Issue_test.cpp
+++ b/src/test/protocol/Issue_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Book.h>
-#include <ripple/protocol/Issue.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Issue.h>
 #include <map>
 #include <set>
 #include <typeinfo>
diff --git a/src/test/protocol/Memo_test.cpp b/src/test/protocol/Memo_test.cpp
index 3dbcafaf2..53edaa5b0 100644
--- a/src/test/protocol/Memo_test.cpp
+++ b/src/test/protocol/Memo_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/protocol/MultiApiJson_test.cpp b/src/test/protocol/MultiApiJson_test.cpp
index a7b0e7e9a..2c0b410f8 100644
--- a/src/test/protocol/MultiApiJson_test.cpp
+++ b/src/test/protocol/MultiApiJson_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/MultiApiJson.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/MultiApiJson.h>
 
 #include <cstdint>
 #include <limits>
diff --git a/src/test/protocol/PublicKey_test.cpp b/src/test/protocol/PublicKey_test.cpp
index 040d752f4..7fa798d14 100644
--- a/src/test/protocol/PublicKey_test.cpp
+++ b/src/test/protocol/PublicKey_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <vector>
 
 namespace ripple {
diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp
index a36591b02..741a341d9 100644
--- a/src/test/protocol/Quality_test.cpp
+++ b/src/test/protocol/Quality_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Quality.h>
 #include <type_traits>
 
 namespace ripple {
diff --git a/src/test/protocol/STAccount_test.cpp b/src/test/protocol/STAccount_test.cpp
index f8f79752a..034e0e9e0 100644
--- a/src/test/protocol/STAccount_test.cpp
+++ b/src/test/protocol/STAccount_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/STAccount.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/STAccount.h>
 
 namespace ripple {
 
diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp
index 5dddd3e01..b41fc7c28 100644
--- a/src/test/protocol/STAmount_test.cpp
+++ b/src/test/protocol/STAmount_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
 
diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp
index 34d1cc82f..3a7172dbd 100644
--- a/src/test/protocol/STObject_test.cpp
+++ b/src/test/protocol/STObject_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/st.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/st.h>
 #include <test/jtx.h>
 
 #include <array>
diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp
index 24bf71961..ea5ca03ab 100644
--- a/src/test/protocol/STTx_test.cpp
+++ b/src/test/protocol/STTx_test.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Slice.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/TxFormats.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/messages.h>
 #include <memory>
 #include <regex>
 
diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp
index 3435db22c..df9a7cc5f 100644
--- a/src/test/protocol/STValidation_test.cpp
+++ b/src/test/protocol/STValidation_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/st.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/st.h>
 #include <test/jtx.h>
 
 #include <memory>
diff --git a/src/test/protocol/SecretKey_test.cpp b/src/test/protocol/SecretKey_test.cpp
index 08a191245..bce89bce7 100644
--- a/src/test/protocol/SecretKey_test.cpp
+++ b/src/test/protocol/SecretKey_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Seed.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
 #include <algorithm>
 #include <string>
 #include <vector>
diff --git a/src/test/protocol/Seed_test.cpp b/src/test/protocol/Seed_test.cpp
index 86cf449e1..3619e8454 100644
--- a/src/test/protocol/Seed_test.cpp
+++ b/src/test/protocol/Seed_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Seed.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/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp
index 99a29dfe0..5e44bca5b 100644
--- a/src/test/protocol/SeqProxy_test.cpp
+++ b/src/test/protocol/SeqProxy_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/SeqProxy.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/SeqProxy.h>
 #include <limits>
 #include <sstream>
 
diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp
index 3cf21db2c..a43fd8758 100644
--- a/src/test/protocol/TER_test.cpp
+++ b/src/test/protocol/TER_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/TER.h>
 
 #include <tuple>
 #include <type_traits>
diff --git a/src/test/protocol/types_test.cpp b/src/test/protocol/types_test.cpp
index 2ae7d15ef..ac4314df6 100644
--- a/src/test/protocol/types_test.cpp
+++ b/src/test/protocol/types_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index 25379370f..6d110eb41 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/resource/Consumer.h>
-#include <ripple/resource/impl/Entry.h>
-#include <ripple/resource/impl/Logic.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/resource/Consumer.h>
+#include <xrpl/resource/detail/Entry.h>
+#include <xrpl/resource/detail/Logic.h>
 #include <test/unit_test/SuiteJournal.h>
 
 #include <boost/utility/base_from_member.hpp>
diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp
index 664a0c04c..54b736f37 100644
--- a/src/test/rpc/AMMInfo_test.cpp
+++ b/src/test/rpc/AMMInfo_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp
index 64b737430..62ae37f79 100644
--- a/src/test/rpc/AccountCurrencies_test.cpp
+++ b/src/test/rpc/AccountCurrencies_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp
index 60c73acb2..b37ac14ef 100644
--- a/src/test/rpc/AccountInfo_test.cpp
+++ b/src/test/rpc/AccountInfo_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
-#include <ripple/resource/Charge.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/GRPCHandlers.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/GRPCHandlers.h>
 #include <test/jtx/WSClient.h>
 #include <test/rpc/GRPCTestClientBase.h>
 
diff --git a/src/test/rpc/AccountLines_test.cpp b/src/test/rpc/AccountLines_test.cpp
index c02cc25e1..df090f6e5 100644
--- a/src/test/rpc/AccountLines_test.cpp
+++ b/src/test/rpc/AccountLines_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountNamespace_test.cpp b/src/test/rpc/AccountNamespace_test.cpp
index aeeb04049..20ba33130 100644
--- a/src/test/rpc/AccountNamespace_test.cpp
+++ b/src/test/rpc/AccountNamespace_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index abffd95ad..f7f517124 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/xchain_bridge.h>
diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp
index 542e7c11e..1a6578f1f 100644
--- a/src/test/rpc/AccountOffers_test.cpp
+++ b/src/test/rpc/AccountOffers_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp
index 953943445..f5be1fb95 100644
--- a/src/test/rpc/AccountSet_test.cpp
+++ b/src/test/rpc/AccountSet_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp
index a68d09357..1740ae085 100644
--- a/src/test/rpc/AccountTx_test.cpp
+++ b/src/test/rpc/AccountTx_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <boost/container/flat_set.hpp>
diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp
index a90bcdcd0..b8e3c6cb6 100644
--- a/src/test/rpc/AmendmentBlocked_test.cpp
+++ b/src/test/rpc/AmendmentBlocked_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index dc6a57723..1d8519198 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -15,10 +15,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/Catalogue_test.cpp b/src/test/rpc/Catalogue_test.cpp
index 9cafebd07..ccce6a515 100644
--- a/src/test/rpc/Catalogue_test.cpp
+++ b/src/test/rpc/Catalogue_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/filesystem.hpp>
 #include <chrono>
 #include <fstream>
diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp
index 1e5f2eac1..210285c83 100644
--- a/src/test/rpc/DeliveredAmount_test.cpp
+++ b/src/test/rpc/DeliveredAmount_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp
index 128d91f73..f665b6fd8 100644
--- a/src/test/rpc/DepositAuthorized_test.cpp
+++ b/src/test/rpc/DepositAuthorized_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index 010a61fbf..90d9e5d6b 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h
index a5c613f55..c57c77ccf 100644
--- a/src/test/rpc/GRPCTestClientBase.h
+++ b/src/test/rpc/GRPCTestClientBase.h
@@ -21,7 +21,7 @@
 #define RIPPLED_GRPCTESTCLIENTBASE_H
 
 #include <grpcpp/grpcpp.h>
-#include <org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <test/jtx/envconfig.h>
 
 namespace ripple {
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 4c6ec9aaf..2bcf9aec2 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -15,10 +15,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index 1fb263bbc..c1fc6d626 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Oracle.h>
 
diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp
index 82a8ad628..ec2e56811 100644
--- a/src/test/rpc/GetCounts_test.cpp
+++ b/src/test/rpc/GetCounts_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp
index 5160a68aa..0449789c3 100644
--- a/src/test/rpc/Handler_test.cpp
+++ b/src/test/rpc/Handler_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/rpc/detail/Handler.h>
 #include <test/jtx.h>
 
 #include <chrono>
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index a435c771f..31e30e12f 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
 
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index 28f9afd3b..48a8f0933 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -16,12 +16,12 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/json/json_value.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/handlers/WalletPropose.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/handlers/WalletPropose.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx/TestSuite.h>
 
 namespace ripple {
diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp
index c6d982ec0..32a42b1a7 100644
--- a/src/test/rpc/LedgerClosed_test.cpp
+++ b/src/test/rpc/LedgerClosed_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp
index d213929b0..29a5ebca2 100644
--- a/src/test/rpc/LedgerData_test.cpp
+++ b/src/test/rpc/LedgerData_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 
diff --git a/src/test/rpc/LedgerHeader_test.cpp b/src/test/rpc/LedgerHeader_test.cpp
index d6c0652d5..2ff66c79d 100644
--- a/src/test/rpc/LedgerHeader_test.cpp
+++ b/src/test/rpc/LedgerHeader_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
 
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 729a8f43f..5a2822794 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/jss.h>
 #include <test/app/Import_json.h>
 #include <test/jtx.h>
 #include <test/jtx/Oracle.h>
diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp
index 0e479db3d..eff478ca6 100644
--- a/src/test/rpc/LedgerRequestRPC_test.cpp
+++ b/src/test/rpc/LedgerRequestRPC_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 
 #include <functional>
diff --git a/src/test/rpc/ManifestRPC_test.cpp b/src/test/rpc/ManifestRPC_test.cpp
index 3c32f4d7b..c67401fc8 100644
--- a/src/test/rpc/ManifestRPC_test.cpp
+++ b/src/test/rpc/ManifestRPC_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <string>
diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp
index 9858adf84..437b577f5 100644
--- a/src/test/rpc/NoRippleCheck_test.cpp
+++ b/src/test/rpc/NoRippleCheck_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/resource/impl/Entry.h>
-#include <ripple/resource/impl/Tuning.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpl/resource/detail/Entry.h>
+#include <xrpl/resource/detail/Tuning.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp
index 8da80e648..90c02fcb0 100644
--- a/src/test/rpc/NoRipple_test.cpp
+++ b/src/test/rpc/NoRipple_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/NodeToShardRPC_test.cpp b/src/test/rpc/NodeToShardRPC_test.cpp
index dfa8e3152..99c139166 100644
--- a/src/test/rpc/NodeToShardRPC_test.cpp
+++ b/src/test/rpc/NodeToShardRPC_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx/Env.h>
 
 namespace ripple {
diff --git a/src/test/rpc/OwnerInfo_test.cpp b/src/test/rpc/OwnerInfo_test.cpp
index af4b4b3bd..98788abaf 100644
--- a/src/test/rpc/OwnerInfo_test.cpp
+++ b/src/test/rpc/OwnerInfo_test.cpp
@@ -18,10 +18,10 @@
 //==============================================================================
 #include <test/jtx.h>
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp
index 43fa601e1..69b83fa1b 100644
--- a/src/test/rpc/Peers_test.cpp
+++ b/src/test/rpc/Peers_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <unordered_map>
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index a5b66b6f2..bce301b1b 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -15,11 +15,11 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 #include <test/jtx/utility.h>
 
diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp
index 088a81790..d706f8e8e 100644
--- a/src/test/rpc/RPCOverload_test.cpp
+++ b/src/test/rpc/RPCOverload_test.cpp
@@ -15,9 +15,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/JSONRPCClient.h>
 #include <test/jtx/WSClient.h>
diff --git a/src/test/rpc/ReportingETL_test.cpp b/src/test/rpc/ReportingETL_test.cpp
index 8af76a539..d65414dca 100644
--- a/src/test/rpc/ReportingETL_test.cpp
+++ b/src/test/rpc/ReportingETL_test.cpp
@@ -18,11 +18,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/core/ConfigSections.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp
index 37b16c58d..c4bd7109a 100644
--- a/src/test/rpc/RobustTransaction_test.cpp
+++ b/src/test/rpc/RobustTransaction_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp
index 079fd2f9f..0de9071da 100644
--- a/src/test/rpc/Roles_test.cpp
+++ b/src/test/rpc/Roles_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
diff --git a/src/test/rpc/ServerDefinitions_test.cpp b/src/test/rpc/ServerDefinitions_test.cpp
index 98021b721..7fcf6c2e2 100644
--- a/src/test/rpc/ServerDefinitions_test.cpp
+++ b/src/test/rpc/ServerDefinitions_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index ece98e99a..c31b2876b 100644
--- a/src/test/rpc/ServerInfo_test.cpp
+++ b/src/test/rpc/ServerInfo_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <boost/format.hpp>
diff --git a/src/test/rpc/ShardArchiveHandler_test.cpp b/src/test/rpc/ShardArchiveHandler_test.cpp
index ee0bec1ea..abc5a2745 100644
--- a/src/test/rpc/ShardArchiveHandler_test.cpp
+++ b/src/test/rpc/ShardArchiveHandler_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/ShardArchive.h>
-#include <ripple/beast/utility/temp_dir.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/ShardArchiveHandler.h>
+#include <xrpld/app/rdb/ShardArchive.h>
+#include <xrpl/beast/utility/temp_dir.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/nodestore/detail/DecodedBlob.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/ShardArchiveHandler.h>
 #include <test/jtx/CaptureLogs.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/TrustedPublisherServer.h>
diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp
index ab94191e1..7bdc37e84 100644
--- a/src/test/rpc/Status_test.cpp
+++ b/src/test/rpc/Status_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/rpc/Status.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/rpc/Status.h>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index d776701c9..f893da02a 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -15,14 +15,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/LoadManager.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/main/LoadManager.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp
index e65cf33a9..e243c72d8 100644
--- a/src/test/rpc/TransactionEntry_test.cpp
+++ b/src/test/rpc/TransactionEntry_test.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 
diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp
index 862eaaee5..dd74366cc 100644
--- a/src/test/rpc/TransactionHistory_test.cpp
+++ b/src/test/rpc/TransactionHistory_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/container/static_vector.hpp>
 #include <algorithm>
 #include <test/jtx.h>
diff --git a/src/test/rpc/Transaction_test.cpp b/src/test/rpc/Transaction_test.cpp
index e022fa8b3..b30583965 100644
--- a/src/test/rpc/Transaction_test.cpp
+++ b/src/test/rpc/Transaction_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/serialize.h>
-#include <ripple/rpc/CTID.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/serialize.h>
+#include <xrpld/rpc/CTID.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
diff --git a/src/test/rpc/ValidatorInfo_test.cpp b/src/test/rpc/ValidatorInfo_test.cpp
index f45d68675..778ea0f57 100644
--- a/src/test/rpc/ValidatorInfo_test.cpp
+++ b/src/test/rpc/ValidatorInfo_test.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 
 #include <string>
diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp
index c9b11cdb9..6db2dff6b 100644
--- a/src/test/rpc/ValidatorRPC_test.cpp
+++ b/src/test/rpc/ValidatorRPC_test.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/BasicApp.h>
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/basics/base64.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/main/BasicApp.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/jss.h>
 #include <test/jtx.h>
 #include <test/jtx/TrustedPublisherServer.h>
 
diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp
index 34e55b2be..2b3342619 100644
--- a/src/test/rpc/Version_test.cpp
+++ b/src/test/rpc/Version_test.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <test/jtx.h>
 
 namespace ripple {
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index f2f76e90a..8ca34a724 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/base64.h>
-#include <ripple/beast/test/yield_to.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/rpc/ServerHandler.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/test/yield_to.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/rpc/ServerHandler.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp
index d141b9ebc..0d2ffbb20 100644
--- a/src/test/server/Server_test.cpp
+++ b/src/test/server/Server_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/make_SSLContext.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/server/Server.h>
-#include <ripple/server/Session.h>
+#include <xrpl/basics/make_SSLContext.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/server/Server.h>
+#include <xrpl/server/Session.h>
 
 #include <test/jtx.h>
 #include <test/jtx/CaptureLogs.h>
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index f15f3163e..dcf7b3c7d 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
+#include <xrpl/basics/StringUtilities.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 <xrpld/shamap/SHAMap.h>
+#include <xrpld/shamap/SHAMapSyncFilter.h>
 #include <functional>
 #include <stdexcept>
 #include <test/shamap/common.h>
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index 70e578b5f..0ea474208 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/xor_shift_engine.h>
-#include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/SHAMapItem.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/xor_shift_engine.h>
+#include <xrpld/shamap/SHAMap.h>
+#include <xrpld/shamap/SHAMapItem.h>
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
 
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 83bbc1325..932e7cb8b 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/Buffer.h>
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/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 <xrpld/shamap/SHAMap.h>
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
 
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index 591e95803..e724bc986 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 #define RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/shamap/Family.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/shamap/Family.h>
 
 namespace ripple {
 namespace tests {
diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h
index 3c79fb11b..5d977d3db 100644
--- a/src/test/unit_test/FileDirGuard.h
+++ b/src/test/unit_test/FileDirGuard.h
@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef TEST_UNIT_TEST_DIRGUARD_H
 #define TEST_UNIT_TEST_DIRGUARD_H
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 #include <boost/filesystem.hpp>
 #include <test/jtx/TestSuite.h>
 
diff --git a/src/test/unit_test/SuiteJournal.h b/src/test/unit_test/SuiteJournal.h
index 0e80e83cd..211bec0e4 100644
--- a/src/test/unit_test/SuiteJournal.h
+++ b/src/test/unit_test/SuiteJournal.h
@@ -20,8 +20,8 @@
 #ifndef TEST_UNIT_TEST_SUITE_JOURNAL_H
 #define TEST_UNIT_TEST_SUITE_JOURNAL_H
 
-#include <ripple/beast/unit_test.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp
index cd84c3c99..60487cadf 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -19,7 +19,7 @@
 
 #include <test/unit_test/multi_runner.h>
 
-#include <ripple/beast/unit_test/amount.h>
+#include <xrpl/beast/unit_test/amount.h>
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h
index c003a99f9..a4435dd1a 100644
--- a/src/test/unit_test/multi_runner.h
+++ b/src/test/unit_test/multi_runner.h
@@ -20,8 +20,8 @@
 #ifndef TEST_UNIT_TEST_MULTI_RUNNER_H
 #define TEST_UNIT_TEST_MULTI_RUNNER_H
 
-#include <ripple/beast/unit_test/global_suites.h>
-#include <ripple/beast/unit_test/runner.h>
+#include <xrpl/beast/unit_test/global_suites.h>
+#include <xrpl/beast/unit_test/runner.h>
 #include <boost/beast/core/static_string.hpp>
 
 #include <boost/container/static_vector.hpp>
diff --git a/src/xrpld/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h
index f661a8036..63fbb51bd 100644
--- a/src/xrpld/app/consensus/RCLCensorshipDetector.h
+++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
 
-#include <ripple/basics/algorithm.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpl/basics/algorithm.h>
+#include <xrpld/shamap/SHAMap.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index 68ac01565..26fd84fb9 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -17,33 +17,33 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLConsensus.h>
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/BuildLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/InboundTransactions.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LocalTxs.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NegativeUNLVote.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/misc/ValidatorKeys.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/consensus/RCLConsensus.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/BuildLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LocalTxs.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NegativeUNLVote.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/digest.h>
 
 #include <algorithm>
 #include <mutex>
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index f8c01e93c..3932a6d25 100644
--- a/src/xrpld/app/consensus/RCLConsensus.h
+++ b/src/xrpld/app/consensus/RCLConsensus.h
@@ -20,21 +20,21 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED
 
-#include <ripple/app/consensus/RCLCensorshipDetector.h>
-#include <ripple/app/consensus/RCLCxLedger.h>
-#include <ripple/app/consensus/RCLCxPeerPos.h>
-#include <ripple/app/consensus/RCLCxTx.h>
-#include <ripple/app/misc/FeeVote.h>
-#include <ripple/app/misc/NegativeUNLVote.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/Log.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/consensus/Consensus.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpld/app/consensus/RCLCensorshipDetector.h>
+#include <xrpld/app/consensus/RCLCxLedger.h>
+#include <xrpld/app/consensus/RCLCxPeerPos.h>
+#include <xrpld/app/consensus/RCLCxTx.h>
+#include <xrpld/app/misc/FeeVote.h>
+#include <xrpld/app/misc/NegativeUNLVote.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/consensus/Consensus.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpld/shamap/SHAMap.h>
 #include <atomic>
 #include <mutex>
 #include <set>
diff --git a/src/xrpld/app/consensus/RCLCxLedger.h b/src/xrpld/app/consensus/RCLCxLedger.h
index b30bef135..ed7ad9fae 100644
--- a/src/xrpld/app/consensus/RCLCxLedger.h
+++ b/src/xrpld/app/consensus/RCLCxLedger.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCXLEDGER_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCXLEDGER_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/RippleLedgerHash.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.cpp b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
index ee5a45b94..74747853a 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.cpp
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLCxPeerPos.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/consensus/RCLCxPeerPos.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.h b/src/xrpld/app/consensus/RCLCxPeerPos.h
index e82a85d42..ca911a6a8 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.h
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/consensus/ConsensusProposal.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpld/consensus/ConsensusProposal.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <boost/container/static_vector.hpp>
 #include <chrono>
 #include <cstdint>
diff --git a/src/xrpld/app/consensus/RCLCxTx.h b/src/xrpld/app/consensus/RCLCxTx.h
index c6abfdfee..7e5fd0777 100644
--- a/src/xrpld/app/consensus/RCLCxTx.h
+++ b/src/xrpld/app/consensus/RCLCxTx.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED
 
-#include <ripple/app/misc/CanonicalTXSet.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpld/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp
index 16ce9939c..4692254b7 100644
--- a/src/xrpld/app/consensus/RCLValidations.cpp
+++ b/src/xrpld/app/consensus/RCLValidations.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/core/TimeKeeper.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/core/TimeKeeper.h>
 #include <memory>
 #include <mutex>
 #include <thread>
diff --git a/src/xrpld/app/consensus/RCLValidations.h b/src/xrpld/app/consensus/RCLValidations.h
index e141731e1..7b1559fba 100644
--- a/src/xrpld/app/consensus/RCLValidations.h
+++ b/src/xrpld/app/consensus/RCLValidations.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_CONSENSUSS_VALIDATIONS_H_INCLUDED
 #define RIPPLE_APP_CONSENSUSS_VALIDATIONS_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/consensus/Validations.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/protocol/STValidation.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/consensus/Validations.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/protocol/STValidation.h>
 #include <optional>
 #include <set>
 #include <vector>
diff --git a/src/xrpld/app/hook/Misc.h b/src/xrpld/app/hook/Misc.h
index c9e2355c3..e28a780f6 100644
--- a/src/xrpld/app/hook/Misc.h
+++ b/src/xrpld/app/hook/Misc.h
@@ -1,7 +1,7 @@
 
 #ifndef HOOKMISC_INCLUDED
 #define HOOKMISC_INCLUDED 1
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 namespace ripple {
 // RH TODO: there's definitely a mucher nicer way to do this, but it involves
 // modifying the base_uint class and we don't want to do that yet.
diff --git a/src/xrpld/app/hook/applyHook.h b/src/xrpld/app/hook/applyHook.h
index d6855969a..f219757c8 100644
--- a/src/xrpld/app/hook/applyHook.h
+++ b/src/xrpld/app/hook/applyHook.h
@@ -1,15 +1,15 @@
 #ifndef APPLY_HOOK_INCLUDED
 #define APPLY_HOOK_INCLUDED 1
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/hook/Macro.h>
-#include <ripple/app/hook/Misc.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/tx/impl/ApplyContext.h>
-#include <ripple/basics/Blob.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/hook/Macro.h>
+#include <xrpld/app/hook/Misc.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/digest.h>
 #include <any>
 #include <memory>
 #include <optional>
diff --git a/src/xrpld/app/hook/detail/applyHook.cpp b/src/xrpld/app/hook/detail/applyHook.cpp
index a0c5ff434..04c1e4823 100644
--- a/src/xrpld/app/hook/detail/applyHook.cpp
+++ b/src/xrpld/app/hook/detail/applyHook.cpp
@@ -1,18 +1,18 @@
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
+#include <xrpl/protocol/tokens.h>
 #include <boost/multiprecision/cpp_dec_float.hpp>
 #include <any>
 #include <cfenv>
diff --git a/src/xrpld/app/ledger/AbstractFetchPackContainer.h b/src/xrpld/app/ledger/AbstractFetchPackContainer.h
index 43552a757..2b27471c6 100644
--- a/src/xrpld/app/ledger/AbstractFetchPackContainer.h
+++ b/src/xrpld/app/ledger/AbstractFetchPackContainer.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_ABSTRACTFETCHPACKCONTAINER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_ABSTRACTFETCHPACKCONTAINER_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/base_uint.h>
 #include <optional>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/AcceptedLedger.cpp b/src/xrpld/app/ledger/AcceptedLedger.cpp
index 4f308653d..37c943679 100644
--- a/src/xrpld/app/ledger/AcceptedLedger.cpp
+++ b/src/xrpld/app/ledger/AcceptedLedger.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/main/Application.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/main/Application.h>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/AcceptedLedger.h b/src/xrpld/app/ledger/AcceptedLedger.h
index 0187fdfb6..65a782aef 100644
--- a/src/xrpld/app/ledger/AcceptedLedger.h
+++ b/src/xrpld/app/ledger/AcceptedLedger.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED
 
-#include <ripple/app/ledger/AcceptedLedgerTx.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpld/app/ledger/AcceptedLedgerTx.h>
+#include <xrpl/protocol/AccountID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/AcceptedLedgerTx.cpp b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
index 613a91e43..e1ad68dff 100644
--- a/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
+++ b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedgerTx.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/AcceptedLedgerTx.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/AcceptedLedgerTx.h b/src/xrpld/app/ledger/AcceptedLedgerTx.h
index 2995d447b..725057aa0 100644
--- a/src/xrpld/app/ledger/AcceptedLedgerTx.h
+++ b/src/xrpld/app/ledger/AcceptedLedgerTx.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
 #define RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/protocol/AccountID.h>
 #include <boost/container/flat_set.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/AccountStateSF.cpp b/src/xrpld/app/ledger/AccountStateSF.cpp
index 5c66469d5..c1f2ca26f 100644
--- a/src/xrpld/app/ledger/AccountStateSF.cpp
+++ b/src/xrpld/app/ledger/AccountStateSF.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AccountStateSF.h>
+#include <xrpld/app/ledger/AccountStateSF.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/AccountStateSF.h b/src/xrpld/app/ledger/AccountStateSF.h
index 43822add5..16cc686e3 100644
--- a/src/xrpld/app/ledger/AccountStateSF.h
+++ b/src/xrpld/app/ledger/AccountStateSF.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED
 #define RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED
 
-#include <ripple/app/ledger/AbstractFetchPackContainer.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
+#include <xrpld/app/ledger/AbstractFetchPackContainer.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/BookListeners.cpp b/src/xrpld/app/ledger/BookListeners.cpp
index 3c7e013e1..2379807a9 100644
--- a/src/xrpld/app/ledger/BookListeners.cpp
+++ b/src/xrpld/app/ledger/BookListeners.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/to_string.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/to_string.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/BookListeners.h b/src/xrpld/app/ledger/BookListeners.h
index 605cf6dc6..6ac52de28 100644
--- a/src/xrpld/app/ledger/BookListeners.h
+++ b/src/xrpld/app/ledger/BookListeners.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
 #define RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
 
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/MultiApiJson.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/MultiApiJson.h>
 
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/app/ledger/BuildLedger.h b/src/xrpld/app/ledger/BuildLedger.h
index acefee24e..9d409ca0a 100644
--- a/src/xrpld/app/ledger/BuildLedger.h
+++ b/src/xrpld/app/ledger/BuildLedger.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/ApplyView.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/ApplyView.h>
 #include <chrono>
 #include <memory>
 
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
index 476c75751..589414b67 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/ConsensusTransSetSF.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/ledger/ConsensusTransSetSF.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h
index ad5b2a23a..b400c8dc8 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.h
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED
 #define RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpld/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/InboundLedger.h b/src/xrpld/app/ledger/InboundLedger.h
index 357a6fcad..a47f6aa9d 100644
--- a/src/xrpld/app/ledger/InboundLedger.h
+++ b/src/xrpld/app/ledger/InboundLedger.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/impl/TimeoutCounter.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/overlay/PeerSet.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/detail/TimeoutCounter.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpld/overlay/PeerSet.h>
 #include <mutex>
 #include <set>
 #include <utility>
diff --git a/src/xrpld/app/ledger/InboundLedgers.h b/src/xrpld/app/ledger/InboundLedgers.h
index cf2a9c41d..6e6f89369 100644
--- a/src/xrpld/app/ledger/InboundLedgers.h
+++ b/src/xrpld/app/ledger/InboundLedgers.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED
 #define RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/protocol/RippleLedgerHash.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h
index f5b44f386..a71d8e6b0 100644
--- a/src/xrpld/app/ledger/InboundTransactions.h
+++ b/src/xrpld/app/ledger/InboundTransactions.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED
 #define RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpld/shamap/SHAMap.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp
index b013b35a0..343ea14c5 100644
--- a/src/xrpld/app/ledger/Ledger.cpp
+++ b/src/xrpld/app/ledger/Ledger.cpp
@@ -17,45 +17,45 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/core/Pg.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/json/to_string.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/core/Pg.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/optional.hpp>
 #include <cassert>
 #include <utility>
 #include <vector>
 
-#include <ripple/nodestore/impl/DatabaseNodeImp.h>
+#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h
index bf2d64ffd..b9714f4c6 100644
--- a/src/xrpld/app/ledger/Ledger.h
+++ b/src/xrpld/app/ledger/Ledger.h
@@ -20,17 +20,17 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/ledger/CachedView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Book.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/TxMeta.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpld/ledger/CachedView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/TxMeta.h>
+#include <xrpld/shamap/SHAMap.h>
 #include <mutex>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/LedgerCleaner.h b/src/xrpld/app/ledger/LedgerCleaner.h
index 9f82a851f..251e8d512 100644
--- a/src/xrpld/app/ledger/LedgerCleaner.h
+++ b/src/xrpld/app/ledger/LedgerCleaner.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/json/json_value.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/json/json_value.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/LedgerHistory.cpp b/src/xrpld/app/ledger/LedgerHistory.cpp
index 2a98634d0..dd7575d19 100644
--- a/src/xrpld/app/ledger/LedgerHistory.cpp
+++ b/src/xrpld/app/ledger/LedgerHistory.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerHistory.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/to_string.h>
+#include <xrpld/app/ledger/LedgerHistory.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/to_string.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/LedgerHistory.h b/src/xrpld/app/ledger/LedgerHistory.h
index 1a0694acd..d0b01e25f 100644
--- a/src/xrpld/app/ledger/LedgerHistory.h
+++ b/src/xrpld/app/ledger/LedgerHistory.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/beast/insight/Event.h>
-#include <ripple/protocol/RippleLedgerHash.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/beast/insight/Event.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/ledger/LedgerHolder.h b/src/xrpld/app/ledger/LedgerHolder.h
index 93d67400e..5636a8ca2 100644
--- a/src/xrpld/app/ledger/LedgerHolder.h
+++ b/src/xrpld/app/ledger/LedgerHolder.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/contract.h>
 #include <mutex>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/LedgerMaster.h b/src/xrpld/app/ledger/LedgerMaster.h
index e1ebd1f43..07b96dd78 100644
--- a/src/xrpld/app/ledger/LedgerMaster.h
+++ b/src/xrpld/app/ledger/LedgerMaster.h
@@ -20,23 +20,23 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED
 
-#include <ripple/app/ledger/AbstractFetchPackContainer.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerHistory.h>
-#include <ripple/app/ledger/LedgerHolder.h>
-#include <ripple/app/ledger/LedgerReplay.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/CanonicalTXSet.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/messages.h>
+#include <xrpld/app/ledger/AbstractFetchPackContainer.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerHistory.h>
+#include <xrpld/app/ledger/LedgerHolder.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/messages.h>
 #include <optional>
 
 #include <mutex>
diff --git a/src/xrpld/app/ledger/LedgerReplay.h b/src/xrpld/app/ledger/LedgerReplay.h
index 0365dea1b..8e52c8d5d 100644
--- a/src/xrpld/app/ledger/LedgerReplay.h
+++ b/src/xrpld/app/ledger/LedgerReplay.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAY_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERREPLAY_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
+#include <xrpl/basics/CountedObject.h>
 #include <cstdint>
 #include <map>
 #include <memory>
diff --git a/src/xrpld/app/ledger/LedgerReplayTask.h b/src/xrpld/app/ledger/LedgerReplayTask.h
index 4330f0b62..54863e709 100644
--- a/src/xrpld/app/ledger/LedgerReplayTask.h
+++ b/src/xrpld/app/ledger/LedgerReplayTask.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYTASK_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERREPLAYTASK_H_INCLUDED
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/impl/TimeoutCounter.h>
-#include <ripple/app/main/Application.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/detail/TimeoutCounter.h>
+#include <xrpld/app/main/Application.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/xrpld/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h
index b06dd2cc8..4ce4b20b2 100644
--- a/src/xrpld/app/ledger/LedgerReplayer.h
+++ b/src/xrpld/app/ledger/LedgerReplayer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERREPLAYER_H_INCLUDED
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerReplayTask.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplayTask.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/utility/Journal.h>
 
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h
index 78947ca91..e3ca11929 100644
--- a/src/xrpld/app/ledger/LedgerToJson.h
+++ b/src/xrpld/app/ledger/LedgerToJson.h
@@ -20,16 +20,16 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/json/Object.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/serialize.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/json/Object.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/serialize.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/LocalTxs.h b/src/xrpld/app/ledger/LocalTxs.h
index f427a5e04..638e070f4 100644
--- a/src/xrpld/app/ledger/LocalTxs.h
+++ b/src/xrpld/app/ledger/LocalTxs.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LOCALTXS_H_INCLUDED
 
-#include <ripple/app/misc/CanonicalTXSet.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
+#include <xrpld/ledger/ReadView.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h
index 5ec15dce6..016565dd4 100644
--- a/src/xrpld/app/ledger/OpenLedger.h
+++ b/src/xrpld/app/ledger/OpenLedger.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_LEDGER_OPENLEDGER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_OPENLEDGER_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/CanonicalTXSet.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/CachedSLEs.h>
-#include <ripple/ledger/OpenView.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/CachedSLEs.h>
+#include <xrpld/ledger/OpenView.h>
 #include <cassert>
 #include <mutex>
 
diff --git a/src/xrpld/app/ledger/OrderBookDB.cpp b/src/xrpld/app/ledger/OrderBookDB.cpp
index e1fc8a248..590159edd 100644
--- a/src/xrpld/app/ledger/OrderBookDB.cpp
+++ b/src/xrpld/app/ledger/OrderBookDB.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/OrderBookDB.h b/src/xrpld/app/ledger/OrderBookDB.h
index 45705a615..ce0d9f0fa 100644
--- a/src/xrpld/app/ledger/OrderBookDB.h
+++ b/src/xrpld/app/ledger/OrderBookDB.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED
 #define RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED
 
-#include <ripple/app/ledger/AcceptedLedgerTx.h>
-#include <ripple/app/ledger/BookListeners.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/MultiApiJson.h>
+#include <xrpld/app/ledger/AcceptedLedgerTx.h>
+#include <xrpld/app/ledger/BookListeners.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/MultiApiJson.h>
 
 #include <mutex>
 
diff --git a/src/xrpld/app/ledger/PendingSaves.h b/src/xrpld/app/ledger/PendingSaves.h
index f031baf4a..d296fcacc 100644
--- a/src/xrpld/app/ledger/PendingSaves.h
+++ b/src/xrpld/app/ledger/PendingSaves.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_PENDINGSAVES_H_INCLUDED
 #define RIPPLE_APP_PENDINGSAVES_H_INCLUDED
 
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/protocol/Protocol.h>
 #include <condition_variable>
 #include <map>
 #include <mutex>
diff --git a/src/xrpld/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h
index abac6da82..c7deb9e0e 100644
--- a/src/xrpld/app/ledger/TransactionMaster.h
+++ b/src/xrpld/app/ledger/TransactionMaster.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED
 
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/TransactionStateSF.cpp b/src/xrpld/app/ledger/TransactionStateSF.cpp
index f65de5f99..fac28cd2a 100644
--- a/src/xrpld/app/ledger/TransactionStateSF.cpp
+++ b/src/xrpld/app/ledger/TransactionStateSF.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/TransactionStateSF.h>
+#include <xrpld/app/ledger/TransactionStateSF.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/TransactionStateSF.h b/src/xrpld/app/ledger/TransactionStateSF.h
index 6a5fa69eb..721f18706 100644
--- a/src/xrpld/app/ledger/TransactionStateSF.h
+++ b/src/xrpld/app/ledger/TransactionStateSF.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED
 #define RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED
 
-#include <ripple/app/ledger/AbstractFetchPackContainer.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
+#include <xrpld/app/ledger/AbstractFetchPackContainer.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index 56feda066..a71143015 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/BuildLedger.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerReplay.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/CanonicalTXSet.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/ledger/BuildLedger.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/Feature.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index 402362c73..acd0e2e3a 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AccountStateSF.h>
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/TransactionStateSF.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpld/app/ledger/AccountStateSF.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/TransactionStateSF.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 
 #include <boost/iterator/function_output_iterator.hpp>
 
diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
index f88137e85..328c915c4 100644
--- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/DecayingSample.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/beast/container/aged_map.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/DecayingSample.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/beast/container/aged_map.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpl/protocol/jss.h>
 #include <exception>
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
index 7a863bce1..df43e806b 100644
--- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp
+++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/InboundTransactions.h>
-#include <ripple/app/ledger/impl/TransactionAcquire.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/resource/Fees.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/detail/TransactionAcquire.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/resource/Fees.h>
 #include <memory>
 #include <mutex>
 
diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
index bbb3c709f..d33b130ba 100644
--- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerCleaner.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerCleaner.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
index 3c19c6ee1..e079fb3ee 100644
--- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/BuildLedger.h>
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/LedgerReplay.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/LedgerDeltaAcquire.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/overlay/PeerSet.h>
+#include <xrpld/app/ledger/BuildLedger.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/LedgerDeltaAcquire.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/overlay/PeerSet.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
index 2f767cf27..b0b2c76c2 100644
--- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
+++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERDELTAACQUIRE_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERDELTAACQUIRE_H_INCLUDED
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/impl/TimeoutCounter.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/detail/TimeoutCounter.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/base_uint.h>
 
 #include <list>
 #include <map>
diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
index 88bbe68fe..23f2e862c 100644
--- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
@@ -17,41 +17,41 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/MathUtilities.h>
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/Pg.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/resource/Fees.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/MathUtilities.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/Pg.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/resource/Fees.h>
 #include <algorithm>
 #include <cassert>
 #include <chrono>
diff --git a/src/xrpld/app/ledger/detail/LedgerReplay.cpp b/src/xrpld/app/ledger/detail/LedgerReplay.cpp
index 4a917cedf..40b4f9e41 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplay.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplay.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerReplay.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
index c5301be7e..7b9d881d5 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/LedgerReplayMsgHandler.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/LedgerHeader.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/LedgerReplayMsgHandler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/LedgerHeader.h>
 
 #include <memory>
 
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h
index 169bedea0..151a21b95 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h
+++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERREPLAYMSGHANDLER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERREPLAYMSGHANDLER_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/messages.h>
 
 namespace ripple {
 class Application;
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
index 46ce9815a..d7f29e33b 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerReplayTask.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/LedgerDeltaAcquire.h>
-#include <ripple/app/ledger/impl/SkipListAcquire.h>
-#include <ripple/core/JobQueue.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerReplayTask.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/LedgerDeltaAcquire.h>
+#include <xrpld/app/ledger/detail/SkipListAcquire.h>
+#include <xrpld/core/JobQueue.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
index 903f72dd1..4aa0e4beb 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/LedgerDeltaAcquire.h>
-#include <ripple/app/ledger/impl/SkipListAcquire.h>
-#include <ripple/core/JobQueue.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/LedgerDeltaAcquire.h>
+#include <xrpld/app/ledger/detail/SkipListAcquire.h>
+#include <xrpld/core/JobQueue.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index 1310dd13a..20215caa7 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/core/Pg.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/DeliveredAmount.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpld/core/Pg.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp
index afee5e2d4..a6eb7721a 100644
--- a/src/xrpld/app/ledger/detail/LocalTxs.cpp
+++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LocalTxs.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LocalTxs.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/Indexes.h>
 
 /*
  This code prevents scenarios like the following:
diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp
index 58d2f3b9b..86ee8dc23 100644
--- a/src/xrpld/app/ledger/detail/OpenLedger.cpp
+++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/ledger/CachedView.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/ledger/CachedView.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpl/protocol/Feature.h>
 #include <boost/range/adaptor/transformed.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/detail/SkipListAcquire.cpp b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
index aa9b8564e..1d1de62b6 100644
--- a/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/impl/SkipListAcquire.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/overlay/PeerSet.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/detail/SkipListAcquire.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/overlay/PeerSet.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/SkipListAcquire.h b/src/xrpld/app/ledger/detail/SkipListAcquire.h
index df24d6831..03c8181df 100644
--- a/src/xrpld/app/ledger/detail/SkipListAcquire.h
+++ b/src/xrpld/app/ledger/detail/SkipListAcquire.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_LEDGER_SKIPLISTACQUIRE_H_INCLUDED
 #define RIPPLE_APP_LEDGER_SKIPLISTACQUIRE_H_INCLUDED
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/impl/TimeoutCounter.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#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 <queue>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
index 9ea20c063..9d677dbe5 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/impl/TimeoutCounter.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/overlay/Overlay.h>
+#include <xrpld/app/ledger/detail/TimeoutCounter.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/overlay/Overlay.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h
index 88eda551a..a354c9646 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.h
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED
 #define RIPPLE_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Job.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Job.h>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <mutex>
 
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
index 24a03a16f..b3561875e 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/ConsensusTransSetSF.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/InboundTransactions.h>
-#include <ripple/app/ledger/impl/TransactionAcquire.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/impl/ProtocolMessage.h>
+#include <xrpld/app/ledger/ConsensusTransSetSF.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/detail/TransactionAcquire.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/detail/ProtocolMessage.h>
 
 #include <memory>
 
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.h b/src/xrpld/app/ledger/detail/TransactionAcquire.h
index 3863868fa..230bce2fc 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.h
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED
 #define RIPPLE_APP_LEDGER_TRANSACTIONACQUIRE_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/overlay/PeerSet.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/overlay/PeerSet.h>
+#include <xrpld/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/ledger/detail/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
index 0301d95dc..93b00a321 100644
--- a/src/xrpld/app/ledger/detail/TransactionMaster.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/protocol/STTx.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index c9d6f3190..1de7266d1 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -17,64 +17,64 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/InboundTransactions.h>
-#include <ripple/app/ledger/LedgerCleaner.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerReplayer.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/BasicApp.h>
-#include <ripple/app/main/DBInit.h>
-#include <ripple/app/main/GRPCServer.h>
-#include <ripple/app/main/LoadManager.h>
-#include <ripple/app/main/NodeIdentity.h>
-#include <ripple/app/main/NodeStoreScheduler.h>
-#include <ripple/app/main/Tuning.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/DatagramMonitor.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/misc/ValidatorKeys.h>
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/reporting/ReportingETL.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/ResolverAsio.h>
-#include <ripple/basics/random.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/asio/io_latency_probe.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/overlay/PeerSet.h>
-#include <ripple/overlay/make_Overlay.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/ShardArchiveHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/shamap/NodeFamily.h>
-#include <ripple/shamap/ShardFamily.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/LedgerCleaner.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplayer.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/BasicApp.h>
+#include <xrpld/app/main/DBInit.h>
+#include <xrpld/app/main/GRPCServer.h>
+#include <xrpld/app/main/LoadManager.h>
+#include <xrpld/app/main/NodeIdentity.h>
+#include <xrpld/app/main/NodeStoreScheduler.h>
+#include <xrpld/app/main/Tuning.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/DatagramMonitor.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/reporting/ReportingETL.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/ResolverAsio.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/asio/io_latency_probe.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpld/overlay/PeerSet.h>
+#include <xrpld/overlay/make_Overlay.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/ShardArchiveHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/shamap/NodeFamily.h>
+#include <xrpld/shamap/ShardFamily.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/steady_timer.hpp>
diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h
index 38cbe3f48..ac0c6a811 100644
--- a/src/xrpld/app/main/Application.h
+++ b/src/xrpld/app/main/Application.h
@@ -19,13 +19,13 @@
 
 #ifndef RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED
 #define RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/core/Config.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/shamap/FullBelowCache.h>
-#include <ripple/shamap/TreeNodeCache.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpld/shamap/FullBelowCache.h>
+#include <xrpld/shamap/TreeNodeCache.h>
 #include <boost/asio.hpp>
 #include <boost/program_options.hpp>
 #include <memory>
diff --git a/src/xrpld/app/main/BasicApp.cpp b/src/xrpld/app/main/BasicApp.cpp
index 5993df62f..504309d08 100644
--- a/src/xrpld/app/main/BasicApp.cpp
+++ b/src/xrpld/app/main/BasicApp.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/BasicApp.h>
-#include <ripple/beast/core/CurrentThreadName.h>
+#include <xrpld/app/main/BasicApp.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
 
 BasicApp::BasicApp(std::size_t numberOfThreads)
 {
diff --git a/src/xrpld/app/main/CollectorManager.cpp b/src/xrpld/app/main/CollectorManager.cpp
index 6e6d0f47f..ae7ff965f 100644
--- a/src/xrpld/app/main/CollectorManager.cpp
+++ b/src/xrpld/app/main/CollectorManager.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/CollectorManager.h>
+#include <xrpld/app/main/CollectorManager.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/main/CollectorManager.h b/src/xrpld/app/main/CollectorManager.h
index 46e113082..0bb3ae65c 100644
--- a/src/xrpld/app/main/CollectorManager.h
+++ b/src/xrpld/app/main/CollectorManager.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED
 #define RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/beast/insight/Insight.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/beast/insight/Insight.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index a535a4a1a..3d7580563 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/GRPCServer.h>
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/resource/Fees.h>
+#include <xrpld/app/main/GRPCServer.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/resource/Fees.h>
 
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/core/ConfigSections.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpld/core/ConfigSections.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h
index 79780e101..e62873732 100644
--- a/src/xrpld/app/main/GRPCServer.h
+++ b/src/xrpld/app/main/GRPCServer.h
@@ -20,19 +20,19 @@
 #ifndef RIPPLE_CORE_GRPCSERVER_H_INCLUDED
 #define RIPPLE_CORE_GRPCSERVER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/resource/Charge.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/Handler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/Handler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
-#include "org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h"
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <grpcpp/grpcpp.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp
index 5e87063f0..f5dd87194 100644
--- a/src/xrpld/app/main/LoadManager.cpp
+++ b/src/xrpld/app/main/LoadManager.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/LoadManager.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/json/to_string.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/LoadManager.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/json/to_string.h>
 #include <memory>
 #include <mutex>
 #include <thread>
diff --git a/src/xrpld/app/main/LoadManager.h b/src/xrpld/app/main/LoadManager.h
index 905006f5e..f818068dc 100644
--- a/src/xrpld/app/main/LoadManager.h
+++ b/src/xrpld/app/main/LoadManager.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED
 #define RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <atomic>
 #include <condition_variable>
 #include <memory>
diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp
index 8516393b7..7844c6ed5 100644
--- a/src/xrpld/app/main/Main.cpp
+++ b/src/xrpld/app/main/Main.cpp
@@ -16,25 +16,25 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/DBInit.h>
-#include <ripple/app/rdb/Vacuum.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/clock/basic_seconds_clock.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/RPCHandler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/DBInit.h>
+#include <xrpld/app/rdb/Vacuum.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/clock/basic_seconds_clock.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/RPCHandler.h>
 
 #ifdef ENABLE_TESTS
-#include <ripple/beast/unit_test/match.h>
+#include <xrpl/beast/unit_test/match.h>
 #include <test/unit_test/multi_runner.h>
 #endif  // ENABLE_TESTS
 
diff --git a/src/xrpld/app/main/NodeIdentity.cpp b/src/xrpld/app/main/NodeIdentity.cpp
index e66b9e840..e0b83d54c 100644
--- a/src/xrpld/app/main/NodeIdentity.cpp
+++ b/src/xrpld/app/main/NodeIdentity.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/NodeIdentity.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/NodeIdentity.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/main/NodeIdentity.h b/src/xrpld/app/main/NodeIdentity.h
index b82b3657a..b4da86519 100644
--- a/src/xrpld/app/main/NodeIdentity.h
+++ b/src/xrpld/app/main/NodeIdentity.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_MAIN_NODEIDENTITY_H_INCLUDED
 #define RIPPLE_APP_MAIN_NODEIDENTITY_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
 #include <boost/program_options.hpp>
 #include <utility>
 
diff --git a/src/xrpld/app/main/NodeStoreScheduler.cpp b/src/xrpld/app/main/NodeStoreScheduler.cpp
index 0ac890964..bf07e559f 100644
--- a/src/xrpld/app/main/NodeStoreScheduler.cpp
+++ b/src/xrpld/app/main/NodeStoreScheduler.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/NodeStoreScheduler.h>
+#include <xrpld/app/main/NodeStoreScheduler.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/app/main/NodeStoreScheduler.h b/src/xrpld/app/main/NodeStoreScheduler.h
index 5c68dc24f..b16142b26 100644
--- a/src/xrpld/app/main/NodeStoreScheduler.h
+++ b/src/xrpld/app/main/NodeStoreScheduler.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED
 #define RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED
 
-#include <ripple/core/JobQueue.h>
-#include <ripple/nodestore/Scheduler.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/nodestore/Scheduler.h>
 #include <atomic>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/AMMHelpers.h b/src/xrpld/app/misc/AMMHelpers.h
index 787bb2300..8bf5a5c5f 100644
--- a/src/xrpld/app/misc/AMMHelpers.h
+++ b/src/xrpld/app/misc/AMMHelpers.h
@@ -20,18 +20,18 @@
 #ifndef RIPPLE_APP_MISC_AMMHELPERS_H_INCLUDED
 #define RIPPLE_APP_MISC_AMMHELPERS_H_INCLUDED
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Number.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
 
 #include <type_traits>
 
diff --git a/src/xrpld/app/misc/AMMUtils.h b/src/xrpld/app/misc/AMMUtils.h
index 9cd4b7d6f..cbf29c7dd 100644
--- a/src/xrpld/app/misc/AMMUtils.h
+++ b/src/xrpld/app/misc/AMMUtils.h
@@ -19,12 +19,12 @@
 #ifndef RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED
 #define RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED
 
-#include <ripple/basics/Expected.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/TER.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/AmendmentTable.h b/src/xrpld/app/misc/AmendmentTable.h
index fef13d50d..538d7299f 100644
--- a/src/xrpld/app/misc/AmendmentTable.h
+++ b/src/xrpld/app/misc/AmendmentTable.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED
 #define RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STValidation.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STValidation.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/misc/CanonicalTXSet.cpp b/src/xrpld/app/misc/CanonicalTXSet.cpp
index a9fcd17f0..bb89b5989 100644
--- a/src/xrpld/app/misc/CanonicalTXSet.cpp
+++ b/src/xrpld/app/misc/CanonicalTXSet.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/CanonicalTXSet.h>
+#include <xrpld/app/misc/CanonicalTXSet.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/CanonicalTXSet.h b/src/xrpld/app/misc/CanonicalTXSet.h
index 3ca217944..b061ff10d 100644
--- a/src/xrpld/app/misc/CanonicalTXSet.h
+++ b/src/xrpld/app/misc/CanonicalTXSet.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED
 #define RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/SeqProxy.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/SeqProxy.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/DatagramMonitor.h b/src/xrpld/app/misc/DatagramMonitor.h
index bf78f97c6..ccdc47f1f 100644
--- a/src/xrpld/app/misc/DatagramMonitor.h
+++ b/src/xrpld/app/misc/DatagramMonitor.h
@@ -2,24 +2,24 @@
 #ifndef RIPPLE_APP_MAIN_DATAGRAMMONITOR_H_INCLUDED
 #define RIPPLE_APP_MAIN_DATAGRAMMONITOR_H_INCLUDED
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/basics/mulDiv.h>
-#include <ripple/ledger/CachedSLEs.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/shamap/ShardFamily.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpld/ledger/CachedSLEs.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/shamap/ShardFamily.h>
 #include <arpa/inet.h>
 #include <array>
 #include <atomic>
diff --git a/src/xrpld/app/misc/DeliverMax.h b/src/xrpld/app/misc/DeliverMax.h
index ddc20bdd7..3bc875ee4 100644
--- a/src/xrpld/app/misc/DeliverMax.h
+++ b/src/xrpld/app/misc/DeliverMax.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_MISC_DELIVERMAX_H_INCLUDED
 #define RIPPLE_APP_MISC_DELIVERMAX_H_INCLUDED
 
-#include <ripple/protocol/TxFormats.h>
+#include <xrpl/protocol/TxFormats.h>
 
 #include <functional>
 #include <memory>
diff --git a/src/xrpld/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h
index a90f82efb..9791c73ef 100644
--- a/src/xrpld/app/misc/FeeVote.h
+++ b/src/xrpld/app/misc/FeeVote.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED
 #define RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpld/shamap/SHAMap.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp
index 0d60dc6b7..af57314ef 100644
--- a/src/xrpld/app/misc/FeeVoteImpl.cpp
+++ b/src/xrpld/app/misc/FeeVoteImpl.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/FeeVote.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/FeeVote.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/HashRouter.cpp b/src/xrpld/app/misc/HashRouter.cpp
index 8085d6892..c117d20fe 100644
--- a/src/xrpld/app/misc/HashRouter.cpp
+++ b/src/xrpld/app/misc/HashRouter.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/HashRouter.h>
+#include <xrpld/app/misc/HashRouter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/HashRouter.h b/src/xrpld/app/misc/HashRouter.h
index 4bc9d3174..ced7f8d1d 100644
--- a/src/xrpld/app/misc/HashRouter.h
+++ b/src/xrpld/app/misc/HashRouter.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_MISC_HASHROUTER_H_INCLUDED
 #define RIPPLE_APP_MISC_HASHROUTER_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/container/aged_unordered_map.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/container/aged_unordered_map.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/misc/LoadFeeTrack.h b/src/xrpld/app/misc/LoadFeeTrack.h
index d670c0b7e..6c37864e2 100644
--- a/src/xrpld/app/misc/LoadFeeTrack.h
+++ b/src/xrpld/app/misc/LoadFeeTrack.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_CORE_LOADFEETRACK_H_INCLUDED
 #define RIPPLE_CORE_LOADFEETRACK_H_INCLUDED
 
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Log.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/json/json_value.h>
 #include <algorithm>
 #include <cstdint>
 #include <mutex>
diff --git a/src/xrpld/app/misc/Manifest.h b/src/xrpld/app/misc/Manifest.h
index b1cb5d2f3..1b53fda77 100644
--- a/src/xrpld/app/misc/Manifest.h
+++ b/src/xrpld/app/misc/Manifest.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_MISC_MANIFEST_H_INCLUDED
 #define RIPPLE_APP_MISC_MANIFEST_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
 
 #include <optional>
 #include <shared_mutex>
diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp
index aa76cc830..0fc1c8f9d 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.cpp
+++ b/src/xrpld/app/misc/NegativeUNLVote.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NegativeUNLVote.h>
-#include <ripple/json/to_string.h>
-#include <ripple/shamap/SHAMapItem.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NegativeUNLVote.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/shamap/SHAMapItem.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h
index 3b18baf59..cb60d7307 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.h
+++ b/src/xrpld/app/misc/NegativeUNLVote.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_MISC_NEGATIVEUNLVOTE_H_INCLUDED
 #define RIPPLE_APP_MISC_NEGATIVEUNLVOTE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/UintTypes.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index 9dcf7baa7..938d27654 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -17,61 +17,61 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLConsensus.h>
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/LocalTxs.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/LoadManager.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/StateAccounting.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/misc/ValidatorKeys.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/misc/impl/AccountTxPaging.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/app/reporting/ReportingETL.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/basics/mulDiv.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/consensus/Consensus.h>
-#include <ripple/consensus/ConsensusParms.h>
-#include <ripple/crypto/RFC1751.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/json/to_string.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/protocol/BuildInfo.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/MultiApiJson.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/rpc/BookChanges.h>
-#include <ripple/rpc/CTID.h>
-#include <ripple/rpc/DeliveredAmount.h>
-#include <ripple/rpc/ServerHandler.h>
-#include <ripple/rpc/impl/UDPInfoSub.h>
+#include <xrpld/app/consensus/RCLConsensus.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/LocalTxs.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/LoadManager.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/StateAccounting.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/misc/detail/AccountTxPaging.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/app/reporting/ReportingETL.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpld/consensus/Consensus.h>
+#include <xrpld/consensus/ConsensusParms.h>
+#include <xrpl/crypto/RFC1751.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpl/protocol/BuildInfo.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/MultiApiJson.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpld/rpc/BookChanges.h>
+#include <xrpld/rpc/CTID.h>
+#include <xrpld/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/ServerHandler.h>
+#include <xrpld/rpc/detail/UDPInfoSub.h>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <exception>
diff --git a/src/xrpld/app/misc/NetworkOPs.h b/src/xrpld/app/misc/NetworkOPs.h
index 350542404..7679067fd 100644
--- a/src/xrpld/app/misc/NetworkOPs.h
+++ b/src/xrpld/app/misc/NetworkOPs.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED
 #define RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED
 
-#include <ripple/app/consensus/RCLConsensus.h>
-#include <ripple/app/consensus/RCLCxPeerPos.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/StateAccounting.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/messages.h>
+#include <xrpld/app/consensus/RCLConsensus.h>
+#include <xrpld/app/consensus/RCLCxPeerPos.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/StateAccounting.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/messages.h>
 #include <boost/asio.hpp>
 #include <deque>
 #include <memory>
diff --git a/src/xrpld/app/misc/SHAMapStore.h b/src/xrpld/app/misc/SHAMapStore.h
index c42e5f5a5..d8415713a 100644
--- a/src/xrpld/app/misc/SHAMapStore.h
+++ b/src/xrpld/app/misc/SHAMapStore.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED
 #define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/protocol/ErrorCodes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpl/protocol/ErrorCodes.h>
 #include <optional>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index acfa41122..7fe774d40 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/SHAMapStoreImp.h>
+#include <xrpld/app/misc/SHAMapStoreImp.h>
 
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/rdb/State.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/core/Pg.h>
-#include <ripple/nodestore/Scheduler.h>
-#include <ripple/nodestore/impl/DatabaseRotatingImp.h>
-#include <ripple/shamap/SHAMapMissingNode.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/rdb/State.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/core/Pg.h>
+#include <xrpld/nodestore/Scheduler.h>
+#include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
+#include <xrpld/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 995ee0267..7d36f092b 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.h
+++ b/src/xrpld/app/misc/SHAMapStoreImp.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED
 #define RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/State.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/nodestore/DatabaseRotating.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/State.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/nodestore/DatabaseRotating.h>
 
-#include <ripple/nodestore/Scheduler.h>
+#include <xrpld/nodestore/Scheduler.h>
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
diff --git a/src/xrpld/app/misc/StateAccounting.cpp b/src/xrpld/app/misc/StateAccounting.cpp
index ade601a80..93cec741d 100644
--- a/src/xrpld/app/misc/StateAccounting.cpp
+++ b/src/xrpld/app/misc/StateAccounting.cpp
@@ -1,4 +1,4 @@
-#include <ripple/app/misc/StateAccounting.h>
+#include <xrpld/app/misc/StateAccounting.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/StateAccounting.h b/src/xrpld/app/misc/StateAccounting.h
index 3cbc5cc73..c120e2bd1 100644
--- a/src/xrpld/app/misc/StateAccounting.h
+++ b/src/xrpld/app/misc/StateAccounting.h
@@ -1,10 +1,10 @@
 #ifndef RIPPLE_APP_MAIN_STATEACCOUNTING_H_INCLUDED
 #define RIPPLE_APP_MAIN_STATEACCOUNTING_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
 #include <array>
 #include <mutex>
 
diff --git a/src/xrpld/app/misc/Transaction.h b/src/xrpld/app/misc/Transaction.h
index 0de9562cd..4a338239a 100644
--- a/src/xrpld/app/misc/Transaction.h
+++ b/src/xrpld/app/misc/Transaction.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED
 #define RIPPLE_APP_MISC_TRANSACTION_H_INCLUDED
 
-#include <ripple/basics/RangeSet.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxMeta.h>
 
 #include <optional>
 #include <variant>
diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h
index fc78fafd1..5820cbd1c 100644
--- a/src/xrpld/app/misc/TxQ.h
+++ b/src/xrpld/app/misc/TxQ.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_TXQ_H_INCLUDED
 #define RIPPLE_TXQ_H_INCLUDED
 
-#include <ripple/app/tx/applySteps.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/OpenView.h>
-#include <ripple/protocol/RippleLedgerHash.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/SeqProxy.h>
-#include <ripple/protocol/TER.h>
+#include <xrpld/app/tx/applySteps.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/SeqProxy.h>
+#include <xrpl/protocol/TER.h>
 #include <boost/circular_buffer.hpp>
 #include <boost/intrusive/set.hpp>
 #include <optional>
diff --git a/src/xrpld/app/misc/ValidatorKeys.h b/src/xrpld/app/misc/ValidatorKeys.h
index a6b538417..f5b9e5735 100644
--- a/src/xrpld/app/misc/ValidatorKeys.h
+++ b/src/xrpld/app/misc/ValidatorKeys.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED
 #define RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <string>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h
index 4d792b36b..60cd689c0 100644
--- a/src/xrpld/app/misc/ValidatorList.h
+++ b/src/xrpld/app/misc/ValidatorList.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_MISC_VALIDATORLIST_H_INCLUDED
 #define RIPPLE_APP_MISC_VALIDATORLIST_H_INCLUDED
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/json/json_value.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpl/protocol/PublicKey.h>
 #include <boost/iterator/counting_iterator.hpp>
 #include <boost/range/adaptors.hpp>
 #include <boost/thread/shared_mutex.hpp>
diff --git a/src/xrpld/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h
index 57606066b..e51a85b4a 100644
--- a/src/xrpld/app/misc/ValidatorSite.h
+++ b/src/xrpld/app/misc/ValidatorSite.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_APP_MISC_VALIDATORSITE_H_INCLUDED
 #define RIPPLE_APP_MISC_VALIDATORSITE_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/misc/detail/Work.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/json_value.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/misc/detail/Work.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/json_value.h>
 
 #include <boost/asio.hpp>
 
diff --git a/src/xrpld/app/misc/detail/AMMHelpers.cpp b/src/xrpld/app/misc/detail/AMMHelpers.cpp
index 5ad59ea1c..f10b4c15e 100644
--- a/src/xrpld/app/misc/detail/AMMHelpers.cpp
+++ b/src/xrpld/app/misc/detail/AMMHelpers.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/detail/AMMUtils.cpp b/src/xrpld/app/misc/detail/AMMUtils.cpp
index 4f6f0fbd3..9d94d9522 100644
--- a/src/xrpld/app/misc/detail/AMMUtils.cpp
+++ b/src/xrpld/app/misc/detail/AMMUtils.cpp
@@ -16,12 +16,12 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STObject.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STObject.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/detail/AccountTxPaging.cpp b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
index 1babbc7ce..9b19256e4 100644
--- a/src/xrpld/app/misc/detail/AccountTxPaging.cpp
+++ b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/impl/AccountTxPaging.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/detail/AccountTxPaging.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <boost/format.hpp>
 #include <memory>
 
diff --git a/src/xrpld/app/misc/detail/AccountTxPaging.h b/src/xrpld/app/misc/detail/AccountTxPaging.h
index 6b8f235b5..23a5cbd9c 100644
--- a/src/xrpld/app/misc/detail/AccountTxPaging.h
+++ b/src/xrpld/app/misc/detail/AccountTxPaging.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_MISC_IMPL_ACCOUNTTXPAGING_H_INCLUDED
 #define RIPPLE_APP_MISC_IMPL_ACCOUNTTXPAGING_H_INCLUDED
 
-#include <ripple/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
 #include <cstdint>
 #include <string>
 #include <utility>
diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index 8f9556e07..62b808908 100644
--- a/src/xrpld/app/misc/detail/AmendmentTable.cpp
+++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
 #include <boost/format.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
diff --git a/src/xrpld/app/misc/detail/DeliverMax.cpp b/src/xrpld/app/misc/detail/DeliverMax.cpp
index 810b750a3..58a235997 100644
--- a/src/xrpld/app/misc/detail/DeliverMax.cpp
+++ b/src/xrpld/app/misc/detail/DeliverMax.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/DeliverMax.h>
 
-#include <ripple/protocol/jss.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
index 86d145c85..62975fad7 100644
--- a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
+++ b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/jss.h>
 
 #include <cstdint>
 #include <numeric>
diff --git a/src/xrpld/app/misc/detail/Manifest.cpp b/src/xrpld/app/misc/detail/Manifest.cpp
index 2916d6d2f..fef03fcc4 100644
--- a/src/xrpld/app/misc/detail/Manifest.cpp
+++ b/src/xrpld/app/misc/detail/Manifest.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/Sign.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Sign.h>
 
 #include <boost/algorithm/string/trim.hpp>
 
diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp
index 99ebac618..9e8e306ea 100644
--- a/src/xrpld/app/misc/detail/Transaction.cpp
+++ b/src/xrpld/app/misc/detail/Transaction.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/Pg.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/CTID.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/Pg.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/CTID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index ba864b8e7..5441144d2 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/mulDiv.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/st.h>
 #include <algorithm>
 #include <limits>
 #include <numeric>
diff --git a/src/xrpld/app/misc/detail/ValidatorKeys.cpp b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
index 8da1992a2..2e05d1dbe 100644
--- a/src/xrpld/app/misc/detail/ValidatorKeys.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/ValidatorKeys.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/base64.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base64.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
 
 namespace ripple {
 ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j)
diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp
index 13dcd7873..daf46417a 100644
--- a/src/xrpld/app/misc/detail/ValidatorList.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorList.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/basics/FileUtilities.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/messages.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/basics/FileUtilities.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/messages.h>
 #include <boost/regex.hpp>
 
 #include <cmath>
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index 013d7e96f..0c12816c1 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/app/misc/detail/WorkFile.h>
-#include <ripple/app/misc/detail/WorkPlain.h>
-#include <ripple/app/misc/detail/WorkSSL.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpld/app/misc/detail/WorkFile.h>
+#include <xrpld/app/misc/detail/WorkPlain.h>
+#include <xrpld/app/misc/detail/WorkSSL.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/detail/WorkBase.h b/src/xrpld/app/misc/detail/WorkBase.h
index 4b2c88f71..d7795af8b 100644
--- a/src/xrpld/app/misc/detail/WorkBase.h
+++ b/src/xrpld/app/misc/detail/WorkBase.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_MISC_DETAIL_WORKBASE_H_INCLUDED
 #define RIPPLE_APP_MISC_DETAIL_WORKBASE_H_INCLUDED
 
-#include <ripple/app/misc/detail/Work.h>
-#include <ripple/basics/random.h>
-#include <ripple/protocol/BuildInfo.h>
+#include <xrpld/app/misc/detail/Work.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/protocol/BuildInfo.h>
 
 #include <boost/asio.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
diff --git a/src/xrpld/app/misc/detail/WorkFile.h b/src/xrpld/app/misc/detail/WorkFile.h
index 2dc451fea..266e5098c 100644
--- a/src/xrpld/app/misc/detail/WorkFile.h
+++ b/src/xrpld/app/misc/detail/WorkFile.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_MISC_DETAIL_WORKFILE_H_INCLUDED
 #define RIPPLE_APP_MISC_DETAIL_WORKFILE_H_INCLUDED
 
-#include <ripple/app/misc/detail/Work.h>
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/FileUtilities.h>
+#include <xrpld/app/misc/detail/Work.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/FileUtilities.h>
 #include <cassert>
 #include <cerrno>
 
diff --git a/src/xrpld/app/misc/detail/WorkPlain.h b/src/xrpld/app/misc/detail/WorkPlain.h
index e70d327c2..16bf42413 100644
--- a/src/xrpld/app/misc/detail/WorkPlain.h
+++ b/src/xrpld/app/misc/detail/WorkPlain.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_MISC_DETAIL_WORKPLAIN_H_INCLUDED
 #define RIPPLE_APP_MISC_DETAIL_WORKPLAIN_H_INCLUDED
 
-#include <ripple/app/misc/detail/WorkBase.h>
+#include <xrpld/app/misc/detail/WorkBase.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/detail/WorkSSL.h b/src/xrpld/app/misc/detail/WorkSSL.h
index c7e3de614..388c10a08 100644
--- a/src/xrpld/app/misc/detail/WorkSSL.h
+++ b/src/xrpld/app/misc/detail/WorkSSL.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_MISC_DETAIL_WORKSSL_H_INCLUDED
 #define RIPPLE_APP_MISC_DETAIL_WORKSSL_H_INCLUDED
 
-#include <ripple/app/misc/detail/WorkBase.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/net/HTTPClientSSLContext.h>
+#include <xrpld/app/misc/detail/WorkBase.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/net/HTTPClientSSLContext.h>
 #include <boost/asio/ssl.hpp>
 #include <boost/format.hpp>
 
diff --git a/src/xrpld/app/misc/detail/detail/WorkSSL.cpp b/src/xrpld/app/misc/detail/detail/WorkSSL.cpp
index 78a269e67..0285f4350 100644
--- a/src/xrpld/app/misc/detail/detail/WorkSSL.cpp
+++ b/src/xrpld/app/misc/detail/detail/WorkSSL.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/detail/WorkSSL.h>
+#include <xrpld/app/misc/detail/WorkSSL.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/app/paths/AMMContext.h b/src/xrpld/app/paths/AMMContext.h
index 06835189b..f744b8a6c 100644
--- a/src/xrpld/app/paths/AMMContext.h
+++ b/src/xrpld/app/paths/AMMContext.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_PATHS_AMMCONTEXT_H_INCLUDED
 #define RIPPLE_APP_PATHS_AMMCONTEXT_H_INCLUDED
 
-#include <ripple/protocol/AccountID.h>
+#include <xrpl/protocol/AccountID.h>
 
 #include <cstdint>
 
diff --git a/src/xrpld/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h
index 60155dbf1..380158d62 100644
--- a/src/xrpld/app/paths/AMMLiquidity.h
+++ b/src/xrpld/app/paths/AMMLiquidity.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED
 #define RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/AMMOffer.h b/src/xrpld/app/paths/AMMOffer.h
index e47a5613b..e90a5b861 100644
--- a/src/xrpld/app/paths/AMMOffer.h
+++ b/src/xrpld/app/paths/AMMOffer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_AMMOFFER_H_INCLUDED
 #define RIPPLE_APP_AMMOFFER_H_INCLUDED
 
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TER.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TER.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/AccountCurrencies.cpp b/src/xrpld/app/paths/AccountCurrencies.cpp
index 18452725b..8646b4693 100644
--- a/src/xrpld/app/paths/AccountCurrencies.cpp
+++ b/src/xrpld/app/paths/AccountCurrencies.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/AccountCurrencies.h>
+#include <xrpld/app/paths/AccountCurrencies.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/AccountCurrencies.h b/src/xrpld/app/paths/AccountCurrencies.h
index fa70ec2a0..26282e742 100644
--- a/src/xrpld/app/paths/AccountCurrencies.h
+++ b/src/xrpld/app/paths/AccountCurrencies.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED
 #define RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED
 
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/Credit.cpp b/src/xrpld/app/paths/Credit.cpp
index b9b19d29f..c11f628a1 100644
--- a/src/xrpld/app/paths/Credit.cpp
+++ b/src/xrpld/app/paths/Credit.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/AmountConversions.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/Credit.h b/src/xrpld/app/paths/Credit.h
index dea9cbcde..3eeacceee 100644
--- a/src/xrpld/app/paths/Credit.h
+++ b/src/xrpld/app/paths/Credit.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_PATHS_CREDIT_H_INCLUDED
 #define RIPPLE_APP_PATHS_CREDIT_H_INCLUDED
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/Flow.cpp b/src/xrpld/app/paths/Flow.cpp
index 682025bb4..4a7ee71d8 100644
--- a/src/xrpld/app/paths/Flow.cpp
+++ b/src/xrpld/app/paths/Flow.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/Credit.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/app/paths/impl/StrandFlow.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/Credit.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpld/app/paths/detail/StrandFlow.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/paths/Flow.h b/src/xrpld/app/paths/Flow.h
index deafd1c77..5390394b7 100644
--- a/src/xrpld/app/paths/Flow.h
+++ b/src/xrpld/app/paths/Flow.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_PATHS_FLOW_H_INCLUDED
 #define RIPPLE_APP_PATHS_FLOW_H_INCLUDED
 
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/protocol/Quality.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/PathRequest.cpp b/src/xrpld/app/paths/PathRequest.cpp
index 519c9b2a5..d4e4c780d 100644
--- a/src/xrpld/app/paths/PathRequest.cpp
+++ b/src/xrpld/app/paths/PathRequest.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/paths/AccountCurrencies.h>
-#include <ripple/app/paths/PathRequest.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/paths/impl/PathfinderUtils.h>
-#include <ripple/basics/Log.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/paths/AccountCurrencies.h>
+#include <xrpld/app/paths/PathRequest.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/paths/detail/PathfinderUtils.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/UintTypes.h>
 
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <optional>
 
 #include <tuple>
diff --git a/src/xrpld/app/paths/PathRequest.h b/src/xrpld/app/paths/PathRequest.h
index 70c286d6e..804235eeb 100644
--- a/src/xrpld/app/paths/PathRequest.h
+++ b/src/xrpld/app/paths/PathRequest.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED
 #define RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/paths/Pathfinder.h>
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/json/json_value.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/paths/Pathfinder.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <map>
 #include <mutex>
 #include <optional>
diff --git a/src/xrpld/app/paths/PathRequests.cpp b/src/xrpld/app/paths/PathRequests.cpp
index 700cf1372..6b80bf368 100644
--- a/src/xrpld/app/paths/PathRequests.cpp
+++ b/src/xrpld/app/paths/PathRequests.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/xrpld/app/paths/PathRequests.h b/src/xrpld/app/paths/PathRequests.h
index db683ee4c..670790518 100644
--- a/src/xrpld/app/paths/PathRequests.h
+++ b/src/xrpld/app/paths/PathRequests.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED
 #define RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/PathRequest.h>
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/core/Job.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/PathRequest.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpld/core/Job.h>
 #include <atomic>
 #include <mutex>
 #include <vector>
diff --git a/src/xrpld/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp
index c529aac7c..6e9f909c8 100644
--- a/src/xrpld/app/paths/Pathfinder.cpp
+++ b/src/xrpld/app/paths/Pathfinder.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/Pathfinder.h>
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/app/paths/impl/PathfinderUtils.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/join.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/PaymentSandbox.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/Pathfinder.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpld/app/paths/detail/PathfinderUtils.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/join.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/ledger/PaymentSandbox.h>
 
 #include <tuple>
 
diff --git a/src/xrpld/app/paths/Pathfinder.h b/src/xrpld/app/paths/Pathfinder.h
index 375e5e246..73d6556a8 100644
--- a/src/xrpld/app/paths/Pathfinder.h
+++ b/src/xrpld/app/paths/Pathfinder.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED
 #define RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/core/LoadEvent.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STPathSet.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpld/core/LoadEvent.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STPathSet.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/RippleCalc.cpp b/src/xrpld/app/paths/RippleCalc.cpp
index 87ef694fa..6ea24cdb1 100644
--- a/src/xrpld/app/paths/RippleCalc.cpp
+++ b/src/xrpld/app/paths/RippleCalc.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/paths/impl/FlowDebugInfo.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/paths/detail/FlowDebugInfo.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
 
 namespace ripple {
 namespace path {
diff --git a/src/xrpld/app/paths/RippleCalc.h b/src/xrpld/app/paths/RippleCalc.h
index fd9ff5981..1d91b02ac 100644
--- a/src/xrpld/app/paths/RippleCalc.h
+++ b/src/xrpld/app/paths/RippleCalc.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED
 #define RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/TER.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/paths/RippleLineCache.cpp b/src/xrpld/app/paths/RippleLineCache.cpp
index 2487924ff..0ff967c08 100644
--- a/src/xrpld/app/paths/RippleLineCache.cpp
+++ b/src/xrpld/app/paths/RippleLineCache.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/RippleLineCache.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/ledger/OpenView.h>
+#include <xrpld/app/paths/RippleLineCache.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/ledger/OpenView.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/RippleLineCache.h b/src/xrpld/app/paths/RippleLineCache.h
index 590c50082..cde1d589f 100644
--- a/src/xrpld/app/paths/RippleLineCache.h
+++ b/src/xrpld/app/paths/RippleLineCache.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED
 #define RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/hardened_hash.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/hardened_hash.h>
 
 #include <cstddef>
 #include <memory>
diff --git a/src/xrpld/app/paths/TrustLine.cpp b/src/xrpld/app/paths/TrustLine.cpp
index 2d7e5b241..c23c433a9 100644
--- a/src/xrpld/app/paths/TrustLine.cpp
+++ b/src/xrpld/app/paths/TrustLine.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpl/protocol/STAmount.h>
 #include <cstdint>
 #include <memory>
 
diff --git a/src/xrpld/app/paths/TrustLine.h b/src/xrpld/app/paths/TrustLine.h
index 6d7fcd66f..749786a06 100644
--- a/src/xrpld/app/paths/TrustLine.h
+++ b/src/xrpld/app/paths/TrustLine.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED
 #define RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/src/xrpld/app/paths/detail/AMMLiquidity.cpp b/src/xrpld/app/paths/detail/AMMLiquidity.cpp
index 9ec23d08a..8215cdee5 100644
--- a/src/xrpld/app/paths/detail/AMMLiquidity.cpp
+++ b/src/xrpld/app/paths/detail/AMMLiquidity.cpp
@@ -16,9 +16,9 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/paths/AMMLiquidity.h>
+#include <xrpld/app/paths/AMMLiquidity.h>
 
-#include <ripple/app/paths/AMMOffer.h>
+#include <xrpld/app/paths/AMMOffer.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/detail/AMMOffer.cpp b/src/xrpld/app/paths/detail/AMMOffer.cpp
index bf85ead61..16ea8628f 100644
--- a/src/xrpld/app/paths/detail/AMMOffer.cpp
+++ b/src/xrpld/app/paths/detail/AMMOffer.cpp
@@ -16,10 +16,10 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================/
-#include <ripple/app/paths/AMMOffer.h>
+#include <xrpld/app/paths/AMMOffer.h>
 
-#include <ripple/app/paths/AMMLiquidity.h>
-#include <ripple/protocol/QualityFunction.h>
+#include <xrpld/app/paths/AMMLiquidity.h>
+#include <xrpl/protocol/QualityFunction.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/detail/AmountSpec.h b/src/xrpld/app/paths/detail/AmountSpec.h
index ca814c7b3..8a1117f99 100644
--- a/src/xrpld/app/paths/detail/AmountSpec.h
+++ b/src/xrpld/app/paths/detail/AmountSpec.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED
 #define RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED
 
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/protocol/STAmount.h>
 
 #include <optional>
 
diff --git a/src/xrpld/app/paths/detail/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp
index e8dd3329c..3403ecc28 100644
--- a/src/xrpld/app/paths/detail/BookStep.cpp
+++ b/src/xrpld/app/paths/detail/BookStep.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/app/paths/AMMLiquidity.h>
-#include <ripple/app/paths/AMMOffer.h>
-#include <ripple/app/paths/impl/FlatSets.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/app/tx/impl/OfferStream.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/Book.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/app/paths/AMMLiquidity.h>
+#include <xrpld/app/paths/AMMOffer.h>
+#include <xrpld/app/paths/detail/FlatSets.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpld/app/tx/detail/OfferStream.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/paths/detail/DirectStep.cpp b/src/xrpld/app/paths/detail/DirectStep.cpp
index d4a618a04..8b61153d1 100644
--- a/src/xrpld/app/paths/detail/DirectStep.cpp
+++ b/src/xrpld/app/paths/detail/DirectStep.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Credit.h>
-#include <ripple/app/paths/impl/StepChecks.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/paths/Credit.h>
+#include <xrpld/app/paths/detail/StepChecks.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/paths/detail/FlowDebugInfo.h b/src/xrpld/app/paths/detail/FlowDebugInfo.h
index 2d1728b5f..6260b282a 100644
--- a/src/xrpld/app/paths/detail/FlowDebugInfo.h
+++ b/src/xrpld/app/paths/detail/FlowDebugInfo.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED
 #define RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED
 
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/ledger/PaymentSandbox.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpld/ledger/PaymentSandbox.h>
 
 #include <boost/container/flat_map.hpp>
 
diff --git a/src/xrpld/app/paths/detail/PathfinderUtils.h b/src/xrpld/app/paths/detail/PathfinderUtils.h
index 066d905a1..b06dded75 100644
--- a/src/xrpld/app/paths/detail/PathfinderUtils.h
+++ b/src/xrpld/app/paths/detail/PathfinderUtils.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PATH_IMPL_PATHFINDERUTILS_H_INCLUDED
 #define RIPPLE_PATH_IMPL_PATHFINDERUTILS_H_INCLUDED
 
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/detail/PaySteps.cpp b/src/xrpld/app/paths/detail/PaySteps.cpp
index acb93857b..7c1cb1569 100644
--- a/src/xrpld/app/paths/detail/PaySteps.cpp
+++ b/src/xrpld/app/paths/detail/PaySteps.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/Feature.h>
 
 #include <algorithm>
 #include <numeric>
diff --git a/src/xrpld/app/paths/detail/StepChecks.h b/src/xrpld/app/paths/detail/StepChecks.h
index 9d8664a8d..a02a948c1 100644
--- a/src/xrpld/app/paths/detail/StepChecks.h
+++ b/src/xrpld/app/paths/detail/StepChecks.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED
 #define RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/paths/detail/Steps.h b/src/xrpld/app/paths/detail/Steps.h
index 2a4bfe310..dee90f617 100644
--- a/src/xrpld/app/paths/detail/Steps.h
+++ b/src/xrpld/app/paths/detail/Steps.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED
 #define RIPPLE_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED
 
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/QualityFunction.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/TER.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/QualityFunction.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/TER.h>
 
 #include <boost/container/flat_set.hpp>
 #include <optional>
diff --git a/src/xrpld/app/paths/detail/StrandFlow.h b/src/xrpld/app/paths/detail/StrandFlow.h
index 2df496d83..329a4cc64 100644
--- a/src/xrpld/app/paths/detail/StrandFlow.h
+++ b/src/xrpld/app/paths/detail/StrandFlow.h
@@ -20,18 +20,18 @@
 #ifndef RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 #define RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/paths/AMMContext.h>
-#include <ripple/app/paths/Credit.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/app/paths/impl/FlatSets.h>
-#include <ripple/app/paths/impl/FlowDebugInfo.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/paths/AMMContext.h>
+#include <xrpld/app/paths/Credit.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpld/app/paths/detail/FlatSets.h>
+#include <xrpld/app/paths/detail/FlowDebugInfo.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/protocol/Feature.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
index f765d61f6..90dd00b37 100644
--- a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
+++ b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Credit.h>
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/app/paths/impl/StepChecks.h>
-#include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/paths/Credit.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpld/app/paths/detail/StepChecks.h>
+#include <xrpld/app/paths/detail/Steps.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/rdb/Download.h b/src/xrpld/app/rdb/Download.h
index a16c9aa87..76f240737 100644
--- a/src/xrpld/app/rdb/Download.h
+++ b/src/xrpld/app/rdb/Download.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_RDB_DOWNLOAD_H_INCLUDED
 #define RIPPLE_APP_RDB_DOWNLOAD_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/PeerFinder.h b/src/xrpld/app/rdb/PeerFinder.h
index 06cd80f67..8becd053f 100644
--- a/src/xrpld/app/rdb/PeerFinder.h
+++ b/src/xrpld/app/rdb/PeerFinder.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_RDB_PEERFINDER_H_INCLUDED
 #define RIPPLE_APP_RDB_PEERFINDER_H_INCLUDED
 
-#include <ripple/core/Config.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/peerfinder/detail/Store.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/RelationalDatabase.h b/src/xrpld/app/rdb/RelationalDatabase.h
index a269bf256..b30c94153 100644
--- a/src/xrpld/app/rdb/RelationalDatabase.h
+++ b/src/xrpld/app/rdb/RelationalDatabase.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_APP_RDB_RELATIONALDATABASE_H_INCLUDED
 #define RIPPLE_APP_RDB_RELATIONALDATABASE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/peerfinder/impl/Store.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/peerfinder/detail/Store.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <boost/variant.hpp>
diff --git a/src/xrpld/app/rdb/ShardArchive.h b/src/xrpld/app/rdb/ShardArchive.h
index 27db82797..5616c201a 100644
--- a/src/xrpld/app/rdb/ShardArchive.h
+++ b/src/xrpld/app/rdb/ShardArchive.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_RDB_SHARDARCHIVE_H_INCLUDED
 #define RIPPLE_APP_RDB_SHARDARCHIVE_H_INCLUDED
 
-#include <ripple/core/DatabaseCon.h>
+#include <xrpld/core/DatabaseCon.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/State.h b/src/xrpld/app/rdb/State.h
index fe74d5f19..b245270cd 100644
--- a/src/xrpld/app/rdb/State.h
+++ b/src/xrpld/app/rdb/State.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_RDB_STATE_H_INCLUDED
 #define RIPPLE_APP_RDB_STATE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/UnitaryShard.h b/src/xrpld/app/rdb/UnitaryShard.h
index e9a2ac93d..da78a8718 100644
--- a/src/xrpld/app/rdb/UnitaryShard.h
+++ b/src/xrpld/app/rdb/UnitaryShard.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_RDB_UNITARYSHARD_H_INCLUDED
 #define RIPPLE_APP_RDB_UNITARYSHARD_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/RippleLedgerHash.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/Vacuum.h b/src/xrpld/app/rdb/Vacuum.h
index 463f046e0..795c564db 100644
--- a/src/xrpld/app/rdb/Vacuum.h
+++ b/src/xrpld/app/rdb/Vacuum.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_RDB_VACUUM_H_INCLUDED
 #define RIPPLE_APP_RDB_VACUUM_H_INCLUDED
 
-#include <ripple/core/DatabaseCon.h>
+#include <xrpld/core/DatabaseCon.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/Wallet.h b/src/xrpld/app/rdb/Wallet.h
index 6a15997ff..6130c9fc2 100644
--- a/src/xrpld/app/rdb/Wallet.h
+++ b/src/xrpld/app/rdb/Wallet.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_RDB_WALLET_H_INCLUDED
 #define RIPPLE_APP_RDB_WALLET_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpld/peerfinder/detail/Store.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/backend/FlatmapDatabase.h b/src/xrpld/app/rdb/backend/FlatmapDatabase.h
index 00927b1d4..ad6d3407c 100644
--- a/src/xrpld/app/rdb/backend/FlatmapDatabase.h
+++ b/src/xrpld/app/rdb/backend/FlatmapDatabase.h
@@ -1,10 +1,10 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_FLATMAPDATABASE_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_FLATMAPDATABASE_H_INCLUDED
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <algorithm>
 #include <map>
 #include <mutex>
diff --git a/src/xrpld/app/rdb/backend/PostgresDatabase.h b/src/xrpld/app/rdb/backend/PostgresDatabase.h
index e86736112..c2841cefd 100644
--- a/src/xrpld/app/rdb/backend/PostgresDatabase.h
+++ b/src/xrpld/app/rdb/backend/PostgresDatabase.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_POSTGRESDATABASE_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_POSTGRESDATABASE_H_INCLUDED
 
-#include <ripple/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/backend/RWDBDatabase.h b/src/xrpld/app/rdb/backend/RWDBDatabase.h
index 3981691bc..7639b350c 100644
--- a/src/xrpld/app/rdb/backend/RWDBDatabase.h
+++ b/src/xrpld/app/rdb/backend/RWDBDatabase.h
@@ -1,13 +1,13 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_MEMORYDATABASE_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_MEMORYDATABASE_H_INCLUDED
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/impl/AccountTxPaging.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/detail/AccountTxPaging.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <algorithm>
 #include <map>
 #include <mutex>
diff --git a/src/xrpld/app/rdb/backend/SQLiteDatabase.h b/src/xrpld/app/rdb/backend/SQLiteDatabase.h
index 07f9be3e2..27c01c1b8 100644
--- a/src/xrpld/app/rdb/backend/SQLiteDatabase.h
+++ b/src/xrpld/app/rdb/backend/SQLiteDatabase.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_SQLITEDATABASE_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_SQLITEDATABASE_H_INCLUDED
 
-#include <ripple/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/backend/detail/Node.h b/src/xrpld/app/rdb/backend/detail/Node.h
index 2c3f264d7..9f31ffd43 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.h
+++ b/src/xrpld/app/rdb/backend/detail/Node.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_DETAIL_NODE_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_DETAIL_NODE_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/core/Config.h>
-#include <ripple/overlay/PeerReservationTable.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/overlay/PeerReservationTable.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp
index 5ee4ce551..824afdf02 100644
--- a/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp
+++ b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp
@@ -17,23 +17,23 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/misc/impl/AccountTxPaging.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/rdb/backend/detail/Node.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/Pg.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/nodestore/DatabaseShard.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/misc/detail/AccountTxPaging.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/rdb/backend/detail/Node.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/Pg.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/nodestore/DatabaseShard.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <soci/sqlite3/soci-sqlite3.h>
diff --git a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
index b00bde253..b27621b62 100644
--- a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
+++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/misc/impl/AccountTxPaging.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/app/rdb/backend/detail/Node.h>
-#include <ripple/app/rdb/backend/detail/Shard.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/json/to_string.h>
-#include <ripple/nodestore/DatabaseShard.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/misc/detail/AccountTxPaging.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/app/rdb/backend/detail/Node.h>
+#include <xrpld/app/rdb/backend/detail/Shard.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/nodestore/DatabaseShard.h>
 #include <soci/sqlite3/soci-sqlite3.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/backend/detail/Shard.h b/src/xrpld/app/rdb/backend/detail/Shard.h
index 02e75d2aa..78c1aba2c 100644
--- a/src/xrpld/app/rdb/backend/detail/Shard.h
+++ b/src/xrpld/app/rdb/backend/detail/Shard.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_RDB_BACKEND_DETAIL_SHARD_H_INCLUDED
 #define RIPPLE_APP_RDB_BACKEND_DETAIL_SHARD_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/UnitaryShard.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/RippleLedgerHash.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/UnitaryShard.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/RippleLedgerHash.h>
 #include <boost/filesystem.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/backend/detail/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp
index 4f7b7b094..d10a417ac 100644
--- a/src/xrpld/app/rdb/backend/detail/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/PendingSaves.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/backend/detail/Node.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/json/to_string.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/PendingSaves.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/backend/detail/Node.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/json/to_string.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <soci/sqlite3/soci-sqlite3.h>
diff --git a/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp
index 540e8d1d2..6171a19f0 100644
--- a/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp
+++ b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/rdb/backend/detail/Shard.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/json/to_string.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/rdb/backend/detail/Shard.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/json/to_string.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/app/rdb/detail/Download.cpp b/src/xrpld/app/rdb/detail/Download.cpp
index 6f6d6bf75..cd4ac333e 100644
--- a/src/xrpld/app/rdb/detail/Download.cpp
+++ b/src/xrpld/app/rdb/detail/Download.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/Download.h>
+#include <xrpld/app/rdb/Download.h>
 #include <soci/sqlite3/soci-sqlite3.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/detail/PeerFinder.cpp b/src/xrpld/app/rdb/detail/PeerFinder.cpp
index 46dca3760..b2eaf3dfe 100644
--- a/src/xrpld/app/rdb/detail/PeerFinder.cpp
+++ b/src/xrpld/app/rdb/detail/PeerFinder.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/PeerFinder.h>
+#include <xrpld/app/rdb/PeerFinder.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/detail/RelationalDatabase.cpp b/src/xrpld/app/rdb/detail/RelationalDatabase.cpp
index 64161bd53..3dbc2ef1c 100644
--- a/src/xrpld/app/rdb/detail/RelationalDatabase.cpp
+++ b/src/xrpld/app/rdb/detail/RelationalDatabase.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/backend/FlatmapDatabase.h>
-#include <ripple/app/rdb/backend/RWDBDatabase.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DatabaseShard.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/backend/FlatmapDatabase.h>
+#include <xrpld/app/rdb/backend/RWDBDatabase.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DatabaseShard.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/detail/ShardArchive.cpp b/src/xrpld/app/rdb/detail/ShardArchive.cpp
index edad36f70..27422e8f9 100644
--- a/src/xrpld/app/rdb/detail/ShardArchive.cpp
+++ b/src/xrpld/app/rdb/detail/ShardArchive.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/ShardArchive.h>
+#include <xrpld/app/rdb/ShardArchive.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/detail/State.cpp b/src/xrpld/app/rdb/detail/State.cpp
index 8f8beb0c7..c3de86068 100644
--- a/src/xrpld/app/rdb/detail/State.cpp
+++ b/src/xrpld/app/rdb/detail/State.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/State.h>
+#include <xrpld/app/rdb/State.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/rdb/detail/UnitaryShard.cpp b/src/xrpld/app/rdb/detail/UnitaryShard.cpp
index 786340f59..a6f932a51 100644
--- a/src/xrpld/app/rdb/detail/UnitaryShard.cpp
+++ b/src/xrpld/app/rdb/detail/UnitaryShard.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/UnitaryShard.h>
-#include <ripple/basics/StringUtilities.h>
+#include <xrpld/app/rdb/UnitaryShard.h>
+#include <xrpl/basics/StringUtilities.h>
 #include <boost/format.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 
diff --git a/src/xrpld/app/rdb/detail/Vacuum.cpp b/src/xrpld/app/rdb/detail/Vacuum.cpp
index 20386f07b..92e20c868 100644
--- a/src/xrpld/app/rdb/detail/Vacuum.cpp
+++ b/src/xrpld/app/rdb/detail/Vacuum.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/Vacuum.h>
+#include <xrpld/app/rdb/Vacuum.h>
 #include <boost/format.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/detail/Wallet.cpp b/src/xrpld/app/rdb/detail/Wallet.cpp
index 79734ab67..d0631e6e6 100644
--- a/src/xrpld/app/rdb/detail/Wallet.cpp
+++ b/src/xrpld/app/rdb/detail/Wallet.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/Wallet.h>
+#include <xrpld/app/rdb/Wallet.h>
 #include <boost/format.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/reporting/ETLHelpers.h b/src/xrpld/app/reporting/ETLHelpers.h
index 04f282ca5..b11d2c4aa 100644
--- a/src/xrpld/app/reporting/ETLHelpers.h
+++ b/src/xrpld/app/reporting/ETLHelpers.h
@@ -19,8 +19,8 @@
 
 #ifndef RIPPLE_APP_REPORTING_ETLHELPERS_H_INCLUDED
 #define RIPPLE_APP_REPORTING_ETLHELPERS_H_INCLUDED
-#include <ripple/app/main/Application.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/ledger/ReadView.h>
 #include <condition_variable>
 #include <mutex>
 #include <optional>
diff --git a/src/xrpld/app/reporting/ETLSource.cpp b/src/xrpld/app/reporting/ETLSource.cpp
index 1274d86ae..90a7ffccd 100644
--- a/src/xrpld/app/reporting/ETLSource.cpp
+++ b/src/xrpld/app/reporting/ETLSource.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/reporting/ETLSource.h>
-#include <ripple/app/reporting/ReportingETL.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
+#include <xrpld/app/reporting/ETLSource.h>
+#include <xrpld/app/reporting/ReportingETL.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/reporting/ETLSource.h b/src/xrpld/app/reporting/ETLSource.h
index b9f27a1bf..d89fcd488 100644
--- a/src/xrpld/app/reporting/ETLSource.h
+++ b/src/xrpld/app/reporting/ETLSource.h
@@ -19,11 +19,11 @@
 
 #ifndef RIPPLE_APP_REPORTING_ETLSOURCE_H_INCLUDED
 #define RIPPLE_APP_REPORTING_ETLSOURCE_H_INCLUDED
-#include <ripple/app/main/Application.h>
-#include <ripple/app/reporting/ETLHelpers.h>
-#include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/reporting/ETLHelpers.h>
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpld/rpc/Context.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/beast/core.hpp>
diff --git a/src/xrpld/app/reporting/P2pProxy.cpp b/src/xrpld/app/reporting/P2pProxy.cpp
index ee04b68e6..df699f4fa 100644
--- a/src/xrpld/app/reporting/P2pProxy.cpp
+++ b/src/xrpld/app/reporting/P2pProxy.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/app/reporting/ReportingETL.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpld/app/reporting/ReportingETL.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/reporting/P2pProxy.h b/src/xrpld/app/reporting/P2pProxy.h
index 55ebc7267..c43b7a7d4 100644
--- a/src/xrpld/app/reporting/P2pProxy.h
+++ b/src/xrpld/app/reporting/P2pProxy.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_REPORTING_P2PPROXY_H_INCLUDED
 #define RIPPLE_APP_REPORTING_P2PPROXY_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 #include <boost/beast/websocket.hpp>
 #include <grpcpp/grpcpp.h>
diff --git a/src/xrpld/app/reporting/ReportingETL.cpp b/src/xrpld/app/reporting/ReportingETL.cpp
index e6887817e..ff26d69a4 100644
--- a/src/xrpld/app/reporting/ReportingETL.cpp
+++ b/src/xrpld/app/reporting/ReportingETL.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/reporting/ReportingETL.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/reporting/ReportingETL.h>
 
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_writer.h>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core.hpp>
diff --git a/src/xrpld/app/reporting/ReportingETL.h b/src/xrpld/app/reporting/ReportingETL.h
index 71e08adf1..aa857f735 100644
--- a/src/xrpld/app/reporting/ReportingETL.h
+++ b/src/xrpld/app/reporting/ReportingETL.h
@@ -20,27 +20,27 @@
 #ifndef RIPPLE_APP_REPORTING_REPORTINGETL_H_INCLUDED
 #define RIPPLE_APP_REPORTING_REPORTINGETL_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/reporting/ETLHelpers.h>
-#include <ripple/app/reporting/ETLSource.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/resource/Charge.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/Handler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/reporting/ETLHelpers.h>
+#include <xrpld/app/reporting/ETLSource.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/Handler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/websocket.hpp>
 
-#include "org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h"
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <grpcpp/grpcpp.h>
 
 #include <condition_variable>
diff --git a/src/xrpld/app/tx/apply.h b/src/xrpld/app/tx/apply.h
index 4315f89d5..bafb1fcc2 100644
--- a/src/xrpld/app/tx/apply.h
+++ b/src/xrpld/app/tx/apply.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_TX_APPLY_H_INCLUDED
 #define RIPPLE_TX_APPLY_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
 #include <memory>
 #include <utility>
 
diff --git a/src/xrpld/app/tx/applySteps.h b/src/xrpld/app/tx/applySteps.h
index 336d81e0c..9e7c582fc 100644
--- a/src/xrpld/app/tx/applySteps.h
+++ b/src/xrpld/app/tx/applySteps.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TX_APPLYSTEPS_H_INCLUDED
 #define RIPPLE_TX_APPLYSTEPS_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/ApplyViewImpl.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMBid.cpp b/src/xrpld/app/tx/detail/AMMBid.cpp
index e49c378ce..9de3762d2 100644
--- a/src/xrpld/app/tx/detail/AMMBid.cpp
+++ b/src/xrpld/app/tx/detail/AMMBid.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMBid.h>
+#include <xrpld/app/tx/detail/AMMBid.h>
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMBid.h b/src/xrpld/app/tx/detail/AMMBid.h
index db3d8d9b0..4bb3a2adf 100644
--- a/src/xrpld/app/tx/detail/AMMBid.h
+++ b/src/xrpld/app/tx/detail/AMMBid.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMBID_H_INCLUDED
 #define RIPPLE_TX_AMMBID_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp
index 70fcc5c69..2ab20fe5e 100644
--- a/src/xrpld/app/tx/detail/AMMCreate.cpp
+++ b/src/xrpld/app/tx/detail/AMMCreate.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMCreate.h>
+#include <xrpld/app/tx/detail/AMMCreate.h>
 
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STIssue.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STIssue.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMCreate.h b/src/xrpld/app/tx/detail/AMMCreate.h
index f521f5870..189d66a55 100644
--- a/src/xrpld/app/tx/detail/AMMCreate.h
+++ b/src/xrpld/app/tx/detail/AMMCreate.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMCREATE_H_INCLUDED
 #define RIPPLE_TX_AMMCREATE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMDelete.cpp b/src/xrpld/app/tx/detail/AMMDelete.cpp
index 25502be4f..89ce34052 100644
--- a/src/xrpld/app/tx/detail/AMMDelete.cpp
+++ b/src/xrpld/app/tx/detail/AMMDelete.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMDelete.h>
+#include <xrpld/app/tx/detail/AMMDelete.h>
 
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMDelete.h b/src/xrpld/app/tx/detail/AMMDelete.h
index cf7f55cb7..19885b1da 100644
--- a/src/xrpld/app/tx/detail/AMMDelete.h
+++ b/src/xrpld/app/tx/detail/AMMDelete.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMDELETE_H_INCLUDED
 #define RIPPLE_TX_AMMDELETE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp
index 74cba160e..9bbf5b4a6 100644
--- a/src/xrpld/app/tx/detail/AMMDeposit.cpp
+++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMDeposit.h>
+#include <xrpld/app/tx/detail/AMMDeposit.h>
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TxFlags.h>
 
 #include <bit>
 
diff --git a/src/xrpld/app/tx/detail/AMMDeposit.h b/src/xrpld/app/tx/detail/AMMDeposit.h
index 385ce7c24..0acb1dd9a 100644
--- a/src/xrpld/app/tx/detail/AMMDeposit.h
+++ b/src/xrpld/app/tx/detail/AMMDeposit.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMDEPOSIT_H_INCLUDED
 #define RIPPLE_TX_AMMDEPOSIT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMVote.cpp b/src/xrpld/app/tx/detail/AMMVote.cpp
index d908a93c3..6da320f83 100644
--- a/src/xrpld/app/tx/detail/AMMVote.cpp
+++ b/src/xrpld/app/tx/detail/AMMVote.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMVote.h>
+#include <xrpld/app/tx/detail/AMMVote.h>
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMVote.h b/src/xrpld/app/tx/detail/AMMVote.h
index 97d257d05..2bee01aff 100644
--- a/src/xrpld/app/tx/detail/AMMVote.h
+++ b/src/xrpld/app/tx/detail/AMMVote.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMVOTE_H_INCLUDED
 #define RIPPLE_TX_AMMVOTE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
index c8d0d67dc..b21ea3412 100644
--- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp
+++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/AMMWithdraw.h>
+#include <xrpld/app/tx/detail/AMMWithdraw.h>
 
-#include <ripple/app/misc/AMMHelpers.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/basics/Number.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/misc/AMMHelpers.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpl/basics/Number.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TxFlags.h>
 
 #include <bit>
 
diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.h b/src/xrpld/app/tx/detail/AMMWithdraw.h
index 406862663..9e9920aa5 100644
--- a/src/xrpld/app/tx/detail/AMMWithdraw.h
+++ b/src/xrpld/app/tx/detail/AMMWithdraw.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_AMMWITHDRAW_H_INCLUDED
 #define RIPPLE_TX_AMMWITHDRAW_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/ApplyContext.cpp b/src/xrpld/app/tx/detail/ApplyContext.cpp
index 272872416..969af7960 100644
--- a/src/xrpld/app/tx/detail/ApplyContext.cpp
+++ b/src/xrpld/app/tx/detail/ApplyContext.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/ApplyContext.h>
-#include <ripple/app/tx/impl/InvariantCheck.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpld/app/tx/detail/InvariantCheck.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/ApplyContext.h b/src/xrpld/app/tx/detail/ApplyContext.h
index 82cfa1b26..d755a6a6d 100644
--- a/src/xrpld/app/tx/detail/ApplyContext.h
+++ b/src/xrpld/app/tx/detail/ApplyContext.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_TX_APPLYCONTEXT_H_INCLUDED
 #define RIPPLE_TX_APPLYCONTEXT_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ApplyViewImpl.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
+#include <xrpl/protocol/STTx.h>
 #include <optional>
 #include <utility>
 
diff --git a/src/xrpld/app/tx/detail/BookTip.cpp b/src/xrpld/app/tx/detail/BookTip.cpp
index 88bfd1d51..011d992dd 100644
--- a/src/xrpld/app/tx/detail/BookTip.cpp
+++ b/src/xrpld/app/tx/detail/BookTip.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/BookTip.h>
-#include <ripple/basics/Log.h>
+#include <xrpld/app/tx/detail/BookTip.h>
+#include <xrpl/basics/Log.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/BookTip.h b/src/xrpld/app/tx/detail/BookTip.h
index d57700ad4..4de6b785b 100644
--- a/src/xrpld/app/tx/detail/BookTip.h
+++ b/src/xrpld/app/tx/detail/BookTip.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED
 #define RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED
 
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
 
 #include <functional>
 
diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp
index 5e7050d86..882ef414c 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.cpp
+++ b/src/xrpld/app/tx/detail/CancelCheck.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/CancelCheck.h>
+#include <xrpld/app/tx/detail/CancelCheck.h>
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CancelCheck.h b/src/xrpld/app/tx/detail/CancelCheck.h
index a7e0f6e5d..582d8559e 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.h
+++ b/src/xrpld/app/tx/detail/CancelCheck.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_CANCELCHECK_H_INCLUDED
 #define RIPPLE_TX_CANCELCHECK_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CancelOffer.cpp b/src/xrpld/app/tx/detail/CancelOffer.cpp
index b9337d7de..b95fedb26 100644
--- a/src/xrpld/app/tx/detail/CancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/CancelOffer.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/CancelOffer.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/CancelOffer.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CancelOffer.h b/src/xrpld/app/tx/detail/CancelOffer.h
index 32aee3353..1e3b4a5c9 100644
--- a/src/xrpld/app/tx/detail/CancelOffer.h
+++ b/src/xrpld/app/tx/detail/CancelOffer.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_CANCELOFFER_H_INCLUDED
 #define RIPPLE_TX_CANCELOFFER_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp
index 7aa807e85..919db7314 100644
--- a/src/xrpld/app/tx/detail/CashCheck.cpp
+++ b/src/xrpld/app/tx/detail/CashCheck.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/tx/impl/CashCheck.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/scope.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/tx/detail/CashCheck.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/scope.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 #include <algorithm>
 
diff --git a/src/xrpld/app/tx/detail/CashCheck.h b/src/xrpld/app/tx/detail/CashCheck.h
index 3acc3204a..c90cd93a9 100644
--- a/src/xrpld/app/tx/detail/CashCheck.h
+++ b/src/xrpld/app/tx/detail/CashCheck.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_CASHCHECK_H_INCLUDED
 #define RIPPLE_TX_CASHCHECK_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp
index fb6000bbd..0e8bb0de4 100644
--- a/src/xrpld/app/tx/detail/Change.cpp
+++ b/src/xrpld/app/tx/detail/Change.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Guard.h>
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/tx/impl/Change.h>
-#include <ripple/app/tx/impl/SetSignerList.h>
-#include <ripple/app/tx/impl/XahauGenesis.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/hook/Guard.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/tx/detail/Change.h>
+#include <xrpld/app/tx/detail/SetSignerList.h>
+#include <xrpld/app/tx/detail/XahauGenesis.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <string_view>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/Change.h b/src/xrpld/app/tx/detail/Change.h
index 20c701f5c..05321fbb9 100644
--- a/src/xrpld/app/tx/detail/Change.h
+++ b/src/xrpld/app/tx/detail/Change.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_TX_CHANGE_H_INCLUDED
 #define RIPPLE_TX_CHANGE_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/ClaimReward.cpp b/src/xrpld/app/tx/detail/ClaimReward.cpp
index b87777dc0..921f9206f 100644
--- a/src/xrpld/app/tx/detail/ClaimReward.cpp
+++ b/src/xrpld/app/tx/detail/ClaimReward.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/tx/impl/ClaimReward.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/tx/detail/ClaimReward.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/ClaimReward.h b/src/xrpld/app/tx/detail/ClaimReward.h
index 19c7d1f5e..296bd723e 100644
--- a/src/xrpld/app/tx/detail/ClaimReward.h
+++ b/src/xrpld/app/tx/detail/ClaimReward.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_TX_CLAIMREWARD_H_INCLUDED
 #define RIPPLE_TX_CLAIMREWARD_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Clawback.cpp b/src/xrpld/app/tx/detail/Clawback.cpp
index 58546db5c..15d765260 100644
--- a/src/xrpld/app/tx/detail/Clawback.cpp
+++ b/src/xrpld/app/tx/detail/Clawback.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Clawback.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/Clawback.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Clawback.h b/src/xrpld/app/tx/detail/Clawback.h
index c5f072c84..d908a2e4e 100644
--- a/src/xrpld/app/tx/detail/Clawback.h
+++ b/src/xrpld/app/tx/detail/Clawback.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_CLAWBACK_H_INCLUDED
 #define RIPPLE_TX_CLAWBACK_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CreateCheck.cpp b/src/xrpld/app/tx/detail/CreateCheck.cpp
index 79fea6656..08436e37b 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.cpp
+++ b/src/xrpld/app/tx/detail/CreateCheck.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/CreateCheck.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/CreateCheck.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CreateCheck.h b/src/xrpld/app/tx/detail/CreateCheck.h
index 537b230eb..86daad070 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.h
+++ b/src/xrpld/app/tx/detail/CreateCheck.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_CREATECHECK_H_INCLUDED
 #define RIPPLE_TX_CREATECHECK_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp
index 47965a8bb..cec73c17e 100644
--- a/src/xrpld/app/tx/detail/CreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/CreateOffer.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/OrderBookDB.h>
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/tx/impl/CreateOffer.h>
-#include <ripple/beast/utility/WrappedSink.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/ledger/OrderBookDB.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/tx/detail/CreateOffer.h>
+#include <xrpl/beast/utility/WrappedSink.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CreateOffer.h b/src/xrpld/app/tx/detail/CreateOffer.h
index 597ee22c0..47129df5b 100644
--- a/src/xrpld/app/tx/detail/CreateOffer.h
+++ b/src/xrpld/app/tx/detail/CreateOffer.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TX_CREATEOFFER_H_INCLUDED
 #define RIPPLE_TX_CREATEOFFER_H_INCLUDED
 
-#include <ripple/app/tx/impl/OfferStream.h>
-#include <ripple/app/tx/impl/Taker.h>
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/OfferStream.h>
+#include <xrpld/app/tx/detail/Taker.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 #include <utility>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp
index a90123182..b04f4af1d 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.cpp
+++ b/src/xrpld/app/tx/detail/CreateTicket.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/CreateTicket.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/CreateTicket.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/CreateTicket.h b/src/xrpld/app/tx/detail/CreateTicket.h
index c1909ddf7..edfcaa787 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.h
+++ b/src/xrpld/app/tx/detail/CreateTicket.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_CREATETICKET_H_INCLUDED
 #define RIPPLE_TX_CREATETICKET_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp
index 1cad8992a..378bd79ce 100644
--- a/src/xrpld/app/tx/detail/DID.cpp
+++ b/src/xrpld/app/tx/detail/DID.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/DID.h>
+#include <xrpld/app/tx/detail/DID.h>
 
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DID.h b/src/xrpld/app/tx/detail/DID.h
index 13d5a2615..54ae6630f 100644
--- a/src/xrpld/app/tx/detail/DID.h
+++ b/src/xrpld/app/tx/detail/DID.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_DID_H_INCLUDED
 #define RIPPLE_TX_DID_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp
index e1bb33040..7fe0ab1b8 100644
--- a/src/xrpld/app/tx/detail/DeleteAccount.cpp
+++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/DID.h>
-#include <ripple/app/tx/impl/DeleteAccount.h>
-#include <ripple/app/tx/impl/DeleteOracle.h>
-#include <ripple/app/tx/impl/DepositPreauth.h>
-#include <ripple/app/tx/impl/SetSignerList.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/mulDiv.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/DID.h>
+#include <xrpld/app/tx/detail/DeleteAccount.h>
+#include <xrpld/app/tx/detail/DeleteOracle.h>
+#include <xrpld/app/tx/detail/DepositPreauth.h>
+#include <xrpld/app/tx/detail/SetSignerList.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DeleteAccount.h b/src/xrpld/app/tx/detail/DeleteAccount.h
index 0f298bb85..e1da2f459 100644
--- a/src/xrpld/app/tx/detail/DeleteAccount.h
+++ b/src/xrpld/app/tx/detail/DeleteAccount.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TX_DELETEACCOUNT_H_INCLUDED
 #define RIPPLE_TX_DELETEACCOUNT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.cpp b/src/xrpld/app/tx/detail/DeleteOracle.cpp
index 9331daee9..807e52ee6 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.cpp
+++ b/src/xrpld/app/tx/detail/DeleteOracle.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/DeleteOracle.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/DeleteOracle.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.h b/src/xrpld/app/tx/detail/DeleteOracle.h
index e578adaaa..8f1402563 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.h
+++ b/src/xrpld/app/tx/detail/DeleteOracle.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_DELETEORACLE_H_INCLUDED
 #define RIPPLE_TX_DELETEORACLE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp
index 7d99e6301..9f1e15b3e 100644
--- a/src/xrpld/app/tx/detail/DepositPreauth.cpp
+++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/DepositPreauth.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/DepositPreauth.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/DepositPreauth.h b/src/xrpld/app/tx/detail/DepositPreauth.h
index 8111c2156..5edcee104 100644
--- a/src/xrpld/app/tx/detail/DepositPreauth.h
+++ b/src/xrpld/app/tx/detail/DepositPreauth.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_DEPOSIT_PREAUTH_H_INCLUDED
 #define RIPPLE_TX_DEPOSIT_PREAUTH_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp
index ece77e432..8f4a497d8 100644
--- a/src/xrpld/app/tx/detail/Escrow.cpp
+++ b/src/xrpld/app/tx/detail/Escrow.cpp
@@ -17,23 +17,23 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Escrow.h>
+#include <xrpld/app/tx/detail/Escrow.h>
 
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/Fulfillment.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/Fulfillment.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/st.h>
 
 // During an EscrowFinish, the transaction must specify both
 // a condition and a fulfillment. We track whether that
diff --git a/src/xrpld/app/tx/detail/Escrow.h b/src/xrpld/app/tx/detail/Escrow.h
index 0f5fd9401..9e30da761 100644
--- a/src/xrpld/app/tx/detail/Escrow.h
+++ b/src/xrpld/app/tx/detail/Escrow.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_ESCROW_H_INCLUDED
 #define RIPPLE_TX_ESCROW_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/GenesisMint.cpp b/src/xrpld/app/tx/detail/GenesisMint.cpp
index 8b4dce3fb..b4fee0d16 100644
--- a/src/xrpld/app/tx/detail/GenesisMint.cpp
+++ b/src/xrpld/app/tx/detail/GenesisMint.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/GenesisMint.h>
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/GenesisMint.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/GenesisMint.h b/src/xrpld/app/tx/detail/GenesisMint.h
index 8feb94213..08f630ef6 100644
--- a/src/xrpld/app/tx/detail/GenesisMint.h
+++ b/src/xrpld/app/tx/detail/GenesisMint.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_GENESISMINT_H_INCLUDED
 #define RIPPLE_TX_GENESISMINT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Import.cpp b/src/xrpld/app/tx/detail/Import.cpp
index d79fb76c1..aa2944aa9 100644
--- a/src/xrpld/app/tx/detail/Import.cpp
+++ b/src/xrpld/app/tx/detail/Import.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/app/tx/impl/SetSignerList.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Import.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpld/app/tx/detail/SetSignerList.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Import.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/st.h>
 #include <algorithm>
 #include <charconv>
 #include <iostream>
diff --git a/src/xrpld/app/tx/detail/Import.h b/src/xrpld/app/tx/detail/Import.h
index 77ae71ecf..74c9721bb 100644
--- a/src/xrpld/app/tx/detail/Import.h
+++ b/src/xrpld/app/tx/detail/Import.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_IMPORT_H_INCLUDED
 #define RIPPLE_TX_IMPORT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/InvariantCheck.cpp b/src/xrpld/app/tx/detail/InvariantCheck.cpp
index e1de64078..5cbc4931f 100644
--- a/src/xrpld/app/tx/detail/InvariantCheck.cpp
+++ b/src/xrpld/app/tx/detail/InvariantCheck.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/InvariantCheck.h>
+#include <xrpld/app/tx/detail/InvariantCheck.h>
 
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/TxFormats.h>
-#include <ripple/protocol/nftPageMask.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/nftPageMask.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/InvariantCheck.h b/src/xrpld/app/tx/detail/InvariantCheck.h
index 590e9ffc5..80230aace 100644
--- a/src/xrpld/app/tx/detail/InvariantCheck.h
+++ b/src/xrpld/app/tx/detail/InvariantCheck.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_TX_INVARIANTCHECK_H_INCLUDED
 #define RIPPLE_APP_TX_INVARIANTCHECK_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
 
 #include <cstdint>
 #include <map>
diff --git a/src/xrpld/app/tx/detail/Invoke.cpp b/src/xrpld/app/tx/detail/Invoke.cpp
index 387c6bae0..507aceb60 100644
--- a/src/xrpld/app/tx/detail/Invoke.cpp
+++ b/src/xrpld/app/tx/detail/Invoke.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Invoke.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/Invoke.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Invoke.h b/src/xrpld/app/tx/detail/Invoke.h
index 63d69e756..6d44848d8 100644
--- a/src/xrpld/app/tx/detail/Invoke.h
+++ b/src/xrpld/app/tx/detail/Invoke.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_INVOKE_H_INCLUDED
 #define RIPPLE_TX_INVOKE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
index 69a4e5e04..50b5894ef 100644
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/NFTokenAcceptOffer.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/NFTokenAcceptOffer.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
index e1b26cbec..dff3febbb 100644
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_NFTOKENACCEPTOFFER_H_INCLUDED
 #define RIPPLE_TX_NFTOKENACCEPTOFFER_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.cpp b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
index 99acfd61d..f43dda71f 100644
--- a/src/xrpld/app/tx/detail/NFTokenBurn.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/NFTokenBurn.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/NFTokenBurn.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 #include <boost/endian/conversion.hpp>
 #include <array>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.h b/src/xrpld/app/tx/detail/NFTokenBurn.h
index 61079c4a4..3f5296c21 100644
--- a/src/xrpld/app/tx/detail/NFTokenBurn.h
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_BURNNFT_H_INCLUDED
 #define RIPPLE_TX_BURNNFT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
index 50199ace8..ef66ceecd 100644
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/NFTokenCancelOffer.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/NFTokenCancelOffer.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 #include <boost/endian/conversion.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
index 752d33ac8..d46067571 100644
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_NFTOKENCANCELOFFER_H_INCLUDED
 #define RIPPLE_TX_NFTOKENCANCELOFFER_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
index cfacb70ed..cbef3093a 100644
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/NFTokenCreateOffer.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/NFTokenCreateOffer.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 #include <boost/endian/conversion.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
index 676b546f4..075a5a712 100644
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_NFTOKENOFFERCREATE_H_INCLUDED
 #define RIPPLE_TX_NFTOKENOFFERCREATE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp
index fb0d971c7..0659b3a19 100644
--- a/src/xrpld/app/tx/detail/NFTokenMint.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/NFTokenMint.h>
-#include <ripple/basics/Expected.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/InnerObjectFormats.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/NFTokenMint.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/InnerObjectFormats.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 #include <boost/endian/conversion.hpp>
 #include <array>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h
index 690843c19..1889e9498 100644
--- a/src/xrpld/app/tx/detail/NFTokenMint.h
+++ b/src/xrpld/app/tx/detail/NFTokenMint.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TX_NFTTOKENMINT_H_INCLUDED
 #define RIPPLE_TX_NFTTOKENMINT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.cpp b/src/xrpld/app/tx/detail/NFTokenUtils.cpp
index 2c7e1e267..3ce671c8b 100644
--- a/src/xrpld/app/tx/detail/NFTokenUtils.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenUtils.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/algorithm.h>
-#include <ripple/ledger/Directory.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/nftPageMask.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/algorithm.h>
+#include <xrpld/ledger/Directory.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/nftPageMask.h>
 #include <functional>
 #include <memory>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.h b/src/xrpld/app/tx/detail/NFTokenUtils.h
index 6ede69853..a0fc7af65 100644
--- a/src/xrpld/app/tx/detail/NFTokenUtils.h
+++ b/src/xrpld/app/tx/detail/NFTokenUtils.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED
 #define RIPPLE_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/tagged_integer.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/nft.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/tagged_integer.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/nft.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Offer.h b/src/xrpld/app/tx/detail/Offer.h
index 53253426c..6a1d740c0 100644
--- a/src/xrpld/app/tx/detail/Offer.h
+++ b/src/xrpld/app/tx/detail/Offer.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_APP_BOOK_OFFER_H_INCLUDED
 #define RIPPLE_APP_BOOK_OFFER_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 #include <ostream>
 #include <stdexcept>
 
diff --git a/src/xrpld/app/tx/detail/OfferStream.cpp b/src/xrpld/app/tx/detail/OfferStream.cpp
index 5933d9c38..b96319525 100644
--- a/src/xrpld/app/tx/detail/OfferStream.cpp
+++ b/src/xrpld/app/tx/detail/OfferStream.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/OfferStream.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/tx/detail/OfferStream.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/OfferStream.h b/src/xrpld/app/tx/detail/OfferStream.h
index 9472bc4e7..5f9019069 100644
--- a/src/xrpld/app/tx/detail/OfferStream.h
+++ b/src/xrpld/app/tx/detail/OfferStream.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED
 #define RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED
 
-#include <ripple/app/tx/impl/BookTip.h>
-#include <ripple/app/tx/impl/Offer.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Quality.h>
+#include <xrpld/app/tx/detail/BookTip.h>
+#include <xrpld/app/tx/detail/Offer.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Quality.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp
index 46511d3dd..42ad59f02 100644
--- a/src/xrpld/app/tx/detail/PayChan.cpp
+++ b/src/xrpld/app/tx/detail/PayChan.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/PayChan.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PayChan.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/PayChan.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PayChan.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/PayChan.h b/src/xrpld/app/tx/detail/PayChan.h
index 9fe4b8419..8bb3a6d93 100644
--- a/src/xrpld/app/tx/detail/PayChan.h
+++ b/src/xrpld/app/tx/detail/PayChan.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_PAYCHAN_H_INCLUDED
 #define RIPPLE_TX_PAYCHAN_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp
index 032144f0e..0ae794a9b 100644
--- a/src/xrpld/app/tx/detail/Payment.cpp
+++ b/src/xrpld/app/tx/detail/Payment.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/tx/impl/Payment.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/tx/detail/Payment.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Payment.h b/src/xrpld/app/tx/detail/Payment.h
index 1d4711198..3176ae1c0 100644
--- a/src/xrpld/app/tx/detail/Payment.h
+++ b/src/xrpld/app/tx/detail/Payment.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_PAYMENT_H_INCLUDED
 #define RIPPLE_TX_PAYMENT_H_INCLUDED
 
-#include <ripple/app/paths/RippleCalc.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/paths/RippleCalc.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Remit.cpp b/src/xrpld/app/tx/detail/Remit.cpp
index 28749b9bf..93801ea8d 100644
--- a/src/xrpld/app/tx/detail/Remit.cpp
+++ b/src/xrpld/app/tx/detail/Remit.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Remit.h>
-#include <ripple/app/tx/impl/URIToken.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/Remit.h>
+#include <xrpld/app/tx/detail/URIToken.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Remit.h b/src/xrpld/app/tx/detail/Remit.h
index e0003daf7..7cde6aaa4 100644
--- a/src/xrpld/app/tx/detail/Remit.h
+++ b/src/xrpld/app/tx/detail/Remit.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_REMIT_H_INCLUDED
 #define RIPPLE_TX_REMIT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp
index efcee2714..4bd8cf4ec 100644
--- a/src/xrpld/app/tx/detail/SetAccount.cpp
+++ b/src/xrpld/app/tx/detail/SetAccount.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetAccount.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/SetAccount.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h
index 1c6bb4b7d..7d2c300c0 100644
--- a/src/xrpld/app/tx/detail/SetAccount.h
+++ b/src/xrpld/app/tx/detail/SetAccount.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_TX_SETACCOUNT_H_INCLUDED
 #define RIPPLE_TX_SETACCOUNT_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetHook.cpp b/src/xrpld/app/tx/detail/SetHook.cpp
index 22cd6a500..ca2916334 100644
--- a/src/xrpld/app/tx/detail/SetHook.cpp
+++ b/src/xrpld/app/tx/detail/SetHook.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetHook.h>
+#include <xrpld/app/tx/detail/SetHook.h>
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/hook/Guard.h>
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/hook/Guard.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <algorithm>
 #include <cstdint>
 #include <exception>
diff --git a/src/xrpld/app/tx/detail/SetHook.h b/src/xrpld/app/tx/detail/SetHook.h
index ecfce2410..42dde5f98 100644
--- a/src/xrpld/app/tx/detail/SetHook.h
+++ b/src/xrpld/app/tx/detail/SetHook.h
@@ -20,19 +20,19 @@
 #ifndef RIPPLE_TX_SETHOOK_H_INCLUDED
 #define RIPPLE_TX_SETHOOK_H_INCLUDED
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/SignerEntries.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/SignerEntries.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <algorithm>
 #include <cstdint>
 #include <vector>
diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp
index d0987d265..a577b10ad 100644
--- a/src/xrpld/app/tx/detail/SetOracle.cpp
+++ b/src/xrpld/app/tx/detail/SetOracle.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetOracle.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/InnerObjectFormats.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/tx/detail/SetOracle.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/InnerObjectFormats.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/digest.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetOracle.h b/src/xrpld/app/tx/detail/SetOracle.h
index 0ab8e603a..13c4d7a0c 100644
--- a/src/xrpld/app/tx/detail/SetOracle.h
+++ b/src/xrpld/app/tx/detail/SetOracle.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TX_SETORACLE_H_INCLUDED
 #define RIPPLE_TX_SETORACLE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
+#include <xrpld/app/tx/detail/Transactor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetRegularKey.cpp b/src/xrpld/app/tx/detail/SetRegularKey.cpp
index 8b789d75a..9f165612f 100644
--- a/src/xrpld/app/tx/detail/SetRegularKey.cpp
+++ b/src/xrpld/app/tx/detail/SetRegularKey.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetRegularKey.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/SetRegularKey.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetRegularKey.h b/src/xrpld/app/tx/detail/SetRegularKey.h
index 402ee436e..89a714342 100644
--- a/src/xrpld/app/tx/detail/SetRegularKey.h
+++ b/src/xrpld/app/tx/detail/SetRegularKey.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_SETREGULARKEY_H_INCLUDED
 #define RIPPLE_TX_SETREGULARKEY_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetRemarks.cpp b/src/xrpld/app/tx/detail/SetRemarks.cpp
index 4a63141f3..cf5b3f7d2 100644
--- a/src/xrpld/app/tx/detail/SetRemarks.cpp
+++ b/src/xrpld/app/tx/detail/SetRemarks.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetRemarks.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/SetRemarks.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetRemarks.h b/src/xrpld/app/tx/detail/SetRemarks.h
index 00f74ab5d..778c271f0 100644
--- a/src/xrpld/app/tx/detail/SetRemarks.h
+++ b/src/xrpld/app/tx/detail/SetRemarks.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_SETREMARKS_H_INCLUDED
 #define RIPPLE_TX_SETREMARKS_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp
index 87f69c51d..4ce3dbc47 100644
--- a/src/xrpld/app/tx/detail/SetSignerList.cpp
+++ b/src/xrpld/app/tx/detail/SetSignerList.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetSignerList.h>
+#include <xrpld/app/tx/detail/SetSignerList.h>
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <algorithm>
 #include <cstdint>
 
diff --git a/src/xrpld/app/tx/detail/SetSignerList.h b/src/xrpld/app/tx/detail/SetSignerList.h
index 1b54e05d2..bc24f324b 100644
--- a/src/xrpld/app/tx/detail/SetSignerList.h
+++ b/src/xrpld/app/tx/detail/SetSignerList.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_TX_SETSIGNERLIST_H_INCLUDED
 #define RIPPLE_TX_SETSIGNERLIST_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/SignerEntries.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/SignerEntries.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <algorithm>
 #include <cstdint>
 #include <vector>
diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp
index f0f84c49e..79f8c84ef 100644
--- a/src/xrpld/app/tx/detail/SetTrust.cpp
+++ b/src/xrpld/app/tx/detail/SetTrust.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SetTrust.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/tx/detail/SetTrust.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/st.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SetTrust.h b/src/xrpld/app/tx/detail/SetTrust.h
index 259ed0774..a86c8498d 100644
--- a/src/xrpld/app/tx/detail/SetTrust.h
+++ b/src/xrpld/app/tx/detail/SetTrust.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_TX_SETTRUST_H_INCLUDED
 #define RIPPLE_TX_SETTRUST_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/SignerEntries.cpp b/src/xrpld/app/tx/detail/SignerEntries.cpp
index e646d2cf2..f29dd77b1 100644
--- a/src/xrpld/app/tx/detail/SignerEntries.cpp
+++ b/src/xrpld/app/tx/detail/SignerEntries.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/SignerEntries.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STArray.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpld/app/tx/detail/SignerEntries.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <cstdint>
 #include <optional>
 
diff --git a/src/xrpld/app/tx/detail/SignerEntries.h b/src/xrpld/app/tx/detail/SignerEntries.h
index 302e94cce..a6a677fcd 100644
--- a/src/xrpld/app/tx/detail/SignerEntries.h
+++ b/src/xrpld/app/tx/detail/SignerEntries.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED
 #define RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>  // NotTEC
-#include <ripple/basics/Expected.h>         //
-#include <ripple/beast/utility/Journal.h>   // beast::Journal
-#include <ripple/protocol/Rules.h>          // Rules
-#include <ripple/protocol/STTx.h>           // STTx::maxMultiSigners
-#include <ripple/protocol/TER.h>            // temMALFORMED
-#include <ripple/protocol/UintTypes.h>      // AccountID
+#include <xrpld/app/tx/detail/Transactor.h>  // NotTEC
+#include <xrpl/basics/Expected.h>         //
+#include <xrpl/beast/utility/Journal.h>   // beast::Journal
+#include <xrpl/protocol/Rules.h>          // Rules
+#include <xrpl/protocol/STTx.h>           // STTx::maxMultiSigners
+#include <xrpl/protocol/TER.h>            // temMALFORMED
+#include <xrpl/protocol/UintTypes.h>      // AccountID
 #include <optional>
 #include <vector>
 
diff --git a/src/xrpld/app/tx/detail/Taker.cpp b/src/xrpld/app/tx/detail/Taker.cpp
index 623d8ed08..5f3e72324 100644
--- a/src/xrpld/app/tx/detail/Taker.cpp
+++ b/src/xrpld/app/tx/detail/Taker.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/impl/Taker.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
+#include <xrpld/app/tx/detail/Taker.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/Taker.h b/src/xrpld/app/tx/detail/Taker.h
index 4a516dcce..eedd07960 100644
--- a/src/xrpld/app/tx/detail/Taker.h
+++ b/src/xrpld/app/tx/detail/Taker.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_BOOK_TAKER_H_INCLUDED
 #define RIPPLE_APP_BOOK_TAKER_H_INCLUDED
 
-#include <ripple/app/tx/impl/Offer.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/tx/detail/Offer.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <functional>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp
index 403ce2bb5..aacf2a3d1 100644
--- a/src/xrpld/app/tx/detail/Transactor.cpp
+++ b/src/xrpld/app/tx/detail/Transactor.cpp
@@ -17,27 +17,27 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/Enum.h>
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/app/tx/impl/SignerEntries.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpld/app/hook/Enum.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/app/tx/detail/SignerEntries.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <limits>
 #include <set>
 
diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h
index f6dd1ec53..c23eeb411 100644
--- a/src/xrpld/app/tx/detail/Transactor.h
+++ b/src/xrpld/app/tx/detail/Transactor.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_APP_TX_TRANSACTOR_H_INCLUDED
 #define RIPPLE_APP_TX_TRANSACTOR_H_INCLUDED
 
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/tx/applySteps.h>
-#include <ripple/app/tx/impl/ApplyContext.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/tx/applySteps.h>
+#include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
 #include <variant>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/URIToken.cpp b/src/xrpld/app/tx/detail/URIToken.cpp
index afd9dad07..d86ddbf7d 100644
--- a/src/xrpld/app/tx/detail/URIToken.cpp
+++ b/src/xrpld/app/tx/detail/URIToken.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/URIToken.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/URIToken.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/URIToken.h b/src/xrpld/app/tx/detail/URIToken.h
index ebea4c187..3eb082978 100644
--- a/src/xrpld/app/tx/detail/URIToken.h
+++ b/src/xrpld/app/tx/detail/URIToken.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TX_URITOKEN_H_INCLUDED
 #define RIPPLE_TX_URITOKEN_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp
index c952aef23..bc6c04295 100644
--- a/src/xrpld/app/tx/detail/XChainBridge.cpp
+++ b/src/xrpld/app/tx/detail/XChainBridge.cpp
@@ -17,31 +17,31 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/Flow.h>
-#include <ripple/app/tx/impl/SignerEntries.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/app/tx/impl/XChainBridge.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Number.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/XChainAttestations.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/st.h>
+#include <xrpld/app/paths/Flow.h>
+#include <xrpld/app/tx/detail/SignerEntries.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpld/app/tx/detail/XChainBridge.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/XChainAttestations.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/st.h>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h
index 4d41c7d1c..822f68772 100644
--- a/src/xrpld/app/tx/detail/XChainBridge.h
+++ b/src/xrpld/app/tx/detail/XChainBridge.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_TX_XCHAINBRIDGE_H_INCLUDED
 #define RIPPLE_TX_XCHAINBRIDGE_H_INCLUDED
 
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/XChainAttestations.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/XChainAttestations.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/XahauGenesis.h b/src/xrpld/app/tx/detail/XahauGenesis.h
index 81cf98fe9..79973fb67 100644
--- a/src/xrpld/app/tx/detail/XahauGenesis.h
+++ b/src/xrpld/app/tx/detail/XahauGenesis.h
@@ -1,7 +1,7 @@
 namespace XahauGenesis {
 // the wasm bytecode is loaded from this file as vec<u8> GovernanceHook and
 // RewardHook
-#include <ripple/app/hook/xahau.h>
+#include <xrpld/app/hook/xahau.h>
 
 using namespace ripple;
 
diff --git a/src/xrpld/app/tx/detail/apply.cpp b/src/xrpld/app/tx/detail/apply.cpp
index a39249a4d..3a4b53a1d 100644
--- a/src/xrpld/app/tx/detail/apply.cpp
+++ b/src/xrpld/app/tx/detail/apply.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/app/tx/applySteps.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Feature.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/app/tx/applySteps.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Feature.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp
index f5f363e6c..b24fc648c 100644
--- a/src/xrpld/app/tx/detail/applySteps.cpp
+++ b/src/xrpld/app/tx/detail/applySteps.cpp
@@ -17,50 +17,50 @@
 */
 //==============================================================================
 
-#include <ripple/app/tx/applySteps.h>
-#include <ripple/app/tx/impl/AMMBid.h>
-#include <ripple/app/tx/impl/AMMCreate.h>
-#include <ripple/app/tx/impl/AMMDelete.h>
-#include <ripple/app/tx/impl/AMMDeposit.h>
-#include <ripple/app/tx/impl/AMMVote.h>
-#include <ripple/app/tx/impl/AMMWithdraw.h>
-#include <ripple/app/tx/impl/ApplyContext.h>
-#include <ripple/app/tx/impl/CancelCheck.h>
-#include <ripple/app/tx/impl/CancelOffer.h>
-#include <ripple/app/tx/impl/CashCheck.h>
-#include <ripple/app/tx/impl/Change.h>
-#include <ripple/app/tx/impl/ClaimReward.h>
-#include <ripple/app/tx/impl/Clawback.h>
-#include <ripple/app/tx/impl/CreateCheck.h>
-#include <ripple/app/tx/impl/CreateOffer.h>
-#include <ripple/app/tx/impl/CreateTicket.h>
-#include <ripple/app/tx/impl/DID.h>
-#include <ripple/app/tx/impl/DeleteAccount.h>
-#include <ripple/app/tx/impl/DeleteOracle.h>
-#include <ripple/app/tx/impl/DepositPreauth.h>
-#include <ripple/app/tx/impl/Escrow.h>
-#include <ripple/app/tx/impl/GenesisMint.h>
-#include <ripple/app/tx/impl/Import.h>
-#include <ripple/app/tx/impl/Invoke.h>
-#include <ripple/app/tx/impl/NFTokenAcceptOffer.h>
-#include <ripple/app/tx/impl/NFTokenBurn.h>
-#include <ripple/app/tx/impl/NFTokenCancelOffer.h>
-#include <ripple/app/tx/impl/NFTokenCreateOffer.h>
-#include <ripple/app/tx/impl/NFTokenMint.h>
-#include <ripple/app/tx/impl/PayChan.h>
-#include <ripple/app/tx/impl/Payment.h>
-#include <ripple/app/tx/impl/Remit.h>
-#include <ripple/app/tx/impl/SetAccount.h>
-#include <ripple/app/tx/impl/SetHook.h>
-#include <ripple/app/tx/impl/SetOracle.h>
-#include <ripple/app/tx/impl/SetRegularKey.h>
-#include <ripple/app/tx/impl/SetRemarks.h>
-#include <ripple/app/tx/impl/SetSignerList.h>
-#include <ripple/app/tx/impl/SetTrust.h>
-#include <ripple/app/tx/impl/URIToken.h>
-#include <ripple/app/tx/impl/XChainBridge.h>
-#include <ripple/app/tx/impl/XahauGenesis.h>
-#include <ripple/protocol/TxFormats.h>
+#include <xrpld/app/tx/applySteps.h>
+#include <xrpld/app/tx/detail/AMMBid.h>
+#include <xrpld/app/tx/detail/AMMCreate.h>
+#include <xrpld/app/tx/detail/AMMDelete.h>
+#include <xrpld/app/tx/detail/AMMDeposit.h>
+#include <xrpld/app/tx/detail/AMMVote.h>
+#include <xrpld/app/tx/detail/AMMWithdraw.h>
+#include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpld/app/tx/detail/CancelCheck.h>
+#include <xrpld/app/tx/detail/CancelOffer.h>
+#include <xrpld/app/tx/detail/CashCheck.h>
+#include <xrpld/app/tx/detail/Change.h>
+#include <xrpld/app/tx/detail/ClaimReward.h>
+#include <xrpld/app/tx/detail/Clawback.h>
+#include <xrpld/app/tx/detail/CreateCheck.h>
+#include <xrpld/app/tx/detail/CreateOffer.h>
+#include <xrpld/app/tx/detail/CreateTicket.h>
+#include <xrpld/app/tx/detail/DID.h>
+#include <xrpld/app/tx/detail/DeleteAccount.h>
+#include <xrpld/app/tx/detail/DeleteOracle.h>
+#include <xrpld/app/tx/detail/DepositPreauth.h>
+#include <xrpld/app/tx/detail/Escrow.h>
+#include <xrpld/app/tx/detail/GenesisMint.h>
+#include <xrpld/app/tx/detail/Import.h>
+#include <xrpld/app/tx/detail/Invoke.h>
+#include <xrpld/app/tx/detail/NFTokenAcceptOffer.h>
+#include <xrpld/app/tx/detail/NFTokenBurn.h>
+#include <xrpld/app/tx/detail/NFTokenCancelOffer.h>
+#include <xrpld/app/tx/detail/NFTokenCreateOffer.h>
+#include <xrpld/app/tx/detail/NFTokenMint.h>
+#include <xrpld/app/tx/detail/PayChan.h>
+#include <xrpld/app/tx/detail/Payment.h>
+#include <xrpld/app/tx/detail/Remit.h>
+#include <xrpld/app/tx/detail/SetAccount.h>
+#include <xrpld/app/tx/detail/SetHook.h>
+#include <xrpld/app/tx/detail/SetOracle.h>
+#include <xrpld/app/tx/detail/SetRegularKey.h>
+#include <xrpld/app/tx/detail/SetRemarks.h>
+#include <xrpld/app/tx/detail/SetSignerList.h>
+#include <xrpld/app/tx/detail/SetTrust.h>
+#include <xrpld/app/tx/detail/URIToken.h>
+#include <xrpld/app/tx/detail/XChainBridge.h>
+#include <xrpld/app/tx/detail/XahauGenesis.h>
+#include <xrpl/protocol/TxFormats.h>
 
 #include <stdexcept>
 
diff --git a/src/xrpld/conditions/Condition.h b/src/xrpld/conditions/Condition.h
index 340b7c961..33f37e458 100644
--- a/src/xrpld/conditions/Condition.h
+++ b/src/xrpld/conditions/Condition.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_CONDITIONS_CONDITION_H
 #define RIPPLE_CONDITIONS_CONDITION_H
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/conditions/impl/utils.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpld/conditions/detail/utils.h>
 #include <array>
 #include <cstdint>
 #include <set>
diff --git a/src/xrpld/conditions/Fulfillment.h b/src/xrpld/conditions/Fulfillment.h
index 075c00510..ce24bed87 100644
--- a/src/xrpld/conditions/Fulfillment.h
+++ b/src/xrpld/conditions/Fulfillment.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_CONDITIONS_FULFILLMENT_H
 #define RIPPLE_CONDITIONS_FULFILLMENT_H
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/impl/utils.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/detail/utils.h>
 
 namespace ripple {
 namespace cryptoconditions {
diff --git a/src/xrpld/conditions/detail/Condition.cpp b/src/xrpld/conditions/detail/Condition.cpp
index 8a1d30916..4ec40eae3 100644
--- a/src/xrpld/conditions/detail/Condition.cpp
+++ b/src/xrpld/conditions/detail/Condition.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/Fulfillment.h>
-#include <ripple/conditions/impl/PreimageSha256.h>
-#include <ripple/conditions/impl/utils.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/Fulfillment.h>
+#include <xrpld/conditions/detail/PreimageSha256.h>
+#include <xrpld/conditions/detail/utils.h>
 #include <iostream>
 #include <vector>
 
diff --git a/src/xrpld/conditions/detail/Fulfillment.cpp b/src/xrpld/conditions/detail/Fulfillment.cpp
index ff47e3864..d4ad665c8 100644
--- a/src/xrpld/conditions/detail/Fulfillment.cpp
+++ b/src/xrpld/conditions/detail/Fulfillment.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/Fulfillment.h>
-#include <ripple/conditions/impl/PreimageSha256.h>
-#include <ripple/conditions/impl/utils.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/Fulfillment.h>
+#include <xrpld/conditions/detail/PreimageSha256.h>
+#include <xrpld/conditions/detail/utils.h>
 #include <type_traits>
 #include <vector>
 
diff --git a/src/xrpld/conditions/detail/PreimageSha256.h b/src/xrpld/conditions/detail/PreimageSha256.h
index 316e57ac1..cda6438ef 100644
--- a/src/xrpld/conditions/detail/PreimageSha256.h
+++ b/src/xrpld/conditions/detail/PreimageSha256.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_CONDITIONS_PREIMAGE_SHA256_H
 #define RIPPLE_CONDITIONS_PREIMAGE_SHA256_H
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/conditions/Condition.h>
-#include <ripple/conditions/Fulfillment.h>
-#include <ripple/conditions/impl/error.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpld/conditions/Condition.h>
+#include <xrpld/conditions/Fulfillment.h>
+#include <xrpld/conditions/detail/error.h>
+#include <xrpl/protocol/digest.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/conditions/detail/error.cpp b/src/xrpld/conditions/detail/error.cpp
index f685a4589..d3b07b146 100644
--- a/src/xrpld/conditions/detail/error.cpp
+++ b/src/xrpld/conditions/detail/error.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/conditions/impl/error.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/conditions/detail/error.h>
 #include <string>
 #include <system_error>
 #include <type_traits>
diff --git a/src/xrpld/conditions/detail/utils.h b/src/xrpld/conditions/detail/utils.h
index e9ab1770a..47e192879 100644
--- a/src/xrpld/conditions/detail/utils.h
+++ b/src/xrpld/conditions/detail/utils.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_CONDITIONS_UTILS_H
 #define RIPPLE_CONDITIONS_UTILS_H
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/conditions/impl/error.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpld/conditions/detail/error.h>
 #include <boost/dynamic_bitset.hpp>
 #include <iomanip>
 #include <limits>
diff --git a/src/xrpld/consensus/Consensus.cpp b/src/xrpld/consensus/Consensus.cpp
index cc1f84270..0ac1942a1 100644
--- a/src/xrpld/consensus/Consensus.cpp
+++ b/src/xrpld/consensus/Consensus.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/consensus/Consensus.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/consensus/Consensus.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index ccd909a00..81a858d06 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED
 #define RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/consensus/ConsensusParms.h>
-#include <ripple/consensus/ConsensusProposal.h>
-#include <ripple/consensus/ConsensusTypes.h>
-#include <ripple/consensus/DisputedTx.h>
-#include <ripple/consensus/LedgerTiming.h>
-#include <ripple/json/json_writer.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/consensus/ConsensusParms.h>
+#include <xrpld/consensus/ConsensusProposal.h>
+#include <xrpld/consensus/ConsensusTypes.h>
+#include <xrpld/consensus/DisputedTx.h>
+#include <xrpld/consensus/LedgerTiming.h>
+#include <xrpl/json/json_writer.h>
 #include <boost/logic/tribool.hpp>
 
 #include <chrono>
diff --git a/src/xrpld/consensus/ConsensusProposal.h b/src/xrpld/consensus/ConsensusProposal.h
index c5103cfe0..c00bffe02 100644
--- a/src/xrpld/consensus/ConsensusProposal.h
+++ b/src/xrpld/consensus/ConsensusProposal.h
@@ -19,11 +19,11 @@
 #ifndef RIPPLE_CONSENSUS_CONSENSUSPROPOSAL_H_INCLUDED
 #define RIPPLE_CONSENSUS_CONSENSUSPROPOSAL_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/jss.h>
 #include <cstdint>
 #include <optional>
 
diff --git a/src/xrpld/consensus/ConsensusTypes.h b/src/xrpld/consensus/ConsensusTypes.h
index 05d03c8a9..743c97dd9 100644
--- a/src/xrpld/consensus/ConsensusTypes.h
+++ b/src/xrpld/consensus/ConsensusTypes.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED
 #define RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/consensus/ConsensusProposal.h>
-#include <ripple/consensus/DisputedTx.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/consensus/ConsensusProposal.h>
+#include <xrpld/consensus/DisputedTx.h>
 #include <chrono>
 #include <map>
 
diff --git a/src/xrpld/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h
index ae127197e..ec2f20b18 100644
--- a/src/xrpld/consensus/DisputedTx.h
+++ b/src/xrpld/consensus/DisputedTx.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/consensus/ConsensusParms.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/UintTypes.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/consensus/ConsensusParms.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <boost/container/flat_map.hpp>
 #include <memory>
 
diff --git a/src/xrpld/consensus/LedgerTiming.h b/src/xrpld/consensus/LedgerTiming.h
index 9320cf07d..1bb5bfd73 100644
--- a/src/xrpld/consensus/LedgerTiming.h
+++ b/src/xrpld/consensus/LedgerTiming.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED
 #define RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <chrono>
 #include <cstdint>
 
diff --git a/src/xrpld/consensus/LedgerTrie.h b/src/xrpld/consensus/LedgerTrie.h
index 12cd0d3cb..32bae28cc 100644
--- a/src/xrpld/consensus/LedgerTrie.h
+++ b/src/xrpld/consensus/LedgerTrie.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_CONSENSUS_LEDGERS_TRIE_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_LEDGERS_TRIE_H_INCLUDED
 
-#include <ripple/basics/ToString.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/ToString.h>
+#include <xrpl/json/json_value.h>
 #include <algorithm>
 #include <iomanip>
 #include <memory>
diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h
index 1bef76d96..0dd042635 100644
--- a/src/xrpld/consensus/Validations.h
+++ b/src/xrpld/consensus/Validations.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED
 #define RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/container/aged_container_utility.h>
-#include <ripple/beast/container/aged_unordered_map.h>
-#include <ripple/consensus/LedgerTrie.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/container/aged_container_utility.h>
+#include <xrpl/beast/container/aged_unordered_map.h>
+#include <xrpld/consensus/LedgerTrie.h>
+#include <xrpl/protocol/PublicKey.h>
 
 #include <mutex>
 #include <optional>
diff --git a/src/xrpld/core/ClosureCounter.h b/src/xrpld/core/ClosureCounter.h
index 9f5bc3ee6..9b1a69bf9 100644
--- a/src/xrpld/core/ClosureCounter.h
+++ b/src/xrpld/core/ClosureCounter.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CORE_CLOSURE_COUNTER_H_INCLUDED
 #define RIPPLE_CORE_CLOSURE_COUNTER_H_INCLUDED
 
-#include <ripple/basics/Log.h>
+#include <xrpl/basics/Log.h>
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/xrpld/core/Config.h b/src/xrpld/core/Config.h
index 6aff1d30e..0b6b252b1 100644
--- a/src/xrpld/core/Config.h
+++ b/src/xrpld/core/Config.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_CORE_CONFIG_H_INCLUDED
 #define RIPPLE_CORE_CONFIG_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/SystemParameters.h>  // VFALCO Breaks levelization
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SystemParameters.h>  // VFALCO Breaks levelization
 
 #include <boost/beast/core/string.hpp>
 #include <boost/filesystem.hpp>  // VFALCO FIX: This include should not be here
diff --git a/src/xrpld/core/Coro.ipp b/src/xrpld/core/Coro.ipp
index 2b07c5a45..a936dd896 100644
--- a/src/xrpld/core/Coro.ipp
+++ b/src/xrpld/core/Coro.ipp
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CORE_COROINL_H_INCLUDED
 #define RIPPLE_CORE_COROINL_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
+#include <xrpl/basics/ByteUtilities.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/core/DatabaseCon.h b/src/xrpld/core/DatabaseCon.h
index 91d2a4466..f80b43eb6 100644
--- a/src/xrpld/core/DatabaseCon.h
+++ b/src/xrpld/core/DatabaseCon.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_APP_DATA_DATABASECON_H_INCLUDED
 #define RIPPLE_APP_DATA_DATABASECON_H_INCLUDED
 
-#include <ripple/app/main/DBInit.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/SociDB.h>
+#include <xrpld/app/main/DBInit.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/SociDB.h>
 #include <boost/filesystem/path.hpp>
 #include <mutex>
 #include <optional>
diff --git a/src/xrpld/core/Job.h b/src/xrpld/core/Job.h
index c4f2eddf3..9cc532820 100644
--- a/src/xrpld/core/Job.h
+++ b/src/xrpld/core/Job.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_CORE_JOB_H_INCLUDED
 #define RIPPLE_CORE_JOB_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/core/ClosureCounter.h>
-#include <ripple/core/LoadMonitor.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpld/core/ClosureCounter.h>
+#include <xrpld/core/LoadMonitor.h>
 #include <functional>
 
 #include <functional>
diff --git a/src/xrpld/core/JobQueue.h b/src/xrpld/core/JobQueue.h
index a9d541baa..9e06c34e2 100644
--- a/src/xrpld/core/JobQueue.h
+++ b/src/xrpld/core/JobQueue.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_CORE_JOBQUEUE_H_INCLUDED
 #define RIPPLE_CORE_JOBQUEUE_H_INCLUDED
 
-#include <ripple/basics/LocalValue.h>
-#include <ripple/core/ClosureCounter.h>
-#include <ripple/core/JobTypeData.h>
-#include <ripple/core/JobTypes.h>
-#include <ripple/core/impl/Workers.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/LocalValue.h>
+#include <xrpld/core/ClosureCounter.h>
+#include <xrpld/core/JobTypeData.h>
+#include <xrpld/core/JobTypes.h>
+#include <xrpld/core/detail/Workers.h>
+#include <xrpl/json/json_value.h>
 #include <boost/coroutine/all.hpp>
 #include <boost/range/begin.hpp>  // workaround for boost 1.72 bug
 #include <boost/range/end.hpp>    // workaround for boost 1.72 bug
@@ -402,7 +402,7 @@ private:
 
 }  // namespace ripple
 
-#include <ripple/core/Coro.ipp>
+#include <xrpld/core/Coro.ipp>
 
 namespace ripple {
 
diff --git a/src/xrpld/core/JobTypeData.h b/src/xrpld/core/JobTypeData.h
index 3f0cdb6e9..ebffdbdb1 100644
--- a/src/xrpld/core/JobTypeData.h
+++ b/src/xrpld/core/JobTypeData.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED
 #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/core/JobTypeInfo.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpld/core/JobTypeInfo.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/core/JobTypeInfo.h b/src/xrpld/core/JobTypeInfo.h
index 7ed7c4697..a521980eb 100644
--- a/src/xrpld/core/JobTypeInfo.h
+++ b/src/xrpld/core/JobTypeInfo.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_CORE_JOBTYPEINFO_H_INCLUDED
 #define RIPPLE_CORE_JOBTYPEINFO_H_INCLUDED
 
-#include <ripple/core/Job.h>
+#include <xrpld/core/Job.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/core/JobTypes.h b/src/xrpld/core/JobTypes.h
index 2803537f1..2dbc45ca1 100644
--- a/src/xrpld/core/JobTypes.h
+++ b/src/xrpld/core/JobTypes.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_JOBTYPES_H_INCLUDED
 #define RIPPLE_CORE_JOBTYPES_H_INCLUDED
 
-#include <ripple/core/Job.h>
-#include <ripple/core/JobTypeInfo.h>
+#include <xrpld/core/Job.h>
+#include <xrpld/core/JobTypeInfo.h>
 #include <map>
 #include <string>
 #include <type_traits>
diff --git a/src/xrpld/core/LoadMonitor.h b/src/xrpld/core/LoadMonitor.h
index e903bf25e..209cab45b 100644
--- a/src/xrpld/core/LoadMonitor.h
+++ b/src/xrpld/core/LoadMonitor.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_CORE_LOADMONITOR_H_INCLUDED
 #define RIPPLE_CORE_LOADMONITOR_H_INCLUDED
 
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/LoadEvent.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/LoadEvent.h>
 #include <chrono>
 #include <mutex>
 
diff --git a/src/xrpld/core/Pg.cpp b/src/xrpld/core/Pg.cpp
index df0f6da5e..18867d9c1 100644
--- a/src/xrpld/core/Pg.cpp
+++ b/src/xrpld/core/Pg.cpp
@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #endif
 
-#include <ripple/basics/contract.h>
-#include <ripple/core/Pg.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Pg.h>
 #include <boost/asio/ssl/detail/openssl_init.hpp>
 #include <boost/format.hpp>
 #include <algorithm>
diff --git a/src/xrpld/core/Pg.h b/src/xrpld/core/Pg.h
index b2e8f465c..c1333ed66 100644
--- a/src/xrpld/core/Pg.h
+++ b/src/xrpld/core/Pg.h
@@ -21,9 +21,9 @@
 #ifndef RIPPLE_CORE_PG_H_INCLUDED
 #define RIPPLE_CORE_PG_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Protocol.h>
 #include <boost/lexical_cast.hpp>
 #include <atomic>
 #include <chrono>
diff --git a/src/xrpld/core/SociDB.h b/src/xrpld/core/SociDB.h
index 621754098..9046a18a5 100644
--- a/src/xrpld/core/SociDB.h
+++ b/src/xrpld/core/SociDB.h
@@ -33,8 +33,8 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #endif
 
-#include <ripple/basics/Log.h>
-#include <ripple/core/JobQueue.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/JobQueue.h>
 #define SOCI_USE_BOOST
 #include <cstdint>
 #include <soci/soci.h>
diff --git a/src/xrpld/core/TimeKeeper.h b/src/xrpld/core/TimeKeeper.h
index e239a2f75..f94a92a66 100644
--- a/src/xrpld/core/TimeKeeper.h
+++ b/src/xrpld/core/TimeKeeper.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_TIMEKEEPER_H_INCLUDED
 #define RIPPLE_CORE_TIMEKEEPER_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/clock/abstract_clock.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/clock/abstract_clock.h>
 
 #include <atomic>
 
diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
index 8d4fcffb9..c88b2a797 100644
--- a/src/xrpld/core/detail/Config.cpp
+++ b/src/xrpld/core/detail/Config.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/basics/FileUtilities.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/net/HTTPClient.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/SystemParameters.h>
+#include <xrpl/basics/FileUtilities.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/net/HTTPClient.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 #include <boost/predef.h>
diff --git a/src/xrpld/core/detail/DatabaseCon.cpp b/src/xrpld/core/detail/DatabaseCon.cpp
index 4f65f7003..102461313 100644
--- a/src/xrpld/core/detail/DatabaseCon.cpp
+++ b/src/xrpld/core/detail/DatabaseCon.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/SociDB.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/SociDB.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
diff --git a/src/xrpld/core/detail/Job.cpp b/src/xrpld/core/detail/Job.cpp
index 780a9f49c..5c8be67f2 100644
--- a/src/xrpld/core/detail/Job.cpp
+++ b/src/xrpld/core/detail/Job.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/core/Job.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpld/core/Job.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/core/detail/JobQueue.cpp b/src/xrpld/core/detail/JobQueue.cpp
index 28947300c..4fb432362 100644
--- a/src/xrpld/core/detail/JobQueue.cpp
+++ b/src/xrpld/core/detail/JobQueue.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/JobQueue.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/JobQueue.h>
 #include <mutex>
 
 namespace ripple {
diff --git a/src/xrpld/core/detail/LoadEvent.cpp b/src/xrpld/core/detail/LoadEvent.cpp
index 38617e7f5..ca78fdb19 100644
--- a/src/xrpld/core/detail/LoadEvent.cpp
+++ b/src/xrpld/core/detail/LoadEvent.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/core/LoadEvent.h>
-#include <ripple/core/LoadMonitor.h>
+#include <xrpld/core/LoadEvent.h>
+#include <xrpld/core/LoadMonitor.h>
 #include <cassert>
 #include <iomanip>
 
diff --git a/src/xrpld/core/detail/LoadMonitor.cpp b/src/xrpld/core/detail/LoadMonitor.cpp
index e70b7947a..9ea744428 100644
--- a/src/xrpld/core/detail/LoadMonitor.cpp
+++ b/src/xrpld/core/detail/LoadMonitor.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/core/LoadMonitor.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpld/core/LoadMonitor.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/core/detail/SociDB.cpp b/src/xrpld/core/detail/SociDB.cpp
index 2d1332636..65e98a39d 100644
--- a/src/xrpld/core/detail/SociDB.cpp
+++ b/src/xrpld/core/detail/SociDB.cpp
@@ -22,12 +22,12 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #endif
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/SociDB.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/SociDB.h>
 #include <boost/filesystem.hpp>
 #include <memory>
 #include <soci/sqlite3/soci-sqlite3.h>
diff --git a/src/xrpld/core/detail/Workers.cpp b/src/xrpld/core/detail/Workers.cpp
index 732e6f0ec..781463f52 100644
--- a/src/xrpld/core/detail/Workers.cpp
+++ b/src/xrpld/core/detail/Workers.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/PerfLog.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/core/impl/Workers.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpld/core/detail/Workers.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/core/detail/Workers.h b/src/xrpld/core/detail/Workers.h
index 88ab8fa27..45fe11db0 100644
--- a/src/xrpld/core/detail/Workers.h
+++ b/src/xrpld/core/detail/Workers.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_CORE_WORKERS_H_INCLUDED
 #define RIPPLE_CORE_WORKERS_H_INCLUDED
 
-#include <ripple/beast/core/LockFreeStack.h>
-#include <ripple/core/impl/semaphore.h>
+#include <xrpl/beast/core/LockFreeStack.h>
+#include <xrpld/core/detail/semaphore.h>
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
diff --git a/src/xrpld/ledger/ApplyView.h b/src/xrpld/ledger/ApplyView.h
index c68a29e7a..30354a283 100644
--- a/src/xrpld/ledger/ApplyView.h
+++ b/src/xrpld/ledger/ApplyView.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED
 #define RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/ReadView.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/ApplyViewImpl.h b/src/xrpld/ledger/ApplyViewImpl.h
index cd96919d6..8069eaf32 100644
--- a/src/xrpld/ledger/ApplyViewImpl.h
+++ b/src/xrpld/ledger/ApplyViewImpl.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_LEDGER_APPLYVIEWIMPL_H_INCLUDED
 #define RIPPLE_LEDGER_APPLYVIEWIMPL_H_INCLUDED
 
-#include <ripple/ledger/OpenView.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/TER.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/TER.h>
 #include <algorithm>
 #include <iterator>
 #include <optional>
diff --git a/src/xrpld/ledger/BookDirs.h b/src/xrpld/ledger/BookDirs.h
index 86ea67d91..2c27a5b65 100644
--- a/src/xrpld/ledger/BookDirs.h
+++ b/src/xrpld/ledger/BookDirs.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_LEDGER_BOOK_DIRS_H_INCLUDED
 #define RIPPLE_LEDGER_BOOK_DIRS_H_INCLUDED
 
-#include <ripple/ledger/ReadView.h>
+#include <xrpld/ledger/ReadView.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/CachedSLEs.h b/src/xrpld/ledger/CachedSLEs.h
index d2b04e2cb..bc94092e2 100644
--- a/src/xrpld/ledger/CachedSLEs.h
+++ b/src/xrpld/ledger/CachedSLEs.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_LEDGER_CACHEDSLES_H_INCLUDED
 #define RIPPLE_LEDGER_CACHEDSLES_H_INCLUDED
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/protocol/STLedgerEntry.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/STLedgerEntry.h>
 
 namespace ripple {
 using CachedSLEs = TaggedCache<uint256, SLE const>;
diff --git a/src/xrpld/ledger/CachedView.h b/src/xrpld/ledger/CachedView.h
index da483b349..7fd4a473e 100644
--- a/src/xrpld/ledger/CachedView.h
+++ b/src/xrpld/ledger/CachedView.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED
 #define RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED
 
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/ledger/CachedSLEs.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpld/ledger/CachedSLEs.h>
+#include <xrpld/ledger/ReadView.h>
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/ledger/Directory.h b/src/xrpld/ledger/Directory.h
index 0efcf43e7..cc8b3c13a 100644
--- a/src/xrpld/ledger/Directory.h
+++ b/src/xrpld/ledger/Directory.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_LEDGER_DIR_H_INCLUDED
 #define RIPPLE_LEDGER_DIR_H_INCLUDED
 
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/OpenView.h b/src/xrpld/ledger/OpenView.h
index 98b783e3a..82758a161 100644
--- a/src/xrpld/ledger/OpenView.h
+++ b/src/xrpld/ledger/OpenView.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_LEDGER_OPENVIEW_H_INCLUDED
 #define RIPPLE_LEDGER_OPENVIEW_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/detail/RawStateTable.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/detail/RawStateTable.h>
 
 #include <boost/container/pmr/monotonic_buffer_resource.hpp>
 #include <boost/container/pmr/polymorphic_allocator.hpp>
diff --git a/src/xrpld/ledger/PaymentSandbox.h b/src/xrpld/ledger/PaymentSandbox.h
index 60e42af11..d7299b2ef 100644
--- a/src/xrpld/ledger/PaymentSandbox.h
+++ b/src/xrpld/ledger/PaymentSandbox.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_LEDGER_PAYMENTSANDBOX_H_INCLUDED
 #define RIPPLE_LEDGER_PAYMENTSANDBOX_H_INCLUDED
 
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
-#include <ripple/protocol/AccountID.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
+#include <xrpl/protocol/AccountID.h>
 #include <map>
 #include <utility>
 
diff --git a/src/xrpld/ledger/RawView.h b/src/xrpld/ledger/RawView.h
index 29c9ab9ab..cd9bcff87 100644
--- a/src/xrpld/ledger/RawView.h
+++ b/src/xrpld/ledger/RawView.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_LEDGER_RAWVIEW_H_INCLUDED
 #define RIPPLE_LEDGER_RAWVIEW_H_INCLUDED
 
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/Serializer.h>
 #include <cstdint>
 #include <memory>
 #include <utility>
diff --git a/src/xrpld/ledger/ReadView.h b/src/xrpld/ledger/ReadView.h
index 2ea3ab492..56c31f6f0 100644
--- a/src/xrpld/ledger/ReadView.h
+++ b/src/xrpld/ledger/ReadView.h
@@ -20,21 +20,21 @@
 #ifndef RIPPLE_LEDGER_READVIEW_H_INCLUDED
 #define RIPPLE_LEDGER_READVIEW_H_INCLUDED
 
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/detail/ReadViewFwdRange.h>
-#include <ripple/protocol/Fees.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/LedgerHeader.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/Rules.h>
-#include <ripple/protocol/STAmount.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/STTx.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/IOUAmount.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/detail/ReadViewFwdRange.h>
+#include <xrpl/protocol/Fees.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerHeader.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STTx.h>
 #include <cassert>
 #include <cstdint>
 #include <memory>
@@ -283,6 +283,6 @@ makeRulesGivenLedger(
 
 }  // namespace ripple
 
-#include <ripple/ledger/detail/ReadViewFwdRange.ipp>
+#include <xrpld/ledger/detail/ReadViewFwdRange.ipp>
 
 #endif
diff --git a/src/xrpld/ledger/Sandbox.h b/src/xrpld/ledger/Sandbox.h
index d8610a69e..22b8dbecf 100644
--- a/src/xrpld/ledger/Sandbox.h
+++ b/src/xrpld/ledger/Sandbox.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_LEDGER_SANDBOX_H_INCLUDED
 #define RIPPLE_LEDGER_SANDBOX_H_INCLUDED
 
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/View.h b/src/xrpld/ledger/View.h
index da2cd37a3..e677755df 100644
--- a/src/xrpld/ledger/View.h
+++ b/src/xrpld/ledger/View.h
@@ -20,22 +20,22 @@
 #ifndef RIPPLE_LEDGER_VIEW_H_INCLUDED
 #define RIPPLE_LEDGER_VIEW_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/Config.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/OpenView.h>
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/Sandbox.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/Rate.h>
-#include <ripple/protocol/STLedgerEntry.h>
-#include <ripple/protocol/STObject.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/Sandbox.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/TER.h>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/src/xrpld/ledger/detail/ApplyStateTable.cpp b/src/xrpld/ledger/detail/ApplyStateTable.cpp
index ddda1707a..f5a7df44a 100644
--- a/src/xrpld/ledger/detail/ApplyStateTable.cpp
+++ b/src/xrpld/ledger/detail/ApplyStateTable.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/json/to_string.h>
-#include <ripple/ledger/detail/ApplyStateTable.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/st.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/ledger/detail/ApplyStateTable.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/st.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/ApplyStateTable.h b/src/xrpld/ledger/detail/ApplyStateTable.h
index f88063b3c..a1d1a45af 100644
--- a/src/xrpld/ledger/detail/ApplyStateTable.h
+++ b/src/xrpld/ledger/detail/ApplyStateTable.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED
 #define RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/ledger/OpenView.h>
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxMeta.h>
 #include <memory>
 #include <utility>
 
diff --git a/src/xrpld/ledger/detail/ApplyView.cpp b/src/xrpld/ledger/detail/ApplyView.cpp
index 779a0c7e0..71e58ab4b 100644
--- a/src/xrpld/ledger/detail/ApplyView.cpp
+++ b/src/xrpld/ledger/detail/ApplyView.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpl/protocol/Protocol.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/ApplyViewBase.cpp b/src/xrpld/ledger/detail/ApplyViewBase.cpp
index 1946f5c04..1ca82b12b 100644
--- a/src/xrpld/ledger/detail/ApplyViewBase.cpp
+++ b/src/xrpld/ledger/detail/ApplyViewBase.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/detail/ApplyViewBase.h>
-#include <ripple/protocol/STAccount.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/detail/ApplyViewBase.h>
+#include <xrpl/protocol/STAccount.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/ledger/detail/ApplyViewBase.h b/src/xrpld/ledger/detail/ApplyViewBase.h
index 346c25592..6ca1d94bc 100644
--- a/src/xrpld/ledger/detail/ApplyViewBase.h
+++ b/src/xrpld/ledger/detail/ApplyViewBase.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED
 #define RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/ledger/OpenView.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/detail/ApplyStateTable.h>
+#include <xrpl/basics/XRPAmount.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/ledger/OpenView.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/detail/ApplyStateTable.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/ledger/detail/ApplyViewImpl.cpp b/src/xrpld/ledger/detail/ApplyViewImpl.cpp
index 0fa56141c..9ee0a0563 100644
--- a/src/xrpld/ledger/detail/ApplyViewImpl.cpp
+++ b/src/xrpld/ledger/detail/ApplyViewImpl.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/ApplyViewImpl.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/ApplyViewImpl.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/BookDirs.cpp b/src/xrpld/ledger/detail/BookDirs.cpp
index f8589d557..58527b02f 100644
--- a/src/xrpld/ledger/detail/BookDirs.cpp
+++ b/src/xrpld/ledger/detail/BookDirs.cpp
@@ -18,9 +18,9 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/BookDirs.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Indexes.h>
+#include <xrpld/ledger/BookDirs.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/detail/CachedView.cpp b/src/xrpld/ledger/detail/CachedView.cpp
index 587d50abf..5dceaef70 100644
--- a/src/xrpld/ledger/detail/CachedView.cpp
+++ b/src/xrpld/ledger/detail/CachedView.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/CachedView.h>
-#include <ripple/protocol/Serializer.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/CachedView.h>
+#include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/ledger/detail/Directory.cpp b/src/xrpld/ledger/detail/Directory.cpp
index 759b4d71b..9153d013f 100644
--- a/src/xrpld/ledger/detail/Directory.cpp
+++ b/src/xrpld/ledger/detail/Directory.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/Directory.h>
+#include <xrpld/ledger/Directory.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/detail/OpenView.cpp b/src/xrpld/ledger/detail/OpenView.cpp
index fd03d7665..1b2a0d1c9 100644
--- a/src/xrpld/ledger/detail/OpenView.cpp
+++ b/src/xrpld/ledger/detail/OpenView.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/OpenView.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/OpenView.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/detail/PaymentSandbox.cpp b/src/xrpld/ledger/detail/PaymentSandbox.cpp
index 168026639..4ef6712d9 100644
--- a/src/xrpld/ledger/detail/PaymentSandbox.cpp
+++ b/src/xrpld/ledger/detail/PaymentSandbox.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/STAccount.h>
+#include <xrpld/app/paths/detail/AmountSpec.h>
+#include <xrpld/ledger/PaymentSandbox.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
 
 #include <cassert>
 
diff --git a/src/xrpld/ledger/detail/RawStateTable.cpp b/src/xrpld/ledger/detail/RawStateTable.cpp
index 019ef6156..69201157a 100644
--- a/src/xrpld/ledger/detail/RawStateTable.cpp
+++ b/src/xrpld/ledger/detail/RawStateTable.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/detail/RawStateTable.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/detail/RawStateTable.h>
 
 namespace ripple {
 namespace detail {
diff --git a/src/xrpld/ledger/detail/RawStateTable.h b/src/xrpld/ledger/detail/RawStateTable.h
index 2bb38dc49..2db37d983 100644
--- a/src/xrpld/ledger/detail/RawStateTable.h
+++ b/src/xrpld/ledger/detail/RawStateTable.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_LEDGER_RAWSTATETABLE_H_INCLUDED
 #define RIPPLE_LEDGER_RAWSTATETABLE_H_INCLUDED
 
-#include <ripple/ledger/RawView.h>
-#include <ripple/ledger/ReadView.h>
+#include <xrpld/ledger/RawView.h>
+#include <xrpld/ledger/ReadView.h>
 
 #include <boost/container/pmr/monotonic_buffer_resource.hpp>
 #include <boost/container/pmr/polymorphic_allocator.hpp>
diff --git a/src/xrpld/ledger/detail/ReadView.cpp b/src/xrpld/ledger/detail/ReadView.cpp
index cdb830abb..7a05f8e66 100644
--- a/src/xrpld/ledger/detail/ReadView.cpp
+++ b/src/xrpld/ledger/detail/ReadView.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/Rules.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/Rules.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/ledger/detail/View.cpp b/src/xrpld/ledger/detail/View.cpp
index 72fc9703e..d0fdd91e0 100644
--- a/src/xrpld/ledger/detail/View.cpp
+++ b/src/xrpld/ledger/detail/View.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/contract.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/Quality.h>
-#include <ripple/protocol/st.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/st.h>
 #include <cassert>
 #include <optional>
 
diff --git a/src/xrpld/net/AutoSocket.h b/src/xrpld/net/AutoSocket.h
index e64c7a1e5..be35c0824 100644
--- a/src/xrpld/net/AutoSocket.h
+++ b/src/xrpld/net/AutoSocket.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED
 #define RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/net/IPAddressConversion.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/xrpld/net/DatabaseBody.h b/src/xrpld/net/DatabaseBody.h
index 4c74b879a..061754d0e 100644
--- a/src/xrpld/net/DatabaseBody.h
+++ b/src/xrpld/net/DatabaseBody.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NET_DATABASEBODY_H
 #define RIPPLE_NET_DATABASEBODY_H
 
-#include <ripple/core/DatabaseCon.h>
+#include <xrpld/core/DatabaseCon.h>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/beast/http/message.hpp>
@@ -177,6 +177,6 @@ public:
 
 }  // namespace ripple
 
-#include <ripple/net/impl/DatabaseBody.ipp>
+#include <xrpld/net/detail/DatabaseBody.ipp>
 
 #endif  // RIPPLE_NET_DATABASEBODY_H
diff --git a/src/xrpld/net/DatabaseDownloader.h b/src/xrpld/net/DatabaseDownloader.h
index 476939e1f..4ca922660 100644
--- a/src/xrpld/net/DatabaseDownloader.h
+++ b/src/xrpld/net/DatabaseDownloader.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NET_DATABASEDOWNLOADER_H
 #define RIPPLE_NET_DATABASEDOWNLOADER_H
 
-#include <ripple/net/DatabaseBody.h>
-#include <ripple/net/HTTPDownloader.h>
+#include <xrpld/net/DatabaseBody.h>
+#include <xrpld/net/HTTPDownloader.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/net/HTTPClient.h b/src/xrpld/net/HTTPClient.h
index f133e3ee0..ff8c26034 100644
--- a/src/xrpld/net/HTTPClient.h
+++ b/src/xrpld/net/HTTPClient.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NET_HTTPCLIENT_H_INCLUDED
 #define RIPPLE_NET_HTTPCLIENT_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/core/Config.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpld/core/Config.h>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/streambuf.hpp>
 
diff --git a/src/xrpld/net/HTTPClientSSLContext.h b/src/xrpld/net/HTTPClientSSLContext.h
index b0f6942ae..5c515a79f 100644
--- a/src/xrpld/net/HTTPClientSSLContext.h
+++ b/src/xrpld/net/HTTPClientSSLContext.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED
 #define RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/net/RegisterSSLCerts.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/net/RegisterSSLCerts.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/xrpld/net/HTTPDownloader.h b/src/xrpld/net/HTTPDownloader.h
index 34e81ea1f..8fc09473f 100644
--- a/src/xrpld/net/HTTPDownloader.h
+++ b/src/xrpld/net/HTTPDownloader.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED
 #define RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/net/HTTPStream.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/net/HTTPStream.h>
 
 #include <boost/asio/connect.hpp>
 #include <boost/asio/io_service.hpp>
diff --git a/src/xrpld/net/HTTPStream.h b/src/xrpld/net/HTTPStream.h
index f5aaaa48a..275d8ca95 100644
--- a/src/xrpld/net/HTTPStream.h
+++ b/src/xrpld/net/HTTPStream.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NET_HTTPSTREAM_H_INCLUDED
 #define RIPPLE_NET_HTTPSTREAM_H_INCLUDED
 
-#include <ripple/core/Config.h>
-#include <ripple/net/HTTPClientSSLContext.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/net/HTTPClientSSLContext.h>
 
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/strand.hpp>
diff --git a/src/xrpld/net/InfoSub.h b/src/xrpld/net/InfoSub.h
index 33441dde6..08fba26ff 100644
--- a/src/xrpld/net/InfoSub.h
+++ b/src/xrpld/net/InfoSub.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_NET_INFOSUB_H_INCLUDED
 #define RIPPLE_NET_INFOSUB_H_INCLUDED
 
-#include <ripple/app/misc/Manifest.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/Book.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/resource/Consumer.h>
+#include <xrpld/app/misc/Manifest.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/resource/Consumer.h>
 #include <mutex>
 
 namespace ripple {
diff --git a/src/xrpld/net/RPCCall.h b/src/xrpld/net/RPCCall.h
index 600fad28e..1147bdaa0 100644
--- a/src/xrpld/net/RPCCall.h
+++ b/src/xrpld/net/RPCCall.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NET_RPCCALL_H_INCLUDED
 #define RIPPLE_NET_RPCCALL_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/json_value.h>
 #include <boost/asio/io_service.hpp>
 #include <functional>
 #include <string>
diff --git a/src/xrpld/net/RPCSub.h b/src/xrpld/net/RPCSub.h
index e2193b1ce..b2a751d4a 100644
--- a/src/xrpld/net/RPCSub.h
+++ b/src/xrpld/net/RPCSub.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NET_RPCSUB_H_INCLUDED
 #define RIPPLE_NET_RPCSUB_H_INCLUDED
 
-#include <ripple/core/JobQueue.h>
-#include <ripple/net/InfoSub.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/net/InfoSub.h>
 #include <boost/asio/io_service.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/net/RegisterSSLCerts.h b/src/xrpld/net/RegisterSSLCerts.h
index 8b09f1031..88664139f 100644
--- a/src/xrpld/net/RegisterSSLCerts.h
+++ b/src/xrpld/net/RegisterSSLCerts.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NET_REGISTER_SSL_CERTS_H_INCLUDED
 #define RIPPLE_NET_REGISTER_SSL_CERTS_H_INCLUDED
 
-#include <ripple/basics/Log.h>
+#include <xrpl/basics/Log.h>
 #include <boost/asio/ssl/context.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/net/detail/DatabaseBody.ipp b/src/xrpld/net/detail/DatabaseBody.ipp
index 71478606e..26d61e885 100644
--- a/src/xrpld/net/detail/DatabaseBody.ipp
+++ b/src/xrpld/net/detail/DatabaseBody.ipp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/app/rdb/Download.h>
+#include <xrpld/app/rdb/Download.h>
 #include <fstream>
 
 namespace ripple {
diff --git a/src/xrpld/net/detail/DatabaseDownloader.cpp b/src/xrpld/net/detail/DatabaseDownloader.cpp
index 52388cf0d..5aff1cef0 100644
--- a/src/xrpld/net/detail/DatabaseDownloader.cpp
+++ b/src/xrpld/net/detail/DatabaseDownloader.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/net/DatabaseDownloader.h>
+#include <xrpld/net/DatabaseDownloader.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/net/detail/HTTPClient.cpp b/src/xrpld/net/detail/HTTPClient.cpp
index 6ab013175..b3609061e 100644
--- a/src/xrpld/net/detail/HTTPClient.cpp
+++ b/src/xrpld/net/detail/HTTPClient.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/net/AutoSocket.h>
-#include <ripple/net/HTTPClient.h>
-#include <ripple/net/HTTPClientSSLContext.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/net/AutoSocket.h>
+#include <xrpld/net/HTTPClient.h>
+#include <xrpld/net/HTTPClientSSLContext.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/xrpld/net/detail/HTTPDownloader.cpp b/src/xrpld/net/detail/HTTPDownloader.cpp
index 43bf8d925..20ea057ab 100644
--- a/src/xrpld/net/detail/HTTPDownloader.cpp
+++ b/src/xrpld/net/detail/HTTPDownloader.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/net/HTTPDownloader.h>
+#include <xrpld/net/HTTPDownloader.h>
 #include <boost/asio/ssl.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/net/detail/HTTPStream.cpp b/src/xrpld/net/detail/HTTPStream.cpp
index d23576773..b94f8959e 100644
--- a/src/xrpld/net/detail/HTTPStream.cpp
+++ b/src/xrpld/net/detail/HTTPStream.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/net/HTTPStream.h>
+#include <xrpld/net/HTTPStream.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/net/detail/InfoSub.cpp b/src/xrpld/net/detail/InfoSub.cpp
index 5b37cf075..3dc891cb5 100644
--- a/src/xrpld/net/detail/InfoSub.cpp
+++ b/src/xrpld/net/detail/InfoSub.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/net/InfoSub.h>
+#include <xrpld/net/InfoSub.h>
 #include <atomic>
 
 namespace ripple {
diff --git a/src/xrpld/net/detail/RPCCall.cpp b/src/xrpld/net/detail/RPCCall.cpp
index e6aae2297..4c4674a4d 100644
--- a/src/xrpld/net/detail/RPCCall.cpp
+++ b/src/xrpld/net/detail/RPCCall.cpp
@@ -17,27 +17,27 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/core/Config.h>
-#include <ripple/json/Object.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/HTTPClient.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/ServerHandler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/json/Object.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/HTTPClient.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/ServerHandler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/streambuf.hpp>
diff --git a/src/xrpld/net/detail/RPCSub.cpp b/src/xrpld/net/detail/RPCSub.cpp
index 5423a1132..914fe8d8a 100644
--- a/src/xrpld/net/detail/RPCSub.cpp
+++ b/src/xrpld/net/detail/RPCSub.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/RPCCall.h>
-#include <ripple/net/RPCSub.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/RPCCall.h>
+#include <xrpld/net/RPCSub.h>
 #include <deque>
 
 namespace ripple {
diff --git a/src/xrpld/net/detail/RegisterSSLCerts.cpp b/src/xrpld/net/detail/RegisterSSLCerts.cpp
index b4e3f51a9..ede42b03a 100644
--- a/src/xrpld/net/detail/RegisterSSLCerts.cpp
+++ b/src/xrpld/net/detail/RegisterSSLCerts.cpp
@@ -16,7 +16,7 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/net/RegisterSSLCerts.h>
+#include <xrpld/net/RegisterSSLCerts.h>
 #include <boost/predef.h>
 
 #if BOOST_OS_WINDOWS
diff --git a/src/xrpld/nodestore/Backend.h b/src/xrpld/nodestore/Backend.h
index d773be741..85d38ec0a 100644
--- a/src/xrpld/nodestore/Backend.h
+++ b/src/xrpld/nodestore/Backend.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_BACKEND_H_INCLUDED
 #define RIPPLE_NODESTORE_BACKEND_H_INCLUDED
 
-#include <ripple/nodestore/Types.h>
+#include <xrpld/nodestore/Types.h>
 #include <atomic>
 #include <cstdint>
 
diff --git a/src/xrpld/nodestore/Database.h b/src/xrpld/nodestore/Database.h
index 0f9e95b23..1bc68824a 100644
--- a/src/xrpld/nodestore/Database.h
+++ b/src/xrpld/nodestore/Database.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_NODESTORE_DATABASE_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASE_H_INCLUDED
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/nodestore/Backend.h>
-#include <ripple/nodestore/NodeObject.h>
-#include <ripple/nodestore/Scheduler.h>
-#include <ripple/protocol/SystemParameters.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpld/nodestore/Backend.h>
+#include <xrpld/nodestore/NodeObject.h>
+#include <xrpld/nodestore/Scheduler.h>
+#include <xrpl/protocol/SystemParameters.h>
 
 #include <condition_variable>
 #include <thread>
diff --git a/src/xrpld/nodestore/DatabaseRotating.h b/src/xrpld/nodestore/DatabaseRotating.h
index c8d7104fe..10f575c46 100644
--- a/src/xrpld/nodestore/DatabaseRotating.h
+++ b/src/xrpld/nodestore/DatabaseRotating.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASEROTATING_H_INCLUDED
 
-#include <ripple/nodestore/Database.h>
+#include <xrpld/nodestore/Database.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/DatabaseShard.h b/src/xrpld/nodestore/DatabaseShard.h
index 55f864f41..408ac3501 100644
--- a/src/xrpld/nodestore/DatabaseShard.h
+++ b/src/xrpld/nodestore/DatabaseShard.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_NODESTORE_DATABASESHARD_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASESHARD_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/nodestore/ShardInfo.h>
-#include <ripple/nodestore/Types.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/nodestore/ShardInfo.h>
+#include <xrpld/nodestore/Types.h>
 
 #include <memory>
 #include <optional>
diff --git a/src/xrpld/nodestore/DummyScheduler.h b/src/xrpld/nodestore/DummyScheduler.h
index cfe7c3fd5..4e6fab782 100644
--- a/src/xrpld/nodestore/DummyScheduler.h
+++ b/src/xrpld/nodestore/DummyScheduler.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED
 #define RIPPLE_NODESTORE_DUMMYSCHEDULER_H_INCLUDED
 
-#include <ripple/nodestore/Scheduler.h>
+#include <xrpld/nodestore/Scheduler.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/Factory.h b/src/xrpld/nodestore/Factory.h
index 4313b4ef1..50360cda1 100644
--- a/src/xrpld/nodestore/Factory.h
+++ b/src/xrpld/nodestore/Factory.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_FACTORY_H_INCLUDED
 #define RIPPLE_NODESTORE_FACTORY_H_INCLUDED
 
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/nodestore/Backend.h>
-#include <ripple/nodestore/Scheduler.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/nodestore/Backend.h>
+#include <xrpld/nodestore/Scheduler.h>
 #include <nudb/store.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/Manager.h b/src/xrpld/nodestore/Manager.h
index 26fdc8789..5a4d46068 100644
--- a/src/xrpld/nodestore/Manager.h
+++ b/src/xrpld/nodestore/Manager.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_MANAGER_H_INCLUDED
 #define RIPPLE_NODESTORE_MANAGER_H_INCLUDED
 
-#include <ripple/nodestore/DatabaseRotating.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/Factory.h>
+#include <xrpld/nodestore/DatabaseRotating.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/Factory.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/nodestore/NodeObject.h b/src/xrpld/nodestore/NodeObject.h
index a94e689b3..f5a1fdb07 100644
--- a/src/xrpld/nodestore/NodeObject.h
+++ b/src/xrpld/nodestore/NodeObject.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED
 #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/Protocol.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/Protocol.h>
 
 // VFALCO NOTE Intentionally not in the NodeStore namespace
 
diff --git a/src/xrpld/nodestore/Scheduler.h b/src/xrpld/nodestore/Scheduler.h
index c97f75ae5..236c2260e 100644
--- a/src/xrpld/nodestore/Scheduler.h
+++ b/src/xrpld/nodestore/Scheduler.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED
 #define RIPPLE_NODESTORE_SCHEDULER_H_INCLUDED
 
-#include <ripple/nodestore/Task.h>
+#include <xrpld/nodestore/Task.h>
 #include <chrono>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/ShardInfo.h b/src/xrpld/nodestore/ShardInfo.h
index 90400276f..9996ef510 100644
--- a/src/xrpld/nodestore/ShardInfo.h
+++ b/src/xrpld/nodestore/ShardInfo.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED
 #define RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED
 
-#include <ripple/basics/RangeSet.h>
-#include <ripple/nodestore/Types.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpld/nodestore/Types.h>
+#include <xrpl/protocol/messages.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/Types.h b/src/xrpld/nodestore/Types.h
index 6d8583ed9..785178d99 100644
--- a/src/xrpld/nodestore/Types.h
+++ b/src/xrpld/nodestore/Types.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NODESTORE_TYPES_H_INCLUDED
 #define RIPPLE_NODESTORE_TYPES_H_INCLUDED
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/nodestore/NodeObject.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/nodestore/NodeObject.h>
 #include <vector>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/backend/CassandraFactory.cpp b/src/xrpld/nodestore/backend/CassandraFactory.cpp
index d13cd7182..e74e14976 100644
--- a/src/xrpld/nodestore/backend/CassandraFactory.cpp
+++ b/src/xrpld/nodestore/backend/CassandraFactory.cpp
@@ -22,17 +22,17 @@
 #include <cassandra.h>
 #include <libpq-fe.h>
 
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/nodestore/Backend.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/EncodedBlob.h>
-#include <ripple/nodestore/impl/codec.h>
-#include <ripple/protocol/digest.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpld/nodestore/Backend.h>
+#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/protocol/digest.h>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/filesystem.hpp>
 #include <atomic>
diff --git a/src/xrpld/nodestore/backend/FlatmapFactory.cpp b/src/xrpld/nodestore/backend/FlatmapFactory.cpp
index 4cec115ef..6b8b3e6b5 100644
--- a/src/xrpld/nodestore/backend/FlatmapFactory.cpp
+++ b/src/xrpld/nodestore/backend/FlatmapFactory.cpp
@@ -1,9 +1,9 @@
-#include <ripple/basics/contract.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/EncodedBlob.h>
-#include <ripple/nodestore/impl/codec.h>
+#include <xrpl/basics/contract.h>
+#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 <boost/beast/core/string.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/unordered/concurrent_flat_map.hpp>
diff --git a/src/xrpld/nodestore/backend/MemoryFactory.cpp b/src/xrpld/nodestore/backend/MemoryFactory.cpp
index a1c7a4cfb..55ab9fa49 100644
--- a/src/xrpld/nodestore/backend/MemoryFactory.cpp
+++ b/src/xrpld/nodestore/backend/MemoryFactory.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/nodestore/Factory.h>
+#include <xrpld/nodestore/Manager.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <map>
diff --git a/src/xrpld/nodestore/backend/NuDBFactory.cpp b/src/xrpld/nodestore/backend/NuDBFactory.cpp
index 30b848e82..200edfab3 100644
--- a/src/xrpld/nodestore/backend/NuDBFactory.cpp
+++ b/src/xrpld/nodestore/backend/NuDBFactory.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/EncodedBlob.h>
-#include <ripple/nodestore/impl/codec.h>
+#include <xrpl/basics/contract.h>
+#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 <boost/filesystem.hpp>
 #include <cassert>
 #include <chrono>
diff --git a/src/xrpld/nodestore/backend/NullFactory.cpp b/src/xrpld/nodestore/backend/NullFactory.cpp
index 8509787b3..732aa0e1f 100644
--- a/src/xrpld/nodestore/backend/NullFactory.cpp
+++ b/src/xrpld/nodestore/backend/NullFactory.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/nodestore/Factory.h>
+#include <xrpld/nodestore/Manager.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/backend/RWDBFactory.cpp b/src/xrpld/nodestore/backend/RWDBFactory.cpp
index 3f700038b..9edb737f6 100644
--- a/src/xrpld/nodestore/backend/RWDBFactory.cpp
+++ b/src/xrpld/nodestore/backend/RWDBFactory.cpp
@@ -1,9 +1,9 @@
-#include <ripple/basics/contract.h>
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/EncodedBlob.h>
-#include <ripple/nodestore/impl/codec.h>
+#include <xrpl/basics/contract.h>
+#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 <boost/beast/core/string.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/unordered/concurrent_flat_map.hpp>
diff --git a/src/xrpld/nodestore/backend/RocksDBFactory.cpp b/src/xrpld/nodestore/backend/RocksDBFactory.cpp
index b34560dba..d4c4c56a5 100644
--- a/src/xrpld/nodestore/backend/RocksDBFactory.cpp
+++ b/src/xrpld/nodestore/backend/RocksDBFactory.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/unity/rocksdb.h>
+#include <xrpld/unity/rocksdb.h>
 
 #if RIPPLE_ROCKSDB_AVAILABLE
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/core/Config.h>  // VFALCO Bad dependency
-#include <ripple/nodestore/Factory.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/BatchWriter.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
-#include <ripple/nodestore/impl/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 <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 <atomic>
 #include <memory>
diff --git a/src/xrpld/nodestore/detail/BatchWriter.cpp b/src/xrpld/nodestore/detail/BatchWriter.cpp
index 692032016..1c5067d5b 100644
--- a/src/xrpld/nodestore/detail/BatchWriter.cpp
+++ b/src/xrpld/nodestore/detail/BatchWriter.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/impl/BatchWriter.h>
+#include <xrpld/nodestore/detail/BatchWriter.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/BatchWriter.h b/src/xrpld/nodestore/detail/BatchWriter.h
index 9ce4f1203..c48002f4f 100644
--- a/src/xrpld/nodestore/detail/BatchWriter.h
+++ b/src/xrpld/nodestore/detail/BatchWriter.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED
 #define RIPPLE_NODESTORE_BATCHWRITER_H_INCLUDED
 
-#include <ripple/nodestore/Scheduler.h>
-#include <ripple/nodestore/Task.h>
-#include <ripple/nodestore/Types.h>
+#include <xrpld/nodestore/Scheduler.h>
+#include <xrpld/nodestore/Task.h>
+#include <xrpld/nodestore/Types.h>
 #include <condition_variable>
 #include <mutex>
 
diff --git a/src/xrpld/nodestore/detail/Database.cpp b/src/xrpld/nodestore/detail/Database.cpp
index 70416c873..0d5a686c0 100644
--- a/src/xrpld/nodestore/detail/Database.cpp
+++ b/src/xrpld/nodestore/detail/Database.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/json/json_value.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/jss.h>
 #include <chrono>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp b/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp
index 9ef878bf3..d61c68e75 100644
--- a/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp
+++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/nodestore/impl/DatabaseNodeImp.h>
-#include <ripple/protocol/HashPrefix.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
+#include <xrpl/protocol/HashPrefix.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.h b/src/xrpld/nodestore/detail/DatabaseNodeImp.h
index 452bd8d27..ebc769712 100644
--- a/src/xrpld/nodestore/detail/DatabaseNodeImp.h
+++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/nodestore/Database.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/nodestore/Database.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp b/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp
index aa8f89962..226072315 100644
--- a/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp
+++ b/src/xrpld/nodestore/detail/DatabaseRotatingImp.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/nodestore/impl/DatabaseRotatingImp.h>
-#include <ripple/protocol/HashPrefix.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
+#include <xrpl/protocol/HashPrefix.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DatabaseRotatingImp.h b/src/xrpld/nodestore/detail/DatabaseRotatingImp.h
index b7f9ea52c..a2914cb41 100644
--- a/src/xrpld/nodestore/detail/DatabaseRotatingImp.h
+++ b/src/xrpld/nodestore/detail/DatabaseRotatingImp.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASEROTATINGIMP_H_INCLUDED
 
-#include <ripple/nodestore/DatabaseRotating.h>
+#include <xrpld/nodestore/DatabaseRotating.h>
 
 #include <mutex>
 
diff --git a/src/xrpld/nodestore/detail/DatabaseShardImp.cpp b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp
index 33000b5d2..5a233c3e9 100644
--- a/src/xrpld/nodestore/detail/DatabaseShardImp.cpp
+++ b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/basics/random.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DummyScheduler.h>
-#include <ripple/nodestore/impl/DatabaseShardImp.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/LedgerHeader.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/random.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/detail/DatabaseShardImp.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/LedgerHeader.h>
+#include <xrpl/protocol/digest.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/xrpld/nodestore/detail/DatabaseShardImp.h b/src/xrpld/nodestore/detail/DatabaseShardImp.h
index 5cf1f3701..df740cf40 100644
--- a/src/xrpld/nodestore/detail/DatabaseShardImp.h
+++ b/src/xrpld/nodestore/detail/DatabaseShardImp.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_NODESTORE_DATABASESHARDIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_DATABASESHARDIMP_H_INCLUDED
 
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/impl/Shard.h>
-#include <ripple/nodestore/impl/TaskQueue.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/detail/Shard.h>
+#include <xrpld/nodestore/detail/TaskQueue.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
 
diff --git a/src/xrpld/nodestore/detail/DecodedBlob.cpp b/src/xrpld/nodestore/detail/DecodedBlob.cpp
index 13175d362..f75142153 100644
--- a/src/xrpld/nodestore/detail/DecodedBlob.cpp
+++ b/src/xrpld/nodestore/detail/DecodedBlob.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/nodestore/impl/DecodedBlob.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/nodestore/detail/DecodedBlob.h>
 #include <algorithm>
 #include <cassert>
 
diff --git a/src/xrpld/nodestore/detail/DecodedBlob.h b/src/xrpld/nodestore/detail/DecodedBlob.h
index 623e1f18d..d52f20c4e 100644
--- a/src/xrpld/nodestore/detail/DecodedBlob.h
+++ b/src/xrpld/nodestore/detail/DecodedBlob.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED
 #define RIPPLE_NODESTORE_DECODEDBLOB_H_INCLUDED
 
-#include <ripple/nodestore/NodeObject.h>
+#include <xrpld/nodestore/NodeObject.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/DeterministicShard.cpp b/src/xrpld/nodestore/detail/DeterministicShard.cpp
index 5dd6bfb4c..d9afd2dc8 100644
--- a/src/xrpld/nodestore/detail/DeterministicShard.cpp
+++ b/src/xrpld/nodestore/detail/DeterministicShard.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DeterministicShard.h>
-#include <ripple/nodestore/impl/Shard.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/nodestore/detail/DeterministicShard.h>
+#include <xrpld/nodestore/detail/Shard.h>
+#include <xrpl/protocol/digest.h>
 #include <fstream>
 #include <nudb/detail/format.hpp>
 #include <nudb/nudb.hpp>
diff --git a/src/xrpld/nodestore/detail/DeterministicShard.h b/src/xrpld/nodestore/detail/DeterministicShard.h
index c32a45127..3eb5eaa81 100644
--- a/src/xrpld/nodestore/detail/DeterministicShard.h
+++ b/src/xrpld/nodestore/detail/DeterministicShard.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NODESTORE_DETERMINISTICSHARD_H_INCLUDED
 #define RIPPLE_NODESTORE_DETERMINISTICSHARD_H_INCLUDED
 
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/nodestore/DummyScheduler.h>
 #include <nudb/nudb.hpp>
 #include <set>
 
diff --git a/src/xrpld/nodestore/detail/DummyScheduler.cpp b/src/xrpld/nodestore/detail/DummyScheduler.cpp
index ee44e02fb..76cd89610 100644
--- a/src/xrpld/nodestore/detail/DummyScheduler.cpp
+++ b/src/xrpld/nodestore/detail/DummyScheduler.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/DummyScheduler.h>
+#include <xrpld/nodestore/DummyScheduler.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/EncodedBlob.h b/src/xrpld/nodestore/detail/EncodedBlob.h
index 77f8fbf3c..5c9b220ac 100644
--- a/src/xrpld/nodestore/detail/EncodedBlob.h
+++ b/src/xrpld/nodestore/detail/EncodedBlob.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED
 #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED
 
-#include <ripple/basics/Buffer.h>
-#include <ripple/nodestore/NodeObject.h>
+#include <xrpl/basics/Buffer.h>
+#include <xrpld/nodestore/NodeObject.h>
 #include <boost/align/align_up.hpp>
 #include <algorithm>
 #include <array>
diff --git a/src/xrpld/nodestore/detail/ManagerImp.cpp b/src/xrpld/nodestore/detail/ManagerImp.cpp
index d5ea29059..019dd1f81 100644
--- a/src/xrpld/nodestore/detail/ManagerImp.cpp
+++ b/src/xrpld/nodestore/detail/ManagerImp.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/impl/DatabaseNodeImp.h>
-#include <ripple/nodestore/impl/ManagerImp.h>
+#include <xrpld/nodestore/detail/DatabaseNodeImp.h>
+#include <xrpld/nodestore/detail/ManagerImp.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/xrpld/nodestore/detail/ManagerImp.h b/src/xrpld/nodestore/detail/ManagerImp.h
index 42f8584ef..92411cc76 100644
--- a/src/xrpld/nodestore/detail/ManagerImp.h
+++ b/src/xrpld/nodestore/detail/ManagerImp.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED
 #define RIPPLE_NODESTORE_MANAGERIMP_H_INCLUDED
 
-#include <ripple/nodestore/Manager.h>
+#include <xrpld/nodestore/Manager.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/nodestore/detail/NodeObject.cpp b/src/xrpld/nodestore/detail/NodeObject.cpp
index fb476107c..f633014b0 100644
--- a/src/xrpld/nodestore/detail/NodeObject.cpp
+++ b/src/xrpld/nodestore/detail/NodeObject.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/NodeObject.h>
+#include <xrpld/nodestore/NodeObject.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/detail/Shard.cpp b/src/xrpld/nodestore/detail/Shard.cpp
index 461745b87..7ee6d03cf 100644
--- a/src/xrpld/nodestore/detail/Shard.cpp
+++ b/src/xrpld/nodestore/detail/Shard.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedger.h>
-#include <ripple/app/main/DBInit.h>
-#include <ripple/app/rdb/backend/detail/Shard.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/Manager.h>
-#include <ripple/nodestore/impl/DeterministicShard.h>
-#include <ripple/nodestore/impl/Shard.h>
-#include <ripple/protocol/LedgerHeader.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/ledger/InboundLedger.h>
+#include <xrpld/app/main/DBInit.h>
+#include <xrpld/app/rdb/backend/detail/Shard.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/Manager.h>
+#include <xrpld/nodestore/detail/DeterministicShard.h>
+#include <xrpld/nodestore/detail/Shard.h>
+#include <xrpl/protocol/LedgerHeader.h>
+#include <xrpl/protocol/digest.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/Shard.h b/src/xrpld/nodestore/detail/Shard.h
index 210bdd54a..831f01b40 100644
--- a/src/xrpld/nodestore/detail/Shard.h
+++ b/src/xrpld/nodestore/detail/Shard.h
@@ -20,17 +20,17 @@
 #ifndef RIPPLE_NODESTORE_SHARD_H_INCLUDED
 #define RIPPLE_NODESTORE_SHARD_H_INCLUDED
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/KeyCache.h>
-#include <ripple/basics/MathUtilities.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/basics/ThreadSafetyAnalysis.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/nodestore/NodeObject.h>
-#include <ripple/nodestore/Scheduler.h>
-#include <ripple/nodestore/impl/DeterministicShard.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/KeyCache.h>
+#include <xrpl/basics/MathUtilities.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/basics/ThreadSafetyAnalysis.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/nodestore/NodeObject.h>
+#include <xrpld/nodestore/Scheduler.h>
+#include <xrpld/nodestore/detail/DeterministicShard.h>
 
 #include <boost/filesystem.hpp>
 #include <nudb/nudb.hpp>
diff --git a/src/xrpld/nodestore/detail/ShardInfo.cpp b/src/xrpld/nodestore/detail/ShardInfo.cpp
index fca828ab4..43a9d4849 100644
--- a/src/xrpld/nodestore/detail/ShardInfo.cpp
+++ b/src/xrpld/nodestore/detail/ShardInfo.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/nodestore/ShardInfo.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpld/nodestore/ShardInfo.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/digest.h>
 
 namespace ripple {
 namespace NodeStore {
diff --git a/src/xrpld/nodestore/detail/TaskQueue.cpp b/src/xrpld/nodestore/detail/TaskQueue.cpp
index 90b6ba345..6062138c6 100644
--- a/src/xrpld/nodestore/detail/TaskQueue.cpp
+++ b/src/xrpld/nodestore/detail/TaskQueue.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/nodestore/impl/TaskQueue.h>
+#include <xrpld/nodestore/detail/TaskQueue.h>
 
 #include <cassert>
 
diff --git a/src/xrpld/nodestore/detail/TaskQueue.h b/src/xrpld/nodestore/detail/TaskQueue.h
index 942bd9c32..8a743ff60 100644
--- a/src/xrpld/nodestore/detail/TaskQueue.h
+++ b/src/xrpld/nodestore/detail/TaskQueue.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_NODESTORE_TASKQUEUE_H_INCLUDED
 #define RIPPLE_NODESTORE_TASKQUEUE_H_INCLUDED
 
-#include <ripple/core/impl/Workers.h>
+#include <xrpld/core/detail/Workers.h>
 
 #include <functional>
 #include <queue>
diff --git a/src/xrpld/nodestore/detail/codec.h b/src/xrpld/nodestore/detail/codec.h
index a6749e0d1..3548029e0 100644
--- a/src/xrpld/nodestore/detail/codec.h
+++ b/src/xrpld/nodestore/detail/codec.h
@@ -23,11 +23,11 @@
 // Disable lz4 deprecation warning due to incompatibility with clang attributes
 #define LZ4_DISABLE_DEPRECATE_WARNINGS
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/nodestore/NodeObject.h>
-#include <ripple/nodestore/impl/varint.h>
-#include <ripple/protocol/HashPrefix.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpld/nodestore/NodeObject.h>
+#include <xrpld/nodestore/detail/varint.h>
+#include <xrpl/protocol/HashPrefix.h>
 #include <cstddef>
 #include <cstring>
 #include <lz4.h>
diff --git a/src/xrpld/overlay/Cluster.h b/src/xrpld/overlay/Cluster.h
index 46d5a6ddb..a79cd0f60 100644
--- a/src/xrpld/overlay/Cluster.h
+++ b/src/xrpld/overlay/Cluster.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_OVERLAY_CLUSTER_H_INCLUDED
 #define RIPPLE_OVERLAY_CLUSTER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/ClusterNode.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/ClusterNode.h>
+#include <xrpl/protocol/PublicKey.h>
 #include <functional>
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/overlay/ClusterNode.h b/src/xrpld/overlay/ClusterNode.h
index 7996f8ffd..1ca78208d 100644
--- a/src/xrpld/overlay/ClusterNode.h
+++ b/src/xrpld/overlay/ClusterNode.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED
 #define RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED
 
-#include <ripple/basics/chrono.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/protocol/PublicKey.h>
 #include <cstdint>
 #include <string>
 
diff --git a/src/xrpld/overlay/Compression.h b/src/xrpld/overlay/Compression.h
index 6bb94792b..1cf13fcb1 100644
--- a/src/xrpld/overlay/Compression.h
+++ b/src/xrpld/overlay/Compression.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLED_COMPRESSION_H_INCLUDED
 #define RIPPLED_COMPRESSION_H_INCLUDED
 
-#include <ripple/basics/CompressionAlgorithms.h>
-#include <ripple/basics/Log.h>
+#include <xrpl/basics/CompressionAlgorithms.h>
+#include <xrpl/basics/Log.h>
 #include <lz4frame.h>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/Message.h b/src/xrpld/overlay/Message.h
index 0d6479366..0f06d5829 100644
--- a/src/xrpld/overlay/Message.h
+++ b/src/xrpld/overlay/Message.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_OVERLAY_MESSAGE_H_INCLUDED
 #define RIPPLE_OVERLAY_MESSAGE_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/overlay/Compression.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpld/overlay/Compression.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/messages.h>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/buffers_iterator.hpp>
 #include <algorithm>
diff --git a/src/xrpld/overlay/Overlay.h b/src/xrpld/overlay/Overlay.h
index 844eafb86..4cc0427ed 100644
--- a/src/xrpld/overlay/Overlay.h
+++ b/src/xrpld/overlay/Overlay.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_OVERLAY_OVERLAY_H_INCLUDED
 #define RIPPLE_OVERLAY_OVERLAY_H_INCLUDED
 
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/json/json_value.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/overlay/PeerSet.h>
-#include <ripple/server/Handoff.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpld/overlay/PeerSet.h>
+#include <xrpl/server/Handoff.h>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
diff --git a/src/xrpld/overlay/Peer.h b/src/xrpld/overlay/Peer.h
index ba4159741..558e65292 100644
--- a/src/xrpld/overlay/Peer.h
+++ b/src/xrpld/overlay/Peer.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_OVERLAY_PEER_H_INCLUDED
 #define RIPPLE_OVERLAY_PEER_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/json/json_value.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpl/protocol/PublicKey.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/overlay/PeerReservationTable.h b/src/xrpld/overlay/PeerReservationTable.h
index e8fd4a294..fb3add61f 100644
--- a/src/xrpld/overlay/PeerReservationTable.h
+++ b/src/xrpld/overlay/PeerReservationTable.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_OVERLAY_PEER_RESERVATION_TABLE_H_INCLUDED
 #define RIPPLE_OVERLAY_PEER_RESERVATION_TABLE_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/json/json_forwards.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/protocol/PublicKey.h>
 
 #include <mutex>
 #include <optional>
diff --git a/src/xrpld/overlay/PeerSet.h b/src/xrpld/overlay/PeerSet.h
index db21b0c74..af9dc4944 100644
--- a/src/xrpld/overlay/PeerSet.h
+++ b/src/xrpld/overlay/PeerSet.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_APP_PEERS_PEERSET_H_INCLUDED
 #define RIPPLE_APP_PEERS_PEERSET_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/overlay/impl/ProtocolMessage.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpld/overlay/detail/ProtocolMessage.h>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <mutex>
 #include <set>
diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h
index e58619e66..8dd7e7cf7 100644
--- a/src/xrpld/overlay/Slot.h
+++ b/src/xrpld/overlay/Slot.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_OVERLAY_SLOT_H_INCLUDED
 #define RIPPLE_OVERLAY_SLOT_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/container/aged_unordered_map.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/Peer.h>
-#include <ripple/overlay/ReduceRelayCommon.h>
-#include <ripple/overlay/Squelch.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/container/aged_unordered_map.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/Peer.h>
+#include <xrpld/overlay/ReduceRelayCommon.h>
+#include <xrpld/overlay/Squelch.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/messages.h>
 
 #include <algorithm>
 #include <memory>
diff --git a/src/xrpld/overlay/Squelch.h b/src/xrpld/overlay/Squelch.h
index 175c80a0a..a342a7a31 100644
--- a/src/xrpld/overlay/Squelch.h
+++ b/src/xrpld/overlay/Squelch.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_OVERLAY_SQUELCH_H_INCLUDED
 #define RIPPLE_OVERLAY_SQUELCH_H_INCLUDED
 
-#include <ripple/basics/random.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/ReduceRelayCommon.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/ReduceRelayCommon.h>
+#include <xrpl/protocol/PublicKey.h>
 
 #include <algorithm>
 #include <chrono>
diff --git a/src/xrpld/overlay/detail/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp
index a7b1e44d4..7465a4d52 100644
--- a/src/xrpld/overlay/detail/Cluster.cpp
+++ b/src/xrpld/overlay/detail/Cluster.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/ClusterNode.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/tokens.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/ClusterNode.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/tokens.h>
 #include <boost/regex.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp
index f1d1c6ffe..991afb570 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.cpp
+++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_reader.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/impl/ConnectAttempt.h>
-#include <ripple/overlay/impl/PeerImp.h>
-#include <ripple/overlay/impl/ProtocolVersion.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/detail/ConnectAttempt.h>
+#include <xrpld/overlay/detail/PeerImp.h>
+#include <xrpld/overlay/detail/ProtocolVersion.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.h b/src/xrpld/overlay/detail/ConnectAttempt.h
index 65eac6809..474ac3c06 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.h
+++ b/src/xrpld/overlay/detail/ConnectAttempt.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_OVERLAY_CONNECTATTEMPT_H_INCLUDED
 #define RIPPLE_OVERLAY_CONNECTATTEMPT_H_INCLUDED
 
-#include <ripple/overlay/impl/OverlayImpl.h>
-#include <ripple/overlay/impl/Tuning.h>
+#include <xrpld/overlay/detail/OverlayImpl.h>
+#include <xrpld/overlay/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp
index 0d82152d7..fa9968c82 100644
--- a/src/xrpld/overlay/detail/Handshake.cpp
+++ b/src/xrpld/overlay/detail/Handshake.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/base64.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/overlay/impl/Handshake.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpld/overlay/detail/Handshake.h>
+#include <xrpl/protocol/digest.h>
 #include <boost/regex.hpp>
 #include <algorithm>
 
diff --git a/src/xrpld/overlay/detail/Handshake.h b/src/xrpld/overlay/detail/Handshake.h
index 2accf5d22..7efbb7c78 100644
--- a/src/xrpld/overlay/detail/Handshake.h
+++ b/src/xrpld/overlay/detail/Handshake.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_OVERLAY_HANDSHAKE_H_INCLUDED
 #define RIPPLE_OVERLAY_HANDSHAKE_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/overlay/impl/ProtocolVersion.h>
-#include <ripple/protocol/BuildInfo.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/overlay/detail/ProtocolVersion.h>
+#include <xrpl/protocol/BuildInfo.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/stream.hpp>
diff --git a/src/xrpld/overlay/detail/Message.cpp b/src/xrpld/overlay/detail/Message.cpp
index b4cb1f192..e19d718c7 100644
--- a/src/xrpld/overlay/detail/Message.cpp
+++ b/src/xrpld/overlay/detail/Message.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/impl/TrafficCount.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/detail/TrafficCount.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp
index 1b7003165..673c45408 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -17,28 +17,28 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/make_SSLContext.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/impl/ConnectAttempt.h>
-#include <ripple/overlay/impl/PeerImp.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/peerfinder/make_Manager.h>
-#include <ripple/rpc/handlers/GetCounts.h>
-#include <ripple/rpc/json_body.h>
-#include <ripple/server/SimpleWriter.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/make_SSLContext.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/detail/ConnectAttempt.h>
+#include <xrpld/overlay/detail/PeerImp.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpld/peerfinder/make_Manager.h>
+#include <xrpld/rpc/handlers/GetCounts.h>
+#include <xrpld/rpc/json_body.h>
+#include <xrpl/server/SimpleWriter.h>
 
-#include <ripple/core/ConfigSections.h>
+#include <xrpld/core/ConfigSections.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h
index 2ba7999cb..c2de25772 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.h
+++ b/src/xrpld/overlay/detail/OverlayImpl.h
@@ -20,21 +20,21 @@
 #ifndef RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED
 #define RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/Resolver.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/core/Job.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/Slot.h>
-#include <ripple/overlay/impl/Handshake.h>
-#include <ripple/overlay/impl/TrafficCount.h>
-#include <ripple/overlay/impl/TxMetrics.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/rpc/ServerHandler.h>
-#include <ripple/server/Handoff.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/Resolver.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpld/core/Job.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/Slot.h>
+#include <xrpld/overlay/detail/Handshake.h>
+#include <xrpld/overlay/detail/TrafficCount.h>
+#include <xrpld/overlay/detail/TxMetrics.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpld/rpc/ServerHandler.h>
+#include <xrpl/server/Handoff.h>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 25a656ee3..934a8948d 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -17,29 +17,29 @@
 */
 //==============================================================================
 
-#include <ripple/app/consensus/RCLValidations.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/InboundTransactions.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/random.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/impl/PeerImp.h>
-#include <ripple/overlay/impl/Tuning.h>
-#include <ripple/overlay/predicates.h>
-#include <ripple/protocol/digest.h>
+#include <xrpld/app/consensus/RCLValidations.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/detail/PeerImp.h>
+#include <xrpld/overlay/detail/Tuning.h>
+#include <xrpld/overlay/predicates.h>
+#include <xrpl/protocol/digest.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/beast/core/ostream.hpp>
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index 710ab4d74..4326907f9 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -20,22 +20,22 @@
 #ifndef RIPPLE_OVERLAY_PEERIMP_H_INCLUDED
 #define RIPPLE_OVERLAY_PEERIMP_H_INCLUDED
 
-#include <ripple/app/consensus/RCLCxPeerPos.h>
-#include <ripple/app/ledger/impl/LedgerReplayMsgHandler.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/WrappedSink.h>
-#include <ripple/nodestore/ShardInfo.h>
-#include <ripple/overlay/Squelch.h>
-#include <ripple/overlay/impl/OverlayImpl.h>
-#include <ripple/overlay/impl/ProtocolMessage.h>
-#include <ripple/overlay/impl/ProtocolVersion.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/STValidation.h>
-#include <ripple/resource/Fees.h>
+#include <xrpld/app/consensus/RCLCxPeerPos.h>
+#include <xrpld/app/ledger/detail/LedgerReplayMsgHandler.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/WrappedSink.h>
+#include <xrpld/nodestore/ShardInfo.h>
+#include <xrpld/overlay/Squelch.h>
+#include <xrpld/overlay/detail/OverlayImpl.h>
+#include <xrpld/overlay/detail/ProtocolMessage.h>
+#include <xrpld/overlay/detail/ProtocolVersion.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STValidation.h>
+#include <xrpl/resource/Fees.h>
 
 #include <boost/circular_buffer.hpp>
 #include <boost/endian/conversion.hpp>
diff --git a/src/xrpld/overlay/detail/PeerReservationTable.cpp b/src/xrpld/overlay/detail/PeerReservationTable.cpp
index 6f39d12e9..6fd0112f4 100644
--- a/src/xrpld/overlay/detail/PeerReservationTable.cpp
+++ b/src/xrpld/overlay/detail/PeerReservationTable.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/overlay/PeerReservationTable.h>
+#include <xrpld/overlay/PeerReservationTable.h>
 
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/rdb/Wallet.h>
-#include <ripple/basics/Log.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/rdb/Wallet.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/jss.h>
 
 #include <boost/optional.hpp>
 
diff --git a/src/xrpld/overlay/detail/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp
index de5c3cd9f..909b20c30 100644
--- a/src/xrpld/overlay/detail/PeerSet.cpp
+++ b/src/xrpld/overlay/detail/PeerSet.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/overlay/PeerSet.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/overlay/PeerSet.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/overlay/detail/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h
index d6fb14bc7..314c20d93 100644
--- a/src/xrpld/overlay/detail/ProtocolMessage.h
+++ b/src/xrpld/overlay/detail/ProtocolMessage.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED
 #define RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/overlay/Compression.h>
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/impl/ZeroCopyStream.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpld/overlay/Compression.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/detail/ZeroCopyStream.h>
+#include <xrpl/protocol/messages.h>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/buffers_iterator.hpp>
 #include <boost/system/error_code.hpp>
diff --git a/src/xrpld/overlay/detail/ProtocolVersion.cpp b/src/xrpld/overlay/detail/ProtocolVersion.cpp
index fbd484744..936c598aa 100644
--- a/src/xrpld/overlay/detail/ProtocolVersion.cpp
+++ b/src/xrpld/overlay/detail/ProtocolVersion.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/overlay/impl/ProtocolVersion.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpld/overlay/detail/ProtocolVersion.h>
 #include <boost/iterator/function_output_iterator.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
diff --git a/src/xrpld/overlay/detail/TrafficCount.cpp b/src/xrpld/overlay/detail/TrafficCount.cpp
index 9b35d4768..f3e9c137f 100644
--- a/src/xrpld/overlay/detail/TrafficCount.cpp
+++ b/src/xrpld/overlay/detail/TrafficCount.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/overlay/impl/TrafficCount.h>
+#include <xrpld/overlay/detail/TrafficCount.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/overlay/detail/TrafficCount.h b/src/xrpld/overlay/detail/TrafficCount.h
index 9e212da79..acd966952 100644
--- a/src/xrpld/overlay/detail/TrafficCount.h
+++ b/src/xrpld/overlay/detail/TrafficCount.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_OVERLAY_TRAFFIC_H_INCLUDED
 #define RIPPLE_OVERLAY_TRAFFIC_H_INCLUDED
 
-#include <ripple/basics/safe_cast.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/protocol/messages.h>
 
 #include <array>
 #include <atomic>
diff --git a/src/xrpld/overlay/detail/TxMetrics.cpp b/src/xrpld/overlay/detail/TxMetrics.cpp
index c9b826e9a..8759e0122 100644
--- a/src/xrpld/overlay/detail/TxMetrics.cpp
+++ b/src/xrpld/overlay/detail/TxMetrics.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/overlay/impl/TxMetrics.h>
-#include <ripple/protocol/jss.h>
+#include <xrpld/overlay/detail/TxMetrics.h>
+#include <xrpl/protocol/jss.h>
 
 #include <numeric>
 
diff --git a/src/xrpld/overlay/detail/TxMetrics.h b/src/xrpld/overlay/detail/TxMetrics.h
index d70cadee1..eda7f1bb1 100644
--- a/src/xrpld/overlay/detail/TxMetrics.h
+++ b/src/xrpld/overlay/detail/TxMetrics.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED
 #define RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/messages.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/messages.h>
 
 #include <boost/circular_buffer.hpp>
 
diff --git a/src/xrpld/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h
index 9a63f5a46..ac7166735 100644
--- a/src/xrpld/overlay/make_Overlay.h
+++ b/src/xrpld/overlay/make_Overlay.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED
 #define RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED
 
-#include <ripple/basics/Resolver.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/rpc/ServerHandler.h>
+#include <xrpl/basics/Resolver.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpld/rpc/ServerHandler.h>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ssl/context.hpp>
 
diff --git a/src/xrpld/overlay/predicates.h b/src/xrpld/overlay/predicates.h
index 8e403b81f..88e7ce6aa 100644
--- a/src/xrpld/overlay/predicates.h
+++ b/src/xrpld/overlay/predicates.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_OVERLAY_PREDICATES_H_INCLUDED
 #define RIPPLE_OVERLAY_PREDICATES_H_INCLUDED
 
-#include <ripple/overlay/Message.h>
-#include <ripple/overlay/Peer.h>
+#include <xrpld/overlay/Message.h>
+#include <xrpld/overlay/Peer.h>
 
 #include <set>
 
diff --git a/src/xrpld/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h
index a831cbb70..54aa1f7f6 100644
--- a/src/xrpld/peerfinder/PeerfinderManager.h
+++ b/src/xrpld/peerfinder/PeerfinderManager.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PEERFINDER_MANAGER_H_INCLUDED
 #define RIPPLE_PEERFINDER_MANAGER_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/core/Config.h>
-#include <ripple/peerfinder/Slot.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/peerfinder/Slot.h>
 #include <boost/asio/ip/tcp.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/Slot.h b/src/xrpld/peerfinder/Slot.h
index b43b8075d..879c6a533 100644
--- a/src/xrpld/peerfinder/Slot.h
+++ b/src/xrpld/peerfinder/Slot.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PEERFINDER_SLOT_H_INCLUDED
 #define RIPPLE_PEERFINDER_SLOT_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/protocol/PublicKey.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/protocol/PublicKey.h>
 #include <memory>
 #include <optional>
 
diff --git a/src/xrpld/peerfinder/detail/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp
index a07c53417..c21ff530a 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.cpp
+++ b/src/xrpld/peerfinder/detail/Bootcache.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/peerfinder/impl/Bootcache.h>
-#include <ripple/peerfinder/impl/Tuning.h>
-#include <ripple/peerfinder/impl/iosformat.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/peerfinder/detail/Bootcache.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
+#include <xrpld/peerfinder/detail/iosformat.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h
index b48f248ae..20de0c3c1 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.h
+++ b/src/xrpld/peerfinder/detail/Bootcache.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED
 #define RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED
 
-#include <ripple/basics/comparators.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/beast/utility/PropertyStream.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpl/basics/comparators.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/PropertyStream.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/bimap.hpp>
 #include <boost/bimap/multiset_of.hpp>
 #include <boost/bimap/unordered_set_of.hpp>
diff --git a/src/xrpld/peerfinder/detail/Checker.h b/src/xrpld/peerfinder/detail/Checker.h
index e913d4c09..7d118af1e 100644
--- a/src/xrpld/peerfinder/detail/Checker.h
+++ b/src/xrpld/peerfinder/detail/Checker.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_CHECKER_H_INCLUDED
 #define RIPPLE_PEERFINDER_CHECKER_H_INCLUDED
 
-#include <ripple/beast/net/IPAddressConversion.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/intrusive/list.hpp>
diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h
index 5d9e31859..3134ddc90 100644
--- a/src/xrpld/peerfinder/detail/Counts.h
+++ b/src/xrpld/peerfinder/detail/Counts.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED
 #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED
 
-#include <ripple/basics/random.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/Slot.h>
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpl/basics/random.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/Slot.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 
 #include <cmath>
 
diff --git a/src/xrpld/peerfinder/detail/Endpoint.cpp b/src/xrpld/peerfinder/detail/Endpoint.cpp
index 9740b6020..53415a8c1 100644
--- a/src/xrpld/peerfinder/detail/Endpoint.cpp
+++ b/src/xrpld/peerfinder/detail/Endpoint.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/Fixed.h b/src/xrpld/peerfinder/detail/Fixed.h
index bf7a2b6b3..464a4d97d 100644
--- a/src/xrpld/peerfinder/detail/Fixed.h
+++ b/src/xrpld/peerfinder/detail/Fixed.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_FIXED_H_INCLUDED
 #define RIPPLE_PEERFINDER_FIXED_H_INCLUDED
 
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h
index 00e163bbe..b6f33406a 100644
--- a/src/xrpld/peerfinder/detail/Handouts.h
+++ b/src/xrpld/peerfinder/detail/Handouts.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED
 #define RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED
 
-#include <ripple/beast/container/aged_set.h>
-#include <ripple/peerfinder/impl/SlotImp.h>
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpl/beast/container/aged_set.h>
+#include <xrpld/peerfinder/detail/SlotImp.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 #include <cassert>
 #include <iterator>
 #include <type_traits>
diff --git a/src/xrpld/peerfinder/detail/InMemoryStore.h b/src/xrpld/peerfinder/detail/InMemoryStore.h
index cae005622..692d85d3a 100644
--- a/src/xrpld/peerfinder/detail/InMemoryStore.h
+++ b/src/xrpld/peerfinder/detail/InMemoryStore.h
@@ -1,8 +1,8 @@
 #ifndef RIPPLE_PEERFINDER_INMEMORYSTORE_H_INCLUDED
 #define RIPPLE_PEERFINDER_INMEMORYSTORE_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/functional/hash.hpp>
 #include <boost/unordered/concurrent_flat_map.hpp>
 
diff --git a/src/xrpld/peerfinder/detail/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h
index 8ecd68e84..1dc8f4363 100644
--- a/src/xrpld/peerfinder/detail/Livecache.h
+++ b/src/xrpld/peerfinder/detail/Livecache.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED
 #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/container/aged_map.h>
-#include <ripple/beast/utility/maybe_const.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Tuning.h>
-#include <ripple/peerfinder/impl/iosformat.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/container/aged_map.h>
+#include <xrpl/beast/utility/maybe_const.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
+#include <xrpld/peerfinder/detail/iosformat.h>
 #include <boost/intrusive/list.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h
index 7a2b6a754..0b44366b5 100644
--- a/src/xrpld/peerfinder/detail/Logic.h
+++ b/src/xrpld/peerfinder/detail/Logic.h
@@ -20,22 +20,22 @@
 #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED
 #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/random.h>
-#include <ripple/beast/container/aged_container_utility.h>
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Bootcache.h>
-#include <ripple/peerfinder/impl/Counts.h>
-#include <ripple/peerfinder/impl/Fixed.h>
-#include <ripple/peerfinder/impl/Handouts.h>
-#include <ripple/peerfinder/impl/Livecache.h>
-#include <ripple/peerfinder/impl/Reporting.h>
-#include <ripple/peerfinder/impl/SlotImp.h>
-#include <ripple/peerfinder/impl/Source.h>
-#include <ripple/peerfinder/impl/Store.h>
-#include <ripple/peerfinder/impl/iosformat.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/container/aged_container_utility.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Bootcache.h>
+#include <xrpld/peerfinder/detail/Counts.h>
+#include <xrpld/peerfinder/detail/Fixed.h>
+#include <xrpld/peerfinder/detail/Handouts.h>
+#include <xrpld/peerfinder/detail/Livecache.h>
+#include <xrpld/peerfinder/detail/Reporting.h>
+#include <xrpld/peerfinder/detail/SlotImp.h>
+#include <xrpld/peerfinder/detail/Source.h>
+#include <xrpld/peerfinder/detail/Store.h>
+#include <xrpld/peerfinder/detail/iosformat.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
index 8b90bc971..307522418 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
index 258111a16..664ef31b7 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/core/ConfigSections.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/Checker.h>
-#include <ripple/peerfinder/impl/InMemoryStore.h>
-#include <ripple/peerfinder/impl/Logic.h>
-#include <ripple/peerfinder/impl/SourceStrings.h>
-#include <ripple/peerfinder/impl/StoreSqdb.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/Checker.h>
+#include <xrpld/peerfinder/detail/InMemoryStore.h>
+#include <xrpld/peerfinder/detail/Logic.h>
+#include <xrpld/peerfinder/detail/SourceStrings.h>
+#include <xrpld/peerfinder/detail/StoreSqdb.h>
 #include <boost/asio/io_service.hpp>
 #include <boost/utility/in_place_factory.hpp>
 #include <memory>
diff --git a/src/xrpld/peerfinder/detail/SlotImp.cpp b/src/xrpld/peerfinder/detail/SlotImp.cpp
index c41aeb9d5..a5d13aa72 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.cpp
+++ b/src/xrpld/peerfinder/detail/SlotImp.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/impl/SlotImp.h>
-#include <ripple/peerfinder/impl/Tuning.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/detail/SlotImp.h>
+#include <xrpld/peerfinder/detail/Tuning.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h
index 49e5d731b..cb6a83c63 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.h
+++ b/src/xrpld/peerfinder/detail/SlotImp.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED
 #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED
 
-#include <ripple/beast/container/aged_container_utility.h>
-#include <ripple/beast/container/aged_unordered_map.h>
-#include <ripple/peerfinder/PeerfinderManager.h>
-#include <ripple/peerfinder/Slot.h>
+#include <xrpl/beast/container/aged_container_utility.h>
+#include <xrpl/beast/container/aged_unordered_map.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/Slot.h>
 #include <atomic>
 #include <optional>
 
diff --git a/src/xrpld/peerfinder/detail/Source.h b/src/xrpld/peerfinder/detail/Source.h
index 5c1484381..a64da7b9e 100644
--- a/src/xrpld/peerfinder/detail/Source.h
+++ b/src/xrpld/peerfinder/detail/Source.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_SOURCE_H_INCLUDED
 #define RIPPLE_PEERFINDER_SOURCE_H_INCLUDED
 
-#include <ripple/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
 #include <boost/system/error_code.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/detail/SourceStrings.cpp b/src/xrpld/peerfinder/detail/SourceStrings.cpp
index 4e5db79c7..b01fbfd8c 100644
--- a/src/xrpld/peerfinder/detail/SourceStrings.cpp
+++ b/src/xrpld/peerfinder/detail/SourceStrings.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/peerfinder/impl/SourceStrings.h>
+#include <xrpld/peerfinder/detail/SourceStrings.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/xrpld/peerfinder/detail/SourceStrings.h b/src/xrpld/peerfinder/detail/SourceStrings.h
index 5d67d0887..52d985a70 100644
--- a/src/xrpld/peerfinder/detail/SourceStrings.h
+++ b/src/xrpld/peerfinder/detail/SourceStrings.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_SOURCESTRINGS_H_INCLUDED
 #define RIPPLE_PEERFINDER_SOURCESTRINGS_H_INCLUDED
 
-#include <ripple/peerfinder/impl/Source.h>
+#include <xrpld/peerfinder/detail/Source.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/detail/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h
index 879bee83b..6e290d1d5 100644
--- a/src/xrpld/peerfinder/detail/StoreSqdb.h
+++ b/src/xrpld/peerfinder/detail/StoreSqdb.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED
 #define RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED
 
-#include <ripple/app/rdb/PeerFinder.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/peerfinder/impl/Store.h>
+#include <xrpld/app/rdb/PeerFinder.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpld/peerfinder/detail/Store.h>
 #include <boost/optional.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/make_Manager.h b/src/xrpld/peerfinder/make_Manager.h
index 0ce527125..b53924124 100644
--- a/src/xrpld/peerfinder/make_Manager.h
+++ b/src/xrpld/peerfinder/make_Manager.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED
 #define RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED
 
-#include <ripple/peerfinder/PeerfinderManager.h>
+#include <xrpld/peerfinder/PeerfinderManager.h>
 #include <boost/asio/io_service.hpp>
 #include <memory>
 
diff --git a/src/xrpld/perflog/PerfLog.h b/src/xrpld/perflog/PerfLog.h
index 49ed27338..a7d66f57a 100644
--- a/src/xrpld/perflog/PerfLog.h
+++ b/src/xrpld/perflog/PerfLog.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_BASICS_PERFLOG_H
 #define RIPPLE_BASICS_PERFLOG_H
 
-#include <ripple/core/Config.h>
-#include <ripple/core/JobTypes.h>
-#include <ripple/json/json_value.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobTypes.h>
+#include <xrpl/json/json_value.h>
 #include <boost/filesystem.hpp>
 #include <chrono>
 #include <cstdint>
diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp
index 3d07d0ed6..8bfacd304 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.cpp
+++ b/src/xrpld/perflog/detail/PerfLogImp.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/perflog/impl/PerfLogImp.h>
+#include <xrpld/perflog/detail/PerfLogImp.h>
 
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/core/JobTypes.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/json/to_string.h>
-#include <ripple/nodestore/DatabaseShard.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/beast/core/CurrentThreadName.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/core/JobTypes.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/nodestore/DatabaseShard.h>
 #include <atomic>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/xrpld/perflog/detail/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h
index 4904126d9..168b8f67d 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.h
+++ b/src/xrpld/perflog/detail/PerfLogImp.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_PERFLOGIMP_H
 #define RIPPLE_BASICS_PERFLOGIMP_H
 
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/chrono.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/Handler.h>
 #include <boost/asio/ip/host_name.hpp>
 #include <condition_variable>
 #include <cstdint>
diff --git a/src/xrpld/rpc/Context.h b/src/xrpld/rpc/Context.h
index ea18efcec..edc5582a4 100644
--- a/src/xrpld/rpc/Context.h
+++ b/src/xrpld/rpc/Context.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_RPC_CONTEXT_H_INCLUDED
 #define RIPPLE_RPC_CONTEXT_H_INCLUDED
 
-#include <ripple/core/Config.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/rpc/Role.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpld/rpc/Role.h>
 
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/DeliveredAmount.h b/src/xrpld/rpc/DeliveredAmount.h
index 94fff68f7..2ebadd387 100644
--- a/src/xrpld/rpc/DeliveredAmount.h
+++ b/src/xrpld/rpc/DeliveredAmount.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_DELIVEREDAMOUNT_H_INCLUDED
 #define RIPPLE_RPC_DELIVEREDAMOUNT_H_INCLUDED
 
-#include <ripple/protocol/Protocol.h>
-#include <ripple/protocol/STAmount.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STAmount.h>
 
 #include <functional>
 #include <memory>
diff --git a/src/xrpld/rpc/GRPCHandlers.h b/src/xrpld/rpc/GRPCHandlers.h
index 9fb8d0909..fca144bb4 100644
--- a/src/xrpld/rpc/GRPCHandlers.h
+++ b/src/xrpld/rpc/GRPCHandlers.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_GRPCHANDLER_H_INCLUDED
 #define RIPPLE_RPC_GRPCHANDLER_H_INCLUDED
 
-#include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
-#include <ripple/rpc/Context.h>
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
+#include <xrpld/rpc/Context.h>
 #include <grpcpp/grpcpp.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/RPCHandler.h b/src/xrpld/rpc/RPCHandler.h
index 45c737783..c056ca27e 100644
--- a/src/xrpld/rpc/RPCHandler.h
+++ b/src/xrpld/rpc/RPCHandler.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_RPC_RPCHANDLER_H_INCLUDED
 #define RIPPLE_RPC_RPCHANDLER_H_INCLUDED
 
-#include <ripple/core/Config.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Status.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Status.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/rpc/Request.h b/src/xrpld/rpc/Request.h
index 4f9918215..5a006299a 100644
--- a/src/xrpld/rpc/Request.h
+++ b/src/xrpld/rpc/Request.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_RPC_REQUEST_H_INCLUDED
 #define RIPPLE_RPC_REQUEST_H_INCLUDED
 
-#include <ripple/json/json_value.h>
-#include <ripple/resource/Charge.h>
-#include <ripple/resource/Fees.h>
-#include <beast/utility/Journal.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/Role.h b/src/xrpld/rpc/Role.h
index 1ce76f90d..0ce84e09e 100644
--- a/src/xrpld/rpc/Role.h
+++ b/src/xrpld/rpc/Role.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SERVER_ROLE_H_INCLUDED
 #define RIPPLE_SERVER_ROLE_H_INCLUDED
 
-#include <ripple/beast/net/IPEndpoint.h>
-#include <ripple/json/json_value.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/server/Handoff.h>
-#include <ripple/server/Port.h>
+#include <xrpl/beast/net/IPEndpoint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpl/server/Handoff.h>
+#include <xrpl/server/Port.h>
 #include <boost/asio/ip/network_v4.hpp>
 #include <boost/asio/ip/network_v6.hpp>
 #include <boost/utility/string_view.hpp>
diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h
index 9dc665aba..4316f8a21 100644
--- a/src/xrpld/rpc/ServerHandler.h
+++ b/src/xrpld/rpc/ServerHandler.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_RPC_SERVERHANDLER_H_INCLUDED
 #define RIPPLE_RPC_SERVERHANDLER_H_INCLUDED
 
-#include <ripple/app/main/CollectorManager.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/Output.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/UDPInfoSub.h>
-#include <ripple/rpc/impl/WSInfoSub.h>
-#include <ripple/server/Server.h>
-#include <ripple/server/Session.h>
-#include <ripple/server/WSSession.h>
+#include <xrpld/app/main/CollectorManager.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/Output.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/UDPInfoSub.h>
+#include <xrpld/rpc/detail/WSInfoSub.h>
+#include <xrpl/server/Server.h>
+#include <xrpl/server/Session.h>
+#include <xrpl/server/WSSession.h>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/utility/string_view.hpp>
diff --git a/src/xrpld/rpc/ShardArchiveHandler.h b/src/xrpld/rpc/ShardArchiveHandler.h
index b9e9b3a60..1a27a9af7 100644
--- a/src/xrpld/rpc/ShardArchiveHandler.h
+++ b/src/xrpld/rpc/ShardArchiveHandler.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_RPC_SHARDARCHIVEHANDLER_H_INCLUDED
 #define RIPPLE_RPC_SHARDARCHIVEHANDLER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/net/DatabaseDownloader.h>
-#include <ripple/rpc/ShardVerificationScheduler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/net/DatabaseDownloader.h>
+#include <xrpld/rpc/ShardVerificationScheduler.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/xrpld/rpc/ShardVerificationScheduler.h b/src/xrpld/rpc/ShardVerificationScheduler.h
index 659b3e904..bc561381b 100644
--- a/src/xrpld/rpc/ShardVerificationScheduler.h
+++ b/src/xrpld/rpc/ShardVerificationScheduler.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_RPC_SHARDVERIFICATIONSCHEDULER_H_INCLUDED
 #define RIPPLE_RPC_SHARDVERIFICATIONSCHEDULER_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
+#include <xrpld/app/main/Application.h>
 #include <functional>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/Status.h b/src/xrpld/rpc/Status.h
index d930d7ab4..1d94a6837 100644
--- a/src/xrpld/rpc/Status.h
+++ b/src/xrpld/rpc/Status.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_STATUS_H_INCLUDED
 #define RIPPLE_RPC_STATUS_H_INCLUDED
 
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/TER.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/TER.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/detail/DeliveredAmount.cpp b/src/xrpld/rpc/detail/DeliveredAmount.cpp
index eda7bd63e..38bcf377d 100644
--- a/src/xrpld/rpc/detail/DeliveredAmount.cpp
+++ b/src/xrpld/rpc/detail/DeliveredAmount.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/DeliveredAmount.h>
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <boost/algorithm/string/case_conv.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/detail/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp
index 862dcc055..b304d92ea 100644
--- a/src/xrpld/rpc/detail/Handler.cpp
+++ b/src/xrpld/rpc/detail/Handler.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/rpc/handlers/Handlers.h>
-#include <ripple/rpc/handlers/Version.h>
-#include <ripple/rpc/impl/Handler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/rpc/handlers/Handlers.h>
+#include <xrpld/rpc/handlers/Version.h>
+#include <xrpld/rpc/detail/Handler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 #include <map>
 
diff --git a/src/xrpld/rpc/detail/Handler.h b/src/xrpld/rpc/detail/Handler.h
index 28d1ee60c..81fbc2be3 100644
--- a/src/xrpld/rpc/detail/Handler.h
+++ b/src/xrpld/rpc/detail/Handler.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_RPC_HANDLER_H_INCLUDED
 #define RIPPLE_RPC_HANDLER_H_INCLUDED
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/core/Config.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/Status.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/Status.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <vector>
 
 namespace Json {
diff --git a/src/xrpld/rpc/detail/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp
index 1c13709ea..35220178b 100644
--- a/src/xrpld/rpc/detail/LegacyPathFind.cpp
+++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/core/Job.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/rpc/impl/LegacyPathFind.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/core/Job.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpld/rpc/detail/LegacyPathFind.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index 9c5aa6d46..8039c96d3 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -17,29 +17,29 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/basics/contract.h>
-#include <ripple/core/Config.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/Object.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/Handler.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/Object.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/Handler.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <atomic>
 #include <chrono>
 #include <variant>
diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp
index be2959da7..81f3422de 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCHelpers.cpp
@@ -17,26 +17,26 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/nftPageMask.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/DeliveredAmount.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/nftPageMask.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <regex>
 
-#include <ripple/resource/Fees.h>
+#include <xrpl/resource/Fees.h>
 #include <regex>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/detail/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h
index 451cfb1bc..3223f3cd4 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.h
+++ b/src/xrpld/rpc/detail/RPCHelpers.h
@@ -20,17 +20,17 @@
 #ifndef RIPPLE_RPC_RPCHELPERS_H_INCLUDED
 #define RIPPLE_RPC_RPCHELPERS_H_INCLUDED
 
-#include <ripple/beast/core/SemanticVersion.h>
-#include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
-#include <ripple/protocol/ApiVersion.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/beast/core/SemanticVersion.h>
+#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
+#include <xrpl/protocol/ApiVersion.h>
+#include <xrpl/protocol/TxMeta.h>
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Status.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Status.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 #include <optional>
 #include <variant>
diff --git a/src/xrpld/rpc/detail/Role.cpp b/src/xrpld/rpc/detail/Role.cpp
index 54f6d6e25..5cfe30b26 100644
--- a/src/xrpld/rpc/detail/Role.cpp
+++ b/src/xrpld/rpc/detail/Role.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/rpc/Role.h>
+#include <xrpld/rpc/Role.h>
 #include <boost/beast/http/field.hpp>
 #include <boost/utility/string_view.hpp>
 #include <algorithm>
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index eb9e23055..ee6cb529d 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -17,33 +17,33 @@
 */
 //==============================================================================
 
-#include <ripple/rpc/ServerHandler.h>
+#include <xrpld/rpc/ServerHandler.h>
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/base64.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/make_SSLContext.h>
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/beast/rfc2616.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
-#include <ripple/rpc/json_body.h>
-#include <ripple/server/Server.h>
-#include <ripple/server/SimpleWriter.h>
-#include <ripple/server/impl/JSONRPCUtil.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/make_SSLContext.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/beast/rfc2616.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
+#include <xrpld/rpc/json_body.h>
+#include <xrpl/server/Server.h>
+#include <xrpl/server/SimpleWriter.h>
+#include <xrpl/server/detail/JSONRPCUtil.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/beast/http/fields.hpp>
 #include <boost/beast/http/string_body.hpp>
diff --git a/src/xrpld/rpc/detail/ServerHandlerImp.h b/src/xrpld/rpc/detail/ServerHandlerImp.h
index de54044f7..2251774f4 100644
--- a/src/xrpld/rpc/detail/ServerHandlerImp.h
+++ b/src/xrpld/rpc/detail/ServerHandlerImp.h
@@ -20,15 +20,15 @@
 #ifndef RIPPLE_RPC_SERVERHANDLERIMP_H_INCLUDED
 #define RIPPLE_RPC_SERVERHANDLERIMP_H_INCLUDED
 
-#include <ripple/app/main/CollectorManager.h>
-#include <ripple/core/JobQueue.h>
-#include <ripple/json/Output.h>
-#include <ripple/rpc/RPCHandler.h>
-#include <ripple/rpc/impl/UDPInfoSub.h>
-#include <ripple/rpc/impl/WSInfoSub.h>
-#include <ripple/server/Server.h>
-#include <ripple/server/Session.h>
-#include <ripple/server/WSSession.h>
+#include <xrpld/app/main/CollectorManager.h>
+#include <xrpld/core/JobQueue.h>
+#include <xrpl/json/Output.h>
+#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/detail/UDPInfoSub.h>
+#include <xrpld/rpc/detail/WSInfoSub.h>
+#include <xrpl/server/Server.h>
+#include <xrpl/server/Session.h>
+#include <xrpl/server/WSSession.h>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/utility/string_view.hpp>
diff --git a/src/xrpld/rpc/detail/ShardArchiveHandler.cpp b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp
index 90bd5edc3..fae36069a 100644
--- a/src/xrpld/rpc/detail/ShardArchiveHandler.cpp
+++ b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/rdb/ShardArchive.h>
-#include <ripple/basics/Archive.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/core/ConfigSections.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/rpc/ShardArchiveHandler.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/rdb/ShardArchive.h>
+#include <xrpl/basics/Archive.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/core/ConfigSections.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/rpc/ShardArchiveHandler.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 #include <memory>
 
diff --git a/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp b/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp
index ad6b6df7b..f571e8b29 100644
--- a/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp
+++ b/src/xrpld/rpc/detail/ShardVerificationScheduler.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/rpc/ShardVerificationScheduler.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/rpc/ShardVerificationScheduler.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/rpc/detail/Status.cpp b/src/xrpld/rpc/detail/Status.cpp
index e9e64da7a..af212d37f 100644
--- a/src/xrpld/rpc/detail/Status.cpp
+++ b/src/xrpld/rpc/detail/Status.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/rpc/Status.h>
+#include <xrpld/rpc/Status.h>
 #include <sstream>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 3f4407c86..258235251 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -17,29 +17,29 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/paths/Pathfinder.h>
-#include <ripple/app/tx/apply.h>  // Validity::Valid
-#include <ripple/basics/Log.h>
-#include <ripple/basics/mulDiv.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/STParsedJSON.h>
-#include <ripple/protocol/Sign.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/rpc/impl/LegacyPathFind.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/TransactionSign.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/paths/Pathfinder.h>
+#include <xrpld/app/tx/apply.h>  // Validity::Valid
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/mulDiv.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpld/rpc/detail/LegacyPathFind.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <algorithm>
 #include <iterator>
 
diff --git a/src/xrpld/rpc/detail/TransactionSign.h b/src/xrpld/rpc/detail/TransactionSign.h
index 2a38031f5..36fb60555 100644
--- a/src/xrpld/rpc/detail/TransactionSign.h
+++ b/src/xrpld/rpc/detail/TransactionSign.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED
 #define RIPPLE_RPC_TRANSACTIONSIGN_H_INCLUDED
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/ledger/ApplyView.h>
-#include <ripple/rpc/Role.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/ledger/ApplyView.h>
+#include <xrpld/rpc/Role.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/detail/UDPInfoSub.h b/src/xrpld/rpc/detail/UDPInfoSub.h
index 4766b7b07..14612b04b 100644
--- a/src/xrpld/rpc/detail/UDPInfoSub.h
+++ b/src/xrpld/rpc/detail/UDPInfoSub.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_RPC_UDPINFOSUB_H
 #define RIPPLE_RPC_UDPINFOSUB_H
 
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/json/to_string.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/server/WSSession.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/json/to_string.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpl/server/WSSession.h>
 #include <boost/utility/string_view.hpp>
 #include <memory>
 #include <string>
diff --git a/src/xrpld/rpc/detail/WSInfoSub.h b/src/xrpld/rpc/detail/WSInfoSub.h
index 9213f52f1..e022a41a4 100644
--- a/src/xrpld/rpc/detail/WSInfoSub.h
+++ b/src/xrpld/rpc/detail/WSInfoSub.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_RPC_WSINFOSUB_H
 #define RIPPLE_RPC_WSINFOSUB_H
 
-#include <ripple/beast/net/IPAddressConversion.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/net/InfoSub.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/server/WSSession.h>
+#include <xrpl/beast/net/IPAddressConversion.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpld/net/InfoSub.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpl/server/WSSession.h>
 #include <boost/utility/string_view.hpp>
 #include <memory>
 #include <string>
diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp
index b4f56ffba..fe5ba9f5c 100644
--- a/src/xrpld/rpc/handlers/AMMInfo.cpp
+++ b/src/xrpld/rpc/handlers/AMMInfo.cpp
@@ -16,15 +16,15 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/AMMUtils.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/AMMCore.h>
-#include <ripple/protocol/Issue.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/AMMUtils.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <grpcpp/support/status.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/AccountChannels.cpp b/src/xrpld/rpc/handlers/AccountChannels.cpp
index 322a98da2..2f181e759 100644
--- a/src/xrpld/rpc/handlers/AccountChannels.cpp
+++ b/src/xrpld/rpc/handlers/AccountChannels.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 namespace ripple {
 
 void
diff --git a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
index 0114e25c7..a1ae9dac1 100644
--- a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
+++ b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/AccountInfo.cpp b/src/xrpld/rpc/handlers/AccountInfo.cpp
index 55d7f7b82..9cb3fec02 100644
--- a/src/xrpld/rpc/handlers/AccountInfo.cpp
+++ b/src/xrpld/rpc/handlers/AccountInfo.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <grpc/status.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/AccountLines.cpp b/src/xrpld/rpc/handlers/AccountLines.cpp
index 7ce59af0f..182cbe091 100644
--- a/src/xrpld/rpc/handlers/AccountLines.cpp
+++ b/src/xrpld/rpc/handlers/AccountLines.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/AccountNamespace.cpp b/src/xrpld/rpc/handlers/AccountNamespace.cpp
index e401bb67d..769da66fc 100644
--- a/src/xrpld/rpc/handlers/AccountNamespace.cpp
+++ b/src/xrpld/rpc/handlers/AccountNamespace.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 #include <sstream>
 #include <string>
diff --git a/src/xrpld/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp
index 67fb3b335..7fc1aa042 100644
--- a/src/xrpld/rpc/handlers/AccountObjects.cpp
+++ b/src/xrpld/rpc/handlers/AccountObjects.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/tx/impl/details/NFTokenUtils.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/protocol/nftPageMask.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/nftPageMask.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 #include <sstream>
 #include <string>
diff --git a/src/xrpld/rpc/handlers/AccountOffers.cpp b/src/xrpld/rpc/handlers/AccountOffers.cpp
index 2be50e168..882041c55 100644
--- a/src/xrpld/rpc/handlers/AccountOffers.cpp
+++ b/src/xrpld/rpc/handlers/AccountOffers.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/AccountTx.cpp b/src/xrpld/rpc/handlers/AccountTx.cpp
index 89d4f49a5..75e312a74 100644
--- a/src/xrpld/rpc/handlers/AccountTx.cpp
+++ b/src/xrpld/rpc/handlers/AccountTx.cpp
@@ -17,26 +17,26 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/rdb/backend/PostgresDatabase.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/core/Pg.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/NFTSyntheticSerializer.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/DeliveredAmount.h>
-#include <ripple/rpc/Role.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/rdb/backend/PostgresDatabase.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpld/core/Pg.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/NFTSyntheticSerializer.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/Role.h>
 
 #include <grpcpp/grpcpp.h>
 
diff --git a/src/xrpld/rpc/handlers/BlackList.cpp b/src/xrpld/rpc/handlers/BlackList.cpp
index 3fe5b99e5..68a88c7ee 100644
--- a/src/xrpld/rpc/handlers/BlackList.cpp
+++ b/src/xrpld/rpc/handlers/BlackList.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/ResourceManager.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/ResourceManager.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/BookOffers.cpp b/src/xrpld/rpc/handlers/BookOffers.cpp
index e21d7047f..19febe656 100644
--- a/src/xrpld/rpc/handlers/BookOffers.cpp
+++ b/src/xrpld/rpc/handlers/BookOffers.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/UintTypes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/BookChanges.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/BookChanges.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/CanDelete.cpp b/src/xrpld/rpc/handlers/CanDelete.cpp
index 3127b5c43..4f0da11f3 100644
--- a/src/xrpld/rpc/handlers/CanDelete.cpp
+++ b/src/xrpld/rpc/handlers/CanDelete.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/SHAMapStore.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/SHAMapStore.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/format.hpp>
 
diff --git a/src/xrpld/rpc/handlers/Catalogue.cpp b/src/xrpld/rpc/handlers/Catalogue.cpp
index 232fe7112..abe386597 100644
--- a/src/xrpld/rpc/handlers/Catalogue.cpp
+++ b/src/xrpld/rpc/handlers/Catalogue.cpp
@@ -17,24 +17,24 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/Ledger.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
-#include <ripple/shamap/SHAMapItem.h>
+#include <xrpld/app/ledger/Ledger.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
+#include <xrpld/shamap/SHAMapItem.h>
 
 #include <atomic>
 #include <condition_variable>
diff --git a/src/xrpld/rpc/handlers/Connect.cpp b/src/xrpld/rpc/handlers/Connect.cpp
index 46fac457c..ac6a0bc0d 100644
--- a/src/xrpld/rpc/handlers/Connect.cpp
+++ b/src/xrpld/rpc/handlers/Connect.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/core/Config.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/SystemParameters.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/Config.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SystemParameters.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/ConsensusInfo.cpp b/src/xrpld/rpc/handlers/ConsensusInfo.cpp
index ee7eb10e6..2f26b6da7 100644
--- a/src/xrpld/rpc/handlers/ConsensusInfo.cpp
+++ b/src/xrpld/rpc/handlers/ConsensusInfo.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/CrawlShards.cpp b/src/xrpld/rpc/handlers/CrawlShards.cpp
index 41b74860c..392e1afb8 100644
--- a/src/xrpld/rpc/handlers/CrawlShards.cpp
+++ b/src/xrpld/rpc/handlers/CrawlShards.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/RangeSet.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/RangeSet.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/DepositAuthorized.cpp
index bb6e3b07a..cdd19b33d 100644
--- a/src/xrpld/rpc/handlers/DepositAuthorized.cpp
+++ b/src/xrpld/rpc/handlers/DepositAuthorized.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/DownloadShard.cpp b/src/xrpld/rpc/handlers/DownloadShard.cpp
index eacf499df..460820607 100644
--- a/src/xrpld/rpc/handlers/DownloadShard.cpp
+++ b/src/xrpld/rpc/handlers/DownloadShard.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/BasicConfig.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/ShardArchiveHandler.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/ShardArchiveHandler.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/xrpld/rpc/handlers/Feature1.cpp b/src/xrpld/rpc/handlers/Feature1.cpp
index 94a205e62..c7f658e88 100644
--- a/src/xrpld/rpc/handlers/Feature1.cpp
+++ b/src/xrpld/rpc/handlers/Feature1.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Fee1.cpp b/src/xrpld/rpc/handlers/Fee1.cpp
index c8b993ac3..4421bb423 100644
--- a/src/xrpld/rpc/handlers/Fee1.cpp
+++ b/src/xrpld/rpc/handlers/Fee1.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/hook/applyHook.h>
-#include <ripple/app/ledger/OpenLedger.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/impl/Transactor.h>
-#include <ripple/basics/FeeUnits.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
+#include <xrpld/app/hook/applyHook.h>
+#include <xrpld/app/ledger/OpenLedger.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/basics/FeeUnits.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
 namespace ripple {
 
 inline std::optional<XRPAmount>
diff --git a/src/xrpld/rpc/handlers/FetchInfo.cpp b/src/xrpld/rpc/handlers/FetchInfo.cpp
index 79d82b646..0c079948b 100644
--- a/src/xrpld/rpc/handlers/FetchInfo.cpp
+++ b/src/xrpld/rpc/handlers/FetchInfo.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/GatewayBalances.cpp b/src/xrpld/rpc/handlers/GatewayBalances.cpp
index 89be6290f..31973b140 100644
--- a/src/xrpld/rpc/handlers/GatewayBalances.cpp
+++ b/src/xrpld/rpc/handlers/GatewayBalances.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/AccountID.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
index 3554ba90c..e314b445f 100644
--- a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
+++ b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 #include <boost/bimap.hpp>
 #include <boost/bimap/multiset_of.hpp>
diff --git a/src/xrpld/rpc/handlers/GetCounts.cpp b/src/xrpld/rpc/handlers/GetCounts.cpp
index 131cf7d36..f9d480e10 100644
--- a/src/xrpld/rpc/handlers/GetCounts.cpp
+++ b/src/xrpld/rpc/handlers/GetCounts.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/AcceptedLedger.h>
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/rdb/backend/SQLiteDatabase.h>
-#include <ripple/basics/UptimeClock.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/CachedSLEs.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/shamap/ShardFamily.h>
+#include <xrpld/app/ledger/AcceptedLedger.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/rdb/backend/SQLiteDatabase.h>
+#include <xrpl/basics/UptimeClock.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/CachedSLEs.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/shamap/ShardFamily.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/GetCounts.h b/src/xrpld/rpc/handlers/GetCounts.h
index 28a3e7d06..dacf93fa9 100644
--- a/src/xrpld/rpc/handlers/GetCounts.h
+++ b/src/xrpld/rpc/handlers/GetCounts.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_HANDLERS_GETCOUNTS_H_INCLUDED
 #define RIPPLE_RPC_HANDLERS_GETCOUNTS_H_INCLUDED
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/Object.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/Object.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Handlers.h b/src/xrpld/rpc/handlers/Handlers.h
index fbcd5e88f..3f3fba3bd 100644
--- a/src/xrpld/rpc/handlers/Handlers.h
+++ b/src/xrpld/rpc/handlers/Handlers.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED
 #define RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED
 
-#include <ripple/rpc/handlers/LedgerHandler.h>
+#include <xrpld/rpc/handlers/LedgerHandler.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerAccept.cpp b/src/xrpld/rpc/handlers/LedgerAccept.cpp
index 141777911..50e6ab4ed 100644
--- a/src/xrpld/rpc/handlers/LedgerAccept.cpp
+++ b/src/xrpld/rpc/handlers/LedgerAccept.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/core/Config.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/core/Config.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 #include <mutex>
 
diff --git a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
index 5b76f3f8b..df557dcf6 100644
--- a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
+++ b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerCleaner.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/ledger/LedgerCleaner.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerClosed.cpp b/src/xrpld/rpc/handlers/LedgerClosed.cpp
index 66e003e08..49cf2eeaa 100644
--- a/src/xrpld/rpc/handlers/LedgerClosed.cpp
+++ b/src/xrpld/rpc/handlers/LedgerClosed.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerCurrent.cpp b/src/xrpld/rpc/handlers/LedgerCurrent.cpp
index 3539c8009..0fb8a61cd 100644
--- a/src/xrpld/rpc/handlers/LedgerCurrent.cpp
+++ b/src/xrpld/rpc/handlers/LedgerCurrent.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerData.cpp b/src/xrpld/rpc/handlers/LedgerData.cpp
index f54339457..07a8a23aa 100644
--- a/src/xrpld/rpc/handlers/LedgerData.cpp
+++ b/src/xrpld/rpc/handlers/LedgerData.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerDiff.cpp b/src/xrpld/rpc/handlers/LedgerDiff.cpp
index 122dcfa31..6398be609 100644
--- a/src/xrpld/rpc/handlers/LedgerDiff.cpp
+++ b/src/xrpld/rpc/handlers/LedgerDiff.cpp
@@ -1,5 +1,5 @@
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 std::pair<org::xrpl::rpc::v1::GetLedgerDiffResponse, grpc::Status>
diff --git a/src/xrpld/rpc/handlers/LedgerEntry.cpp b/src/xrpld/rpc/handlers/LedgerEntry.cpp
index 790764960..6f8498eeb 100644
--- a/src/xrpld/rpc/handlers/LedgerEntry.cpp
+++ b/src/xrpld/rpc/handlers/LedgerEntry.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/json/json_errors.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/STXChainBridge.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/json/json_errors.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerHandler.cpp b/src/xrpld/rpc/handlers/LedgerHandler.cpp
index 39f63f9b0..55dd8cd6c 100644
--- a/src/xrpld/rpc/handlers/LedgerHandler.cpp
+++ b/src/xrpld/rpc/handlers/LedgerHandler.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/json/Object.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/handlers/LedgerHandler.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpl/json/Object.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/handlers/LedgerHandler.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/rpc/handlers/LedgerHandler.h b/src/xrpld/rpc/handlers/LedgerHandler.h
index b0bca8e66..0f9774799 100644
--- a/src/xrpld/rpc/handlers/LedgerHandler.h
+++ b/src/xrpld/rpc/handlers/LedgerHandler.h
@@ -20,17 +20,17 @@
 #ifndef RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED
 #define RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/json/Object.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/Status.h>
-#include <ripple/rpc/impl/Handler.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/Object.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/Status.h>
+#include <xrpld/rpc/detail/Handler.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace Json {
 class Object;
diff --git a/src/xrpld/rpc/handlers/LedgerHeader.cpp b/src/xrpld/rpc/handlers/LedgerHeader.cpp
index 0f4443656..3296c0a27 100644
--- a/src/xrpld/rpc/handlers/LedgerHeader.cpp
+++ b/src/xrpld/rpc/handlers/LedgerHeader.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/LedgerRequest.cpp b/src/xrpld/rpc/handlers/LedgerRequest.cpp
index 83e7a2184..f61048e97 100644
--- a/src/xrpld/rpc/handlers/LedgerRequest.cpp
+++ b/src/xrpld/rpc/handlers/LedgerRequest.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/InboundLedgers.h>
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/LedgerToJson.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/ledger/InboundLedgers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerToJson.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 #include <variant>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/LogLevel.cpp b/src/xrpld/rpc/handlers/LogLevel.cpp
index 20931898d..7e27385b0 100644
--- a/src/xrpld/rpc/handlers/LogLevel.cpp
+++ b/src/xrpld/rpc/handlers/LogLevel.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/Log.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/LogRotate.cpp b/src/xrpld/rpc/handlers/LogRotate.cpp
index 93e66451f..47fa7a289 100644
--- a/src/xrpld/rpc/handlers/LogRotate.cpp
+++ b/src/xrpld/rpc/handlers/LogRotate.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/Log.h>
-#include <ripple/basics/PerfLog.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/perflog/PerfLog.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Manifest.cpp b/src/xrpld/rpc/handlers/Manifest.cpp
index 22abfde8a..58325412c 100644
--- a/src/xrpld/rpc/handlers/Manifest.cpp
+++ b/src/xrpld/rpc/handlers/Manifest.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 Json::Value
diff --git a/src/xrpld/rpc/handlers/NFTOffers.cpp b/src/xrpld/rpc/handlers/NFTOffers.cpp
index bca862d27..fbb8c7449 100644
--- a/src/xrpld/rpc/handlers/NFTOffers.cpp
+++ b/src/xrpld/rpc/handlers/NFTOffers.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/ledger/View.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/ledger/View.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/NoRippleCheck.cpp
index 6cb206e25..752edc92a 100644
--- a/src/xrpld/rpc/handlers/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/NoRippleCheck.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/app/paths/TrustLine.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/app/paths/TrustLine.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/NodeToShard.cpp b/src/xrpld/rpc/handlers/NodeToShard.cpp
index 552900d15..10995ee9c 100644
--- a/src/xrpld/rpc/handlers/NodeToShard.cpp
+++ b/src/xrpld/rpc/handlers/NodeToShard.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/OwnerInfo.cpp b/src/xrpld/rpc/handlers/OwnerInfo.cpp
index 546a2e709..dc066a8af 100644
--- a/src/xrpld/rpc/handlers/OwnerInfo.cpp
+++ b/src/xrpld/rpc/handlers/OwnerInfo.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/PathFind.cpp b/src/xrpld/rpc/handlers/PathFind.cpp
index 9c8794b59..2527dbba5 100644
--- a/src/xrpld/rpc/handlers/PathFind.cpp
+++ b/src/xrpld/rpc/handlers/PathFind.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/PayChanClaim.cpp b/src/xrpld/rpc/handlers/PayChanClaim.cpp
index 3fbf831a6..d70811763 100644
--- a/src/xrpld/rpc/handlers/PayChanClaim.cpp
+++ b/src/xrpld/rpc/handlers/PayChanClaim.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/PayChan.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/STAccount.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/Tuning.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/PayChan.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/Tuning.h>
 
 #include <optional>
 
diff --git a/src/xrpld/rpc/handlers/Peers.cpp b/src/xrpld/rpc/handlers/Peers.cpp
index 4f377da72..a52afba65 100644
--- a/src/xrpld/rpc/handlers/Peers.cpp
+++ b/src/xrpld/rpc/handlers/Peers.cpp
@@ -17,14 +17,14 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/LoadFeeTrack.h>
-#include <ripple/core/TimeKeeper.h>
-#include <ripple/overlay/Cluster.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/misc/LoadFeeTrack.h>
+#include <xrpld/core/TimeKeeper.h>
+#include <xrpld/overlay/Cluster.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Ping.cpp b/src/xrpld/rpc/handlers/Ping.cpp
index efe9063a1..f2b0fa70f 100644
--- a/src/xrpld/rpc/handlers/Ping.cpp
+++ b/src/xrpld/rpc/handlers/Ping.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Print.cpp b/src/xrpld/rpc/handlers/Print.cpp
index 191ecf1ec..860b05a2c 100644
--- a/src/xrpld/rpc/handlers/Print.cpp
+++ b/src/xrpld/rpc/handlers/Print.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/JsonPropertyStream.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/JsonPropertyStream.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Random.cpp b/src/xrpld/rpc/handlers/Random.cpp
index 536296966..cea83a616 100644
--- a/src/xrpld/rpc/handlers/Random.cpp
+++ b/src/xrpld/rpc/handlers/Random.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/utility/rngfill.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/rngfill.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Reservations.cpp b/src/xrpld/rpc/handlers/Reservations.cpp
index ffbfd0f98..11d6bf7c5 100644
--- a/src/xrpld/rpc/handlers/Reservations.cpp
+++ b/src/xrpld/rpc/handlers/Reservations.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/handlers/Handlers.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/handlers/Handlers.h>
 
 #include <optional>
 #include <string>
diff --git a/src/xrpld/rpc/handlers/RipplePathFind.cpp b/src/xrpld/rpc/handlers/RipplePathFind.cpp
index 19bce9984..faf516b22 100644
--- a/src/xrpld/rpc/handlers/RipplePathFind.cpp
+++ b/src/xrpld/rpc/handlers/RipplePathFind.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/paths/PathRequests.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/LegacyPathFind.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/paths/PathRequests.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/LegacyPathFind.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/ServerDefinitions.cpp b/src/xrpld/rpc/handlers/ServerDefinitions.cpp
index bcc669d31..e69a1af91 100644
--- a/src/xrpld/rpc/handlers/ServerDefinitions.cpp
+++ b/src/xrpld/rpc/handlers/ServerDefinitions.cpp
@@ -19,19 +19,19 @@
 
 #define MAGIC_ENUM_NO_CHECK_REFLECTED_ENUM
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/AmendmentTable.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/AmendmentTable.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 #include <boost/algorithm/string.hpp>
 #include <magic/magic_enum.h>
 #include <sstream>
diff --git a/src/xrpld/rpc/handlers/ServerInfo.cpp b/src/xrpld/rpc/handlers/ServerInfo.cpp
index 17c45a1fd..3b1d244a9 100644
--- a/src/xrpld/rpc/handlers/ServerInfo.cpp
+++ b/src/xrpld/rpc/handlers/ServerInfo.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/reporting/P2pProxy.h>
-#include <ripple/json/json_value.h>
-#include <ripple/json/json_writer.h>
-#include <ripple/protocol/LedgerFormats.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/SField.h>
-#include <ripple/protocol/TER.h>
-#include <ripple/protocol/TxFormats.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/reporting/P2pProxy.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/xrpld/rpc/handlers/ServerState.cpp b/src/xrpld/rpc/handlers/ServerState.cpp
index 05d408a72..340b8919f 100644
--- a/src/xrpld/rpc/handlers/ServerState.cpp
+++ b/src/xrpld/rpc/handlers/ServerState.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/SignFor.cpp b/src/xrpld/rpc/handlers/SignFor.cpp
index 722cf7da1..05020b3c5 100644
--- a/src/xrpld/rpc/handlers/SignFor.cpp
+++ b/src/xrpld/rpc/handlers/SignFor.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/SignHandler.cpp b/src/xrpld/rpc/handlers/SignHandler.cpp
index 4d89cdcb2..59ee75081 100644
--- a/src/xrpld/rpc/handlers/SignHandler.cpp
+++ b/src/xrpld/rpc/handlers/SignHandler.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Stop.cpp b/src/xrpld/rpc/handlers/Stop.cpp
index 946755696..89562bd91 100644
--- a/src/xrpld/rpc/handlers/Stop.cpp
+++ b/src/xrpld/rpc/handlers/Stop.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/rpc/impl/Handler.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/rpc/detail/Handler.h>
 
 #include <mutex>
 
diff --git a/src/xrpld/rpc/handlers/Submit.cpp b/src/xrpld/rpc/handlers/Submit.cpp
index 656c0e9a1..011c0ed46 100644
--- a/src/xrpld/rpc/handlers/Submit.cpp
+++ b/src/xrpld/rpc/handlers/Submit.cpp
@@ -17,18 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/misc/HashRouter.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/misc/TxQ.h>
-#include <ripple/app/tx/apply.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/misc/HashRouter.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/tx/apply.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
index 5b9d5b34a..2058ff660 100644
--- a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
+++ b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/Feature.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/TransactionSign.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Subscribe.cpp b/src/xrpld/rpc/handlers/Subscribe.cpp
index 0bbb8ad13..507c5d71b 100644
--- a/src/xrpld/rpc/handlers/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/Subscribe.cpp
@@ -17,20 +17,20 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/net/RPCSub.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/UDPInfoSub.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpld/net/RPCSub.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/UDPInfoSub.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/TransactionEntry.cpp b/src/xrpld/rpc/handlers/TransactionEntry.cpp
index 6d157891d..e12aee5fa 100644
--- a/src/xrpld/rpc/handlers/TransactionEntry.cpp
+++ b/src/xrpld/rpc/handlers/TransactionEntry.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/ledger/ReadView.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/ledger/ReadView.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Tx.cpp b/src/xrpld/rpc/handlers/Tx.cpp
index 17a6c67ff..d94530fda 100644
--- a/src/xrpld/rpc/handlers/Tx.cpp
+++ b/src/xrpld/rpc/handlers/Tx.cpp
@@ -17,22 +17,22 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/ledger/TransactionMaster.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/basics/ToString.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/NFTSyntheticSerializer.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/CTID.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/DeliveredAmount.h>
-#include <ripple/rpc/GRPCHandlers.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/TransactionMaster.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpl/basics/ToString.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/NFTSyntheticSerializer.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/CTID.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/DeliveredAmount.h>
+#include <xrpld/rpc/GRPCHandlers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 #include <charconv>
 #include <regex>
diff --git a/src/xrpld/rpc/handlers/TxHistory.cpp b/src/xrpld/rpc/handlers/TxHistory.cpp
index 8759d4af1..b0cdec2b0 100644
--- a/src/xrpld/rpc/handlers/TxHistory.cpp
+++ b/src/xrpld/rpc/handlers/TxHistory.cpp
@@ -17,21 +17,21 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/DeliverMax.h>
-#include <ripple/app/misc/Transaction.h>
-#include <ripple/app/rdb/RelationalDatabase.h>
-#include <ripple/core/DatabaseCon.h>
-#include <ripple/core/Pg.h>
-#include <ripple/core/SociDB.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/resource/Fees.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/Status.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/DeliverMax.h>
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/rdb/RelationalDatabase.h>
+#include <xrpld/core/DatabaseCon.h>
+#include <xrpld/core/Pg.h>
+#include <xrpld/core/SociDB.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Fees.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/Status.h>
 #include <boost/format.hpp>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/TxReduceRelay.cpp b/src/xrpld/rpc/handlers/TxReduceRelay.cpp
index bb883b8de..80294339b 100644
--- a/src/xrpld/rpc/handlers/TxReduceRelay.cpp
+++ b/src/xrpld/rpc/handlers/TxReduceRelay.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/json/json_value.h>
-#include <ripple/overlay/Overlay.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpl/json/json_value.h>
+#include <xrpld/overlay/Overlay.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/UnlList.cpp b/src/xrpld/rpc/handlers/UnlList.cpp
index 0dc4dfc37..2462447e9 100644
--- a/src/xrpld/rpc/handlers/UnlList.cpp
+++ b/src/xrpld/rpc/handlers/UnlList.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Unsubscribe.cpp b/src/xrpld/rpc/handlers/Unsubscribe.cpp
index b02b9c0bf..865482aab 100644
--- a/src/xrpld/rpc/handlers/Unsubscribe.cpp
+++ b/src/xrpld/rpc/handlers/Unsubscribe.cpp
@@ -17,15 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/app/misc/NetworkOPs.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/Role.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
-#include <ripple/rpc/impl/UDPInfoSub.h>
+#include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/Role.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
+#include <xrpld/rpc/detail/UDPInfoSub.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/ValidationCreate.cpp b/src/xrpld/rpc/handlers/ValidationCreate.cpp
index f07cbe9cd..ecda7a3c7 100644
--- a/src/xrpld/rpc/handlers/ValidationCreate.cpp
+++ b/src/xrpld/rpc/handlers/ValidationCreate.cpp
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/Seed.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/Seed.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/ValidatorInfo.cpp b/src/xrpld/rpc/handlers/ValidatorInfo.cpp
index 910c5e974..a27e876a5 100644
--- a/src/xrpld/rpc/handlers/ValidatorInfo.cpp
+++ b/src/xrpld/rpc/handlers/ValidatorInfo.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/ValidatorKeys.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_value.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/ValidatorKeys.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 Json::Value
diff --git a/src/xrpld/rpc/handlers/ValidatorListSites.cpp b/src/xrpld/rpc/handlers/ValidatorListSites.cpp
index 4800a5e86..57a5c1d2b 100644
--- a/src/xrpld/rpc/handlers/ValidatorListSites.cpp
+++ b/src/xrpld/rpc/handlers/ValidatorListSites.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/ValidatorSite.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/ValidatorSite.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Validators.cpp b/src/xrpld/rpc/handlers/Validators.cpp
index 39306612b..eb9804fd8 100644
--- a/src/xrpld/rpc/handlers/Validators.cpp
+++ b/src/xrpld/rpc/handlers/Validators.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/main/Application.h>
-#include <ripple/app/misc/ValidatorList.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/rpc/Context.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/misc/ValidatorList.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpld/rpc/Context.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/handlers/Version.h b/src/xrpld/rpc/handlers/Version.h
index 8f33b62f1..4efeed248 100644
--- a/src/xrpld/rpc/handlers/Version.h
+++ b/src/xrpld/rpc/handlers/Version.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLED_RIPPLE_RPC_HANDLERS_VERSION_H
 #define RIPPLED_RIPPLE_RPC_HANDLERS_VERSION_H
 
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 
 namespace ripple {
 namespace RPC {
diff --git a/src/xrpld/rpc/handlers/WalletPropose.cpp b/src/xrpld/rpc/handlers/WalletPropose.cpp
index 25aaa3bbb..8f6e97094 100644
--- a/src/xrpld/rpc/handlers/WalletPropose.cpp
+++ b/src/xrpld/rpc/handlers/WalletPropose.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/basics/strHex.h>
-#include <ripple/protocol/ErrorCodes.h>
-#include <ripple/protocol/KeyType.h>
-#include <ripple/protocol/PublicKey.h>
-#include <ripple/protocol/RPCErr.h>
-#include <ripple/protocol/SecretKey.h>
-#include <ripple/protocol/Seed.h>
-#include <ripple/protocol/jss.h>
-#include <ripple/rpc/Context.h>
-#include <ripple/rpc/handlers/WalletPropose.h>
-#include <ripple/rpc/impl/RPCHelpers.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/rpc/Context.h>
+#include <xrpld/rpc/handlers/WalletPropose.h>
+#include <xrpld/rpc/detail/RPCHelpers.h>
 #include <cmath>
 #include <ed25519.h>
 #include <map>
diff --git a/src/xrpld/rpc/handlers/WalletPropose.h b/src/xrpld/rpc/handlers/WalletPropose.h
index 9da0c9e41..d09ae9a4c 100644
--- a/src/xrpld/rpc/handlers/WalletPropose.h
+++ b/src/xrpld/rpc/handlers/WalletPropose.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLED_RIPPLE_RPC_HANDLERS_WALLETPROPOSE_H
 #define RIPPLED_RIPPLE_RPC_HANDLERS_WALLETPROPOSE_H
 
-#include <ripple/json/json_value.h>
+#include <xrpl/json/json_value.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/rpc/json_body.h b/src/xrpld/rpc/json_body.h
index fb5289981..5c97da438 100644
--- a/src/xrpld/rpc/json_body.h
+++ b/src/xrpld/rpc/json_body.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_JSON_BODY_H
 #define RIPPLE_RPC_JSON_BODY_H
 
-#include <ripple/json/json_value.h>
-#include <ripple/json/to_string.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
 
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/message.hpp>
diff --git a/src/xrpld/shamap/Family.h b/src/xrpld/shamap/Family.h
index fea5545d3..82ddcd46a 100644
--- a/src/xrpld/shamap/Family.h
+++ b/src/xrpld/shamap/Family.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SHAMAP_FAMILY_H_INCLUDED
 #define RIPPLE_SHAMAP_FAMILY_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/shamap/FullBelowCache.h>
-#include <ripple/shamap/TreeNodeCache.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/shamap/FullBelowCache.h>
+#include <xrpld/shamap/TreeNodeCache.h>
 #include <cstdint>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/FullBelowCache.h b/src/xrpld/shamap/FullBelowCache.h
index 6d809d3b9..eed7e6294 100644
--- a/src/xrpld/shamap/FullBelowCache.h
+++ b/src/xrpld/shamap/FullBelowCache.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SHAMAP_FULLBELOWCACHE_H_INCLUDED
 #define RIPPLE_SHAMAP_FULLBELOWCACHE_H_INCLUDED
 
-#include <ripple/basics/KeyCache.h>
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/beast/insight/Collector.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/KeyCache.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/insight/Collector.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <atomic>
 #include <string>
 
diff --git a/src/xrpld/shamap/NodeFamily.h b/src/xrpld/shamap/NodeFamily.h
index f20abccce..c540172c3 100644
--- a/src/xrpld/shamap/NodeFamily.h
+++ b/src/xrpld/shamap/NodeFamily.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED
 #define RIPPLE_SHAMAP_NODEFAMILY_H_INCLUDED
 
-#include <ripple/app/main/CollectorManager.h>
-#include <ripple/shamap/Family.h>
+#include <xrpld/app/main/CollectorManager.h>
+#include <xrpld/shamap/Family.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/SHAMap.h b/src/xrpld/shamap/SHAMap.h
index e7d8c24d7..f10552d57 100644
--- a/src/xrpld/shamap/SHAMap.h
+++ b/src/xrpld/shamap/SHAMap.h
@@ -20,19 +20,19 @@
 #ifndef RIPPLE_SHAMAP_SHAMAP_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAP_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/nodestore/Database.h>
-#include <ripple/nodestore/NodeObject.h>
-#include <ripple/shamap/Family.h>
-#include <ripple/shamap/FullBelowCache.h>
-#include <ripple/shamap/SHAMapAddNode.h>
-#include <ripple/shamap/SHAMapInnerNode.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
-#include <ripple/shamap/SHAMapMissingNode.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
-#include <ripple/shamap/TreeNodeCache.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/nodestore/Database.h>
+#include <xrpld/nodestore/NodeObject.h>
+#include <xrpld/shamap/Family.h>
+#include <xrpld/shamap/FullBelowCache.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 <boost/iostreams/filtering_stream.hpp>
 #include <cassert>
 #include <stack>
diff --git a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
index 45f0c5080..e41fff65f 100644
--- a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
+++ b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapLeafNode.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/SHAMapInnerNode.h b/src/xrpld/shamap/SHAMapInnerNode.h
index 44ac05799..45f7550df 100644
--- a/src/xrpld/shamap/SHAMapInnerNode.h
+++ b/src/xrpld/shamap/SHAMapInnerNode.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapNodeID.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
-#include <ripple/shamap/impl/TaggedPointer.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/detail/TaggedPointer.h>
 
 #include <atomic>
 #include <bit>
diff --git a/src/xrpld/shamap/SHAMapItem.h b/src/xrpld/shamap/SHAMapItem.h
index 160cc3cb4..1a1822456 100644
--- a/src/xrpld/shamap/SHAMapItem.h
+++ b/src/xrpld/shamap/SHAMapItem.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/SlabAllocator.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/SlabAllocator.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base_uint.h>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <cassert>
 
diff --git a/src/xrpld/shamap/SHAMapLeafNode.h b/src/xrpld/shamap/SHAMapLeafNode.h
index f24d7053c..d5d84d3f0 100644
--- a/src/xrpld/shamap/SHAMapLeafNode.h
+++ b/src/xrpld/shamap/SHAMapLeafNode.h
@@ -20,9 +20,9 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPLEAFNODE_H_INCLUDED
 
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapNodeID.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/xrpld/shamap/SHAMapMissingNode.h b/src/xrpld/shamap/SHAMapMissingNode.h
index 811fe5f96..3c6cf7445 100644
--- a/src/xrpld/shamap/SHAMapMissingNode.h
+++ b/src/xrpld/shamap/SHAMapMissingNode.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 #include <iosfwd>
 #include <stdexcept>
 #include <string>
diff --git a/src/xrpld/shamap/SHAMapNodeID.h b/src/xrpld/shamap/SHAMapNodeID.h
index 00ca33ac4..176553fd7 100644
--- a/src/xrpld/shamap/SHAMapNodeID.h
+++ b/src/xrpld/shamap/SHAMapNodeID.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/base_uint.h>
 #include <optional>
 #include <ostream>
 #include <string>
diff --git a/src/xrpld/shamap/SHAMapSyncFilter.h b/src/xrpld/shamap/SHAMapSyncFilter.h
index 37eda4fdb..b14effac8 100644
--- a/src/xrpld/shamap/SHAMapSyncFilter.h
+++ b/src/xrpld/shamap/SHAMapSyncFilter.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED
 
-#include <ripple/shamap/SHAMapNodeID.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 #include <optional>
 
 /** Callback for filtering SHAMap during sync. */
diff --git a/src/xrpld/shamap/SHAMapTreeNode.h b/src/xrpld/shamap/SHAMapTreeNode.h
index d8df3e8c0..0d1064844 100644
--- a/src/xrpld/shamap/SHAMapTreeNode.h
+++ b/src/xrpld/shamap/SHAMapTreeNode.h
@@ -20,13 +20,13 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/basics/SHAMapHash.h>
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/beast/utility/Journal.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/basics/SHAMapHash.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/xrpld/shamap/SHAMapTxLeafNode.h b/src/xrpld/shamap/SHAMapTxLeafNode.h
index e794a1a8f..d886849d3 100644
--- a/src/xrpld/shamap/SHAMapTxLeafNode.h
+++ b/src/xrpld/shamap/SHAMapTxLeafNode.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapLeafNode.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
index ff32c64e0..e14c56046 100644
--- a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
+++ b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
@@ -20,12 +20,12 @@
 #ifndef RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED
 #define RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED
 
-#include <ripple/basics/CountedObject.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMapItem.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpld/shamap/SHAMapItem.h>
+#include <xrpld/shamap/SHAMapLeafNode.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/ShardFamily.h b/src/xrpld/shamap/ShardFamily.h
index de809cf58..2e8bece6d 100644
--- a/src/xrpld/shamap/ShardFamily.h
+++ b/src/xrpld/shamap/ShardFamily.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_SHAMAP_SHARDFAMILY_H_INCLUDED
 #define RIPPLE_SHAMAP_SHARDFAMILY_H_INCLUDED
 
-#include <ripple/app/main/CollectorManager.h>
-#include <ripple/shamap/Family.h>
+#include <xrpld/app/main/CollectorManager.h>
+#include <xrpld/shamap/Family.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/TreeNodeCache.h b/src/xrpld/shamap/TreeNodeCache.h
index f35c252f4..f59fdc928 100644
--- a/src/xrpld/shamap/TreeNodeCache.h
+++ b/src/xrpld/shamap/TreeNodeCache.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED
 #define RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED
 
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/NodeFamily.cpp b/src/xrpld/shamap/detail/NodeFamily.cpp
index 1752db06a..01440a487 100644
--- a/src/xrpld/shamap/detail/NodeFamily.cpp
+++ b/src/xrpld/shamap/detail/NodeFamily.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/Tuning.h>
-#include <ripple/shamap/NodeFamily.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/Tuning.h>
+#include <xrpld/shamap/NodeFamily.h>
 #include <sstream>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/SHAMap.cpp b/src/xrpld/shamap/detail/SHAMap.cpp
index 46c61bbc4..5d133bb2d 100644
--- a/src/xrpld/shamap/detail/SHAMap.cpp
+++ b/src/xrpld/shamap/detail/SHAMap.cpp
@@ -17,13 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/SHAMapAccountStateLeafNode.h>
-#include <ripple/shamap/SHAMapNodeID.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
-#include <ripple/shamap/SHAMapTxLeafNode.h>
-#include <ripple/shamap/SHAMapTxPlusMetaLeafNode.h>
+#include <xrpl/basics/contract.h>
+#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>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapDelta.cpp b/src/xrpld/shamap/detail/SHAMapDelta.cpp
index ab9e329eb..badcf4f2f 100644
--- a/src/xrpld/shamap/detail/SHAMapDelta.cpp
+++ b/src/xrpld/shamap/detail/SHAMapDelta.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/shamap/SHAMap.h>
+#include <xrpl/basics/contract.h>
+#include <xrpld/shamap/SHAMap.h>
 
 #include <array>
 #include <stack>
diff --git a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
index c98849559..0094ea917 100644
--- a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
+++ b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
@@ -17,17 +17,17 @@
 */
 //==============================================================================
 
-#include <ripple/shamap/SHAMapInnerNode.h>
+#include <xrpld/shamap/SHAMapInnerNode.h>
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/spinlock.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
-#include <ripple/shamap/impl/TaggedPointer.ipp>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/spinlock.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/detail/TaggedPointer.ipp>
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp
index 8f634cfad..6fb446c5a 100644
--- a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp
+++ b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/contract.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpld/shamap/SHAMapLeafNode.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapNodeID.cpp b/src/xrpld/shamap/detail/SHAMapNodeID.cpp
index bcbdb7f33..c7b2fffb6 100644
--- a/src/xrpld/shamap/detail/SHAMapNodeID.cpp
+++ b/src/xrpld/shamap/detail/SHAMapNodeID.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/crypto/csprng.h>
-#include <ripple/protocol/Serializer.h>
-#include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/SHAMapNodeID.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/crypto/csprng.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpld/shamap/SHAMap.h>
+#include <xrpld/shamap/SHAMapNodeID.h>
 #include <cassert>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/SHAMapSync.cpp b/src/xrpld/shamap/detail/SHAMapSync.cpp
index 3f24047eb..99838a207 100644
--- a/src/xrpld/shamap/detail/SHAMapSync.cpp
+++ b/src/xrpld/shamap/detail/SHAMapSync.cpp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/random.h>
-#include <ripple/shamap/SHAMap.h>
-#include <ripple/shamap/SHAMapSyncFilter.h>
+#include <xrpl/basics/random.h>
+#include <xrpld/shamap/SHAMap.h>
+#include <xrpld/shamap/SHAMapSyncFilter.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
index e7645a16a..307b17a4e 100644
--- a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
+++ b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
@@ -17,19 +17,19 @@
 */
 //==============================================================================
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/core/LexicalCast.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/digest.h>
-#include <ripple/shamap/SHAMapAccountStateLeafNode.h>
-#include <ripple/shamap/SHAMapInnerNode.h>
-#include <ripple/shamap/SHAMapLeafNode.h>
-#include <ripple/shamap/SHAMapTreeNode.h>
-#include <ripple/shamap/SHAMapTxLeafNode.h>
-#include <ripple/shamap/SHAMapTxPlusMetaLeafNode.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/core/LexicalCast.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/digest.h>
+#include <xrpld/shamap/SHAMapAccountStateLeafNode.h>
+#include <xrpld/shamap/SHAMapInnerNode.h>
+#include <xrpld/shamap/SHAMapLeafNode.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/SHAMapTxLeafNode.h>
+#include <xrpld/shamap/SHAMapTxPlusMetaLeafNode.h>
 #include <mutex>
 
 #include <openssl/sha.h>
diff --git a/src/xrpld/shamap/detail/ShardFamily.cpp b/src/xrpld/shamap/detail/ShardFamily.cpp
index f22d4152e..aef4c6cde 100644
--- a/src/xrpld/shamap/detail/ShardFamily.cpp
+++ b/src/xrpld/shamap/detail/ShardFamily.cpp
@@ -17,11 +17,11 @@
 */
 //==============================================================================
 
-#include <ripple/app/ledger/LedgerMaster.h>
-#include <ripple/app/main/Application.h>
-#include <ripple/app/main/Tuning.h>
-#include <ripple/nodestore/DatabaseShard.h>
-#include <ripple/shamap/ShardFamily.h>
+#include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/app/main/Tuning.h>
+#include <xrpld/nodestore/DatabaseShard.h>
+#include <xrpld/shamap/ShardFamily.h>
 #include <tuple>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/TaggedPointer.h b/src/xrpld/shamap/detail/TaggedPointer.h
index afc0ef582..58271f59c 100644
--- a/src/xrpld/shamap/detail/TaggedPointer.h
+++ b/src/xrpld/shamap/detail/TaggedPointer.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED
 #define RIPPLE_SHAMAP_TAGGEDPOINTER_H_INCLUDED
 
-#include <ripple/shamap/SHAMapTreeNode.h>
+#include <xrpld/shamap/SHAMapTreeNode.h>
 
 #include <array>
 #include <bit>
diff --git a/src/xrpld/shamap/detail/TaggedPointer.ipp b/src/xrpld/shamap/detail/TaggedPointer.ipp
index 7cdff6b49..ca1efc857 100644
--- a/src/xrpld/shamap/detail/TaggedPointer.ipp
+++ b/src/xrpld/shamap/detail/TaggedPointer.ipp
@@ -17,9 +17,9 @@
 */
 //==============================================================================
 
-#include <ripple/basics/ByteUtilities.h>
-#include <ripple/shamap/SHAMapInnerNode.h>
-#include <ripple/shamap/impl/TaggedPointer.h>
+#include <xrpl/basics/ByteUtilities.h>
+#include <xrpld/shamap/SHAMapInnerNode.h>
+#include <xrpld/shamap/detail/TaggedPointer.h>
 
 #include <array>
 #include <bit>