Rearrange sources

2025-12-06 17:27:52 +00:00 · 2025-06-17 10:42:41 +00:00
parent 6c1bc9052d
commit a6a71bcc3f
1212 changed files with 5837 additions and 5837 deletions
--- 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 {

--- 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>
--- 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>

--- 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 {
--- 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 {

--- 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>
--- 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 {

--- 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 {
--- 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 {
--- 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 {
--- 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 {

--- 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>
--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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>
--- 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>

--- 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>
--- 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>
--- 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 {

--- 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 {
--- 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>
--- 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>
--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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>

--- 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>
--- 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>
--- 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>

--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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>
--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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 {
--- 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>
--- 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>
--- 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>
--- 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 {

--- 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 {

--- 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>
--- 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>

--- 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>
--- 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 {
--- 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>

--- 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>
--- 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 {

--- 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>

--- 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 {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 {
--- 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
--- 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>

--- 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 {
--- 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 {

--- 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
--- 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>