diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa261673d35..5724c14e9de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1631,6 +1631,7 @@ else ()
     src/ripple/basics/impl/contract.cpp
     src/ripple/basics/impl/CountedObject.cpp
     src/ripple/basics/impl/FileUtilities.cpp
+    src/ripple/basics/impl/IOUAmount.cpp
     src/ripple/basics/impl/Log.cpp
     src/ripple/basics/impl/strHex.cpp
     src/ripple/basics/impl/StringUtilities.cpp
@@ -1657,7 +1658,6 @@ else ()
     src/ripple/protocol/impl/ErrorCodes.cpp
     src/ripple/protocol/impl/Feature.cpp
     src/ripple/protocol/impl/HashPrefix.cpp
-    src/ripple/protocol/impl/IOUAmount.cpp
     src/ripple/protocol/impl/Indexes.cpp
     src/ripple/protocol/impl/InnerObjectFormats.cpp
     src/ripple/protocol/impl/Issue.cpp
@@ -1730,6 +1730,7 @@ install (
     src/ripple/basics/Buffer.h
     src/ripple/basics/CountedObject.h
     src/ripple/basics/FileUtilities.h
+    src/ripple/basics/IOUAmount.h
     src/ripple/basics/LocalValue.h
     src/ripple/basics/Log.h
     src/ripple/basics/safe_cast.h
@@ -1784,7 +1785,6 @@ install (
     src/ripple/protocol/ErrorCodes.h
     src/ripple/protocol/Feature.h
     src/ripple/protocol/HashPrefix.h
-    src/ripple/protocol/IOUAmount.h
     src/ripple/protocol/Indexes.h
     src/ripple/protocol/InnerObjectFormats.h
     src/ripple/protocol/Issue.h
@@ -2338,12 +2338,14 @@ else ()
     src/test/basics/Buffer_test.cpp
     src/test/basics/DetectCrash_test.cpp
     src/test/basics/FileUtilities_test.cpp
+    src/test/basics/IOUAmount_test.cpp
     src/test/basics/KeyCache_test.cpp
     src/test/basics/PerfLog_test.cpp
     src/test/basics/RangeSet_test.cpp
     src/test/basics/Slice_test.cpp
     src/test/basics/StringUtilities_test.cpp
     src/test/basics/TaggedCache_test.cpp
+    src/test/basics/XRPAmount_test.cpp
     src/test/basics/base64_test.cpp
     src/test/basics/base_uint_test.cpp
     src/test/basics/contract_test.cpp
@@ -2498,7 +2500,6 @@ else ()
          subdir: protocol
     #]===============================]
     src/test/protocol/BuildInfo_test.cpp
-    src/test/protocol/IOUAmount_test.cpp
     src/test/protocol/InnerObjectFormats_test.cpp
     src/test/protocol/Issue_test.cpp
     src/test/protocol/PublicKey_test.cpp
@@ -2511,7 +2512,6 @@ else ()
     src/test/protocol/SecretKey_test.cpp
     src/test/protocol/Seed_test.cpp
     src/test/protocol/TER_test.cpp
-    src/test/protocol/XRPAmount_test.cpp
     src/test/protocol/digest_test.cpp
     src/test/protocol/types_test.cpp
     #[===============================[
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index b482af3d999..1eb48e9de96 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -2231,14 +2231,15 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin, bool counters)
 
     auto const loadFactorServer = app_.getFeeTrack().getLoadFactor();
     auto const loadBaseServer = app_.getFeeTrack().getLoadBase();
-    auto const loadFactorFeeEscalation =
-        escalationMetrics.openLedgerFeeLevel;
-    auto const loadBaseFeeEscalation =
-        escalationMetrics.referenceFeeLevel;
+    /* Scale the escalated fee level to unitless "load factor".
+       In practice, this just strips the units, but it will continue
+       to work correctly if either base value ever changes. */
+    auto const loadFactorFeeEscalation = mulDiv(
+        escalationMetrics.openLedgerFeeLevel, loadBaseServer,
+        escalationMetrics.referenceFeeLevel).second;
 
     auto const loadFactor = std::max(safe_cast<std::uint64_t>(loadFactorServer),
-        mulDiv(loadFactorFeeEscalation, loadBaseServer,
-            loadBaseFeeEscalation).second);
+        loadFactorFeeEscalation);
 
     if (!human)
     {
@@ -2252,11 +2253,11 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin, bool counters)
             that high.
         */
         info[jss::load_factor_fee_escalation] =
-            loadFactorFeeEscalation.json();
+            escalationMetrics.openLedgerFeeLevel.json();
         info[jss::load_factor_fee_queue] =
             escalationMetrics.minProcessingFeeLevel.json();
         info[jss::load_factor_fee_reference] =
-            loadBaseFeeEscalation.json();
+            escalationMetrics.referenceFeeLevel.json();
     }
     else
     {
@@ -2281,13 +2282,14 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin, bool counters)
                 info[jss::load_factor_cluster] =
                     static_cast<double> (fee) / loadBaseServer;
         }
-        if (loadFactorFeeEscalation !=
+        if (escalationMetrics.openLedgerFeeLevel !=
                 escalationMetrics.referenceFeeLevel &&
                 (admin ||
-                loadFactorFeeEscalation != FeeLevel64{ loadFactor }))
+                loadFactorFeeEscalation != loadFactor))
             info[jss::load_factor_fee_escalation] =
-                static_cast<FeeLevelDouble>(loadFactorFeeEscalation) /
-                    escalationMetrics.referenceFeeLevel;
+                static_cast<FeeLevelDouble>(
+                    escalationMetrics.openLedgerFeeLevel) /
+                        escalationMetrics.referenceFeeLevel;
         if (escalationMetrics.minProcessingFeeLevel !=
                 escalationMetrics.referenceFeeLevel)
             info[jss::load_factor_fee_queue] =
@@ -2324,16 +2326,16 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin, bool counters)
         {
             // Make a local specialization of the TaggedFee class, using
             // XRPAmount as the "unit" to make some of the math here easier.
-            using DropsDouble = units::TaggedFee<XRPAmount, double>;
+            using XRPDouble = feeunit::TaggedFee<XRPAmount, double>;
 
             l[jss::base_fee_xrp] =
-                static_cast<DropsDouble>(baseFee) /
+                static_cast<XRPDouble>(baseFee) /
                     DROPS_PER_XRP;
             l[jss::reserve_base_xrp]   =
-                static_cast<DropsDouble>(
+                static_cast<XRPDouble>(
                     lpClosed->fees().accountReserve(0)) / DROPS_PER_XRP;
             l[jss::reserve_inc_xrp]    =
-                static_cast<DropsDouble>(
+                static_cast<XRPDouble>(
                     lpClosed->fees().increment) / DROPS_PER_XRP;
 
             auto const nowOffset = app_.timeKeeper().nowOffset();
diff --git a/src/ripple/app/misc/impl/LoadFeeTrack.cpp b/src/ripple/app/misc/impl/LoadFeeTrack.cpp
index ea75b0f113c..f82e342f0bf 100644
--- a/src/ripple/app/misc/impl/LoadFeeTrack.cpp
+++ b/src/ripple/app/misc/impl/LoadFeeTrack.cpp
@@ -127,7 +127,7 @@ namespace detail
 struct xrp_unit_product_tag;
 
 using xrp_unit_product =
-    units::TaggedFee<detail::xrp_unit_product_tag, std::uint64_t>;
+    feeunit::TaggedFee<detail::xrp_unit_product_tag, std::uint64_t>;
 
 } // detail
 
diff --git a/src/ripple/app/paths/Credit.h b/src/ripple/app/paths/Credit.h
index 9d1cfc2cfc8..8e55bbe6729 100644
--- a/src/ripple/app/paths/Credit.h
+++ b/src/ripple/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 <ripple/protocol/IOUAmount.h>
 
 namespace ripple {
 
diff --git a/src/ripple/app/paths/Flow.cpp b/src/ripple/app/paths/Flow.cpp
index 0393cd9eb57..75d15126cd6 100644
--- a/src/ripple/app/paths/Flow.cpp
+++ b/src/ripple/app/paths/Flow.cpp
@@ -23,7 +23,7 @@
 #include <ripple/app/paths/impl/StrandFlow.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/basics/Log.h>
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/XRPAmount.h>
 
 #include <boost/container/flat_set.hpp>
diff --git a/src/ripple/app/paths/impl/AmountSpec.h b/src/ripple/app/paths/impl/AmountSpec.h
index 0192ea36c97..315b4cde782 100644
--- a/src/ripple/app/paths/impl/AmountSpec.h
+++ b/src/ripple/app/paths/impl/AmountSpec.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED
 #define RIPPLE_PATH_IMPL_AMOUNTSPEC_H_INCLUDED
 
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/XRPAmount.h>
 #include <ripple/protocol/STAmount.h>
 
diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/ripple/app/paths/impl/BookStep.cpp
index 350e8ecb621..9accfa48954 100644
--- a/src/ripple/app/paths/impl/BookStep.cpp
+++ b/src/ripple/app/paths/impl/BookStep.cpp
@@ -23,14 +23,14 @@
 #include <ripple/app/paths/NodeDirectory.h>
 #include <ripple/app/tx/impl/OfferStream.h>
 #include <ripple/basics/contract.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/Log.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/ledger/Directory.h>
 #include <ripple/ledger/PaymentSandbox.h>
 #include <ripple/protocol/Book.h>
 #include <ripple/protocol/Feature.h>
-#include <ripple/protocol/IOUAmount.h>
 #include <ripple/protocol/Quality.h>
-#include <ripple/basics/XRPAmount.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/ripple/app/paths/impl/DirectStep.cpp b/src/ripple/app/paths/impl/DirectStep.cpp
index ab5627f68f4..4a87bbf9b2d 100644
--- a/src/ripple/app/paths/impl/DirectStep.cpp
+++ b/src/ripple/app/paths/impl/DirectStep.cpp
@@ -20,9 +20,9 @@
 #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/IOUAmount.h>
 #include <ripple/protocol/Quality.h>
 
 #include <boost/container/flat_set.hpp>
diff --git a/src/ripple/app/paths/impl/FlowDebugInfo.h b/src/ripple/app/paths/impl/FlowDebugInfo.h
index 3ccdfac843e..f1437785678 100644
--- a/src/ripple/app/paths/impl/FlowDebugInfo.h
+++ b/src/ripple/app/paths/impl/FlowDebugInfo.h
@@ -21,9 +21,9 @@
 #define RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED
 
 #include <ripple/app/paths/impl/AmountSpec.h>
-#include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/XRPAmount.h>
+#include <ripple/ledger/PaymentSandbox.h>
 
 #include <boost/container/flat_map.hpp>
 #include <boost/optional.hpp>
diff --git a/src/ripple/app/paths/impl/PaySteps.cpp b/src/ripple/app/paths/impl/PaySteps.cpp
index 0bf72bf2a8f..a4516bc870b 100644
--- a/src/ripple/app/paths/impl/PaySteps.cpp
+++ b/src/ripple/app/paths/impl/PaySteps.cpp
@@ -19,11 +19,11 @@
 
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/basics/contract.h>
+#include <ripple/basics/IOUAmount.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/protocol/Feature.h>
-#include <ripple/protocol/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
 
 #include <algorithm>
 #include <numeric>
diff --git a/src/ripple/app/paths/impl/StrandFlow.h b/src/ripple/app/paths/impl/StrandFlow.h
index 3d2b33c7f39..672d321eb40 100644
--- a/src/ripple/app/paths/impl/StrandFlow.h
+++ b/src/ripple/app/paths/impl/StrandFlow.h
@@ -26,9 +26,9 @@
 #include <ripple/app/paths/impl/FlatSets.h>
 #include <ripple/app/paths/impl/FlowDebugInfo.h>
 #include <ripple/app/paths/impl/Steps.h>
-#include <ripple/basics/Log.h>
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/XRPAmount.h>
+#include <ripple/basics/Log.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/ripple/app/paths/impl/XRPEndpointStep.cpp b/src/ripple/app/paths/impl/XRPEndpointStep.cpp
index b2b0eb8bf84..0142161bcc5 100644
--- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp
+++ b/src/ripple/app/paths/impl/XRPEndpointStep.cpp
@@ -21,11 +21,11 @@
 #include <ripple/app/paths/impl/AmountSpec.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/app/paths/impl/StepChecks.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/Log.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/ledger/PaymentSandbox.h>
-#include <ripple/protocol/IOUAmount.h>
 #include <ripple/protocol/Quality.h>
-#include <ripple/basics/XRPAmount.h>
 
 #include <boost/container/flat_set.hpp>
 
diff --git a/src/ripple/app/tx/impl/ApplyContext.h b/src/ripple/app/tx/impl/ApplyContext.h
index 0fb8a69dd88..350615c819a 100644
--- a/src/ripple/app/tx/impl/ApplyContext.h
+++ b/src/ripple/app/tx/impl/ApplyContext.h
@@ -22,9 +22,9 @@
 
 #include <ripple/app/main/Application.h>
 #include <ripple/ledger/ApplyViewImpl.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/core/Config.h>
 #include <ripple/protocol/STTx.h>
-#include <ripple/basics/XRPAmount.h>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/optional.hpp>
 #include <utility>
diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/ripple/app/tx/impl/Escrow.cpp
index d986e0119c2..fc24065a6f1 100644
--- a/src/ripple/app/tx/impl/Escrow.cpp
+++ b/src/ripple/app/tx/impl/Escrow.cpp
@@ -23,6 +23,7 @@
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/safe_cast.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/conditions/Condition.h>
 #include <ripple/conditions/Fulfillment.h>
 #include <ripple/ledger/ApplyView.h>
@@ -32,7 +33,6 @@
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/Indexes.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/basics/XRPAmount.h>
 
 // During an EscrowFinish, the transaction must specify both
 // a condition and a fulfillment. We track whether that
diff --git a/src/ripple/app/tx/impl/PayChan.cpp b/src/ripple/app/tx/impl/PayChan.cpp
index aae29f8d0ff..0645f618ccc 100644
--- a/src/ripple/app/tx/impl/PayChan.cpp
+++ b/src/ripple/app/tx/impl/PayChan.cpp
@@ -20,6 +20,7 @@
 #include <ripple/app/tx/impl/PayChan.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/Log.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/ledger/ApplyView.h>
 #include <ripple/ledger/View.h>
 #include <ripple/protocol/digest.h>
@@ -29,7 +30,6 @@
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/st.h>
 #include <ripple/protocol/TxFlags.h>
-#include <ripple/basics/XRPAmount.h>
 
 namespace ripple {
 
diff --git a/src/ripple/protocol/IOUAmount.h b/src/ripple/basics/IOUAmount.h
similarity index 97%
rename from src/ripple/protocol/IOUAmount.h
rename to src/ripple/basics/IOUAmount.h
index 5ae3e5d1457..c888c158077 100644
--- a/src/ripple/protocol/IOUAmount.h
+++ b/src/ripple/basics/IOUAmount.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_PROTOCOL_IOUAMOUNT_H_INCLUDED
-#define RIPPLE_PROTOCOL_IOUAMOUNT_H_INCLUDED
+#ifndef RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
+#define RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
 
 #include <ripple/beast/utility/Zero.h>
 #include <boost/operators.hpp>
diff --git a/src/ripple/basics/feeunits.h b/src/ripple/basics/feeunits.h
index 3ba10edb75c..051ced35583 100644
--- a/src/ripple/basics/feeunits.h
+++ b/src/ripple/basics/feeunits.h
@@ -37,7 +37,7 @@
 
 namespace ripple {
 
-namespace units {
+namespace feeunit {
 
 struct feeunit_tag;
 struct feelevel_tag;
@@ -52,9 +52,9 @@ using enable_if_unit_t = typename std::enable_if_t<
 
 template<class T, class = enable_if_unit_t<T> >
 constexpr bool is_usable_unit_v =
-    std::is_same_v<typename T::unit_type, units::feeunit_tag> ||
-    std::is_same_v<typename T::unit_type, units::feelevel_tag> ||
-    std::is_same_v<typename T::unit_type, units::unitless_tag> ||
+    std::is_same_v<typename T::unit_type, feeunit_tag> ||
+    std::is_same_v<typename T::unit_type, feelevel_tag> ||
+    std::is_same_v<typename T::unit_type, unitless_tag> ||
     std::is_same_v<typename T::unit_type, XRPAmount>;
 
 
@@ -433,37 +433,37 @@ mulDivU(Source1 value, Dest mul, Source2 div)
     return { true, Dest{ static_cast<desttype>(quotient) } };
 }
 
-} // units
+} // feeunit
 
 template<class T>
-using FeeUnit = units::TaggedFee<units::feeunit_tag, T>;
+using FeeUnit = feeunit::TaggedFee<feeunit::feeunit_tag, T>;
 using FeeUnit32 = FeeUnit<std::uint32_t>;
 using FeeUnit64 = FeeUnit<std::uint64_t>;
 
 template<class T>
-using FeeLevel = units::TaggedFee<units::feelevel_tag, T>;
+using FeeLevel = feeunit::TaggedFee<feeunit::feelevel_tag, T>;
 using FeeLevel64 = FeeLevel<std::uint64_t>;
 using FeeLevelDouble = FeeLevel<double>;
 
 template<class Source1, class Source2, class Dest,
-    class = units::enable_muldiv_t<Source1, Source2, Dest> >
+    class = feeunit::enable_muldiv_t<Source1, Source2, Dest> >
 std::pair<bool, Dest>
 mulDiv(Source1 value, Dest mul, Source2 div)
 {
-    return units::mulDivU(value, mul, div);
+    return feeunit::mulDivU(value, mul, div);
 }
 
 template<class Source1, class Source2, class Dest,
-    class = units::enable_muldiv_commute_t<Source1, Source2, Dest> >
+    class = feeunit::enable_muldiv_commute_t<Source1, Source2, Dest> >
 std::pair<bool, Dest>
 mulDiv(Dest value, Source1 mul, Source2 div)
 {
     // Multiplication is commutative
-    return units::mulDivU(mul, value, div);
+    return feeunit::mulDivU(mul, value, div);
 }
 
 template<class Dest,
-    class = units::enable_muldiv_dest_t<Dest> >
+    class = feeunit::enable_muldiv_dest_t<Dest> >
 std::pair<bool, Dest>
 mulDiv(std::uint64_t value,
     Dest mul,
@@ -471,11 +471,11 @@ mulDiv(std::uint64_t value,
 {
     // Give the scalars a non-tag so the
     // unit-handling version gets called.
-    return units::mulDivU(units::scalar(value), mul, units::scalar(div));
+    return feeunit::mulDivU(feeunit::scalar(value), mul, feeunit::scalar(div));
 }
 
 template<class Dest,
-    class = units::enable_muldiv_dest_t<Dest> >
+    class = feeunit::enable_muldiv_dest_t<Dest> >
 std::pair<bool, Dest>
 mulDiv(Dest value, std::uint64_t mul, std::uint64_t div)
 {
@@ -484,7 +484,7 @@ mulDiv(Dest value, std::uint64_t mul, std::uint64_t div)
 }
 
 template<class Source1, class Source2,
-    class = units::enable_muldiv_sources_t<Source1, Source2> >
+    class = feeunit::enable_muldiv_sources_t<Source1, Source2> >
 std::pair<bool, std::uint64_t>
 mulDiv(Source1 value,
     std::uint64_t mul,
@@ -492,12 +492,12 @@ mulDiv(Source1 value,
 {
     // Give the scalars a dimensionless unit so the
     // unit-handling version gets called.
-    auto unitresult = units::mulDivU(value, units::scalar(mul), div);
+    auto unitresult = feeunit::mulDivU(value, feeunit::scalar(mul), div);
     return { unitresult.first, unitresult.second.value() };
 }
 
 template<class Source1, class Source2,
-    class = units::enable_muldiv_sources_t<Source1, Source2> >
+    class = feeunit::enable_muldiv_sources_t<Source1, Source2> >
 std::pair<bool, std::uint64_t>
 mulDiv(std::uint64_t value, Source1 mul, Source2 div)
 {
diff --git a/src/ripple/protocol/impl/IOUAmount.cpp b/src/ripple/basics/impl/IOUAmount.cpp
similarity index 99%
rename from src/ripple/protocol/impl/IOUAmount.cpp
rename to src/ripple/basics/impl/IOUAmount.cpp
index aaa5d8b108e..7a2806f8f6c 100644
--- a/src/ripple/protocol/impl/IOUAmount.cpp
+++ b/src/ripple/basics/impl/IOUAmount.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/basics/contract.h>
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <algorithm>
 #include <numeric>
diff --git a/src/ripple/ledger/ReadView.h b/src/ripple/ledger/ReadView.h
index f4328654b69..9b6ec799ba5 100644
--- a/src/ripple/ledger/ReadView.h
+++ b/src/ripple/ledger/ReadView.h
@@ -23,12 +23,12 @@
 #include <ripple/ledger/detail/ReadViewFwdRange.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/feeunits.h>
+#include <ripple/basics/IOUAmount.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/protocol/Indexes.h>
-#include <ripple/protocol/IOUAmount.h>
 #include <ripple/protocol/Protocol.h>
 #include <ripple/protocol/STLedgerEntry.h>
 #include <ripple/protocol/STTx.h>
-#include <ripple/basics/XRPAmount.h>
 #include <ripple/beast/hash/uhash.h>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/optional.hpp>
diff --git a/src/ripple/ledger/detail/ApplyStateTable.h b/src/ripple/ledger/detail/ApplyStateTable.h
index ab9ff4b3ee5..38fde05d051 100644
--- a/src/ripple/ledger/detail/ApplyStateTable.h
+++ b/src/ripple/ledger/detail/ApplyStateTable.h
@@ -24,8 +24,8 @@
 #include <ripple/ledger/RawView.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/ledger/TxMeta.h>
-#include <ripple/protocol/TER.h>
 #include <ripple/basics/XRPAmount.h>
+#include <ripple/protocol/TER.h>
 #include <ripple/beast/utility/Journal.h>
 #include <memory>
 
diff --git a/src/ripple/protocol/AmountConversions.h b/src/ripple/protocol/AmountConversions.h
index 5de7bc92714..86e7c36e80a 100644
--- a/src/ripple/protocol/AmountConversions.h
+++ b/src/ripple/protocol/AmountConversions.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED
 #define RIPPLE_PROTOCOL_AMOUNTCONVERSION_H_INCLUDED
 
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/XRPAmount.h>
 #include <ripple/protocol/STAmount.h>
 
diff --git a/src/ripple/protocol/PayChan.h b/src/ripple/protocol/PayChan.h
index 0525ee61a93..5957668e7e1 100644
--- a/src/ripple/protocol/PayChan.h
+++ b/src/ripple/protocol/PayChan.h
@@ -21,9 +21,9 @@
 #define RIPPLE_PROTOCOL_PAYCHAN_H_INCLUDED
 
 #include <ripple/basics/base_uint.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/Serializer.h>
-#include <ripple/basics/XRPAmount.h>
 
 namespace ripple {
 
diff --git a/src/ripple/protocol/Quality.h b/src/ripple/protocol/Quality.h
index 07fe336a6ff..893049c6d59 100644
--- a/src/ripple/protocol/Quality.h
+++ b/src/ripple/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/IOUAmount.h>
 #include <ripple/protocol/STAmount.h>
-#include <ripple/basics/XRPAmount.h>
 
 #include <cstdint>
 #include <ostream>
diff --git a/src/ripple/protocol/STAmount.h b/src/ripple/protocol/STAmount.h
index 80e6b2bcac5..f8994bcc705 100644
--- a/src/ripple/protocol/STAmount.h
+++ b/src/ripple/protocol/STAmount.h
@@ -21,13 +21,13 @@
 #define RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED
 
 #include <ripple/basics/chrono.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/basics/LocalValue.h>
+#include <ripple/basics/XRPAmount.h>
 #include <ripple/protocol/SField.h>
 #include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/STBase.h>
 #include <ripple/protocol/Issue.h>
-#include <ripple/protocol/IOUAmount.h>
-#include <ripple/basics/XRPAmount.h>
 #include <memory>
 
 namespace ripple {
diff --git a/src/ripple/protocol/STObject.h b/src/ripple/protocol/STObject.h
index 0be43eb62bc..7541e0e2569 100644
--- a/src/ripple/protocol/STObject.h
+++ b/src/ripple/protocol/STObject.h
@@ -88,7 +88,7 @@ class STObject
 
         template <class Fee>
         std::enable_if_t<
-            units::is_usable_unit_v<Fee> &&
+            feeunit::is_usable_unit_v<Fee> &&
             std::is_assignable_v<T, typename Fee::value_type>,
                 ValueProxy&>
         operator= (Fee const& u);
@@ -223,7 +223,7 @@ class STObject
 
         template <class Fee>
         std::enable_if_t<
-            units::is_usable_unit_v<Fee> &&
+            feeunit::is_usable_unit_v<Fee> &&
             std::is_assignable_v<T, typename Fee::value_type>,
                 OptionalProxy&>
         operator= (Fee const& u);
@@ -754,7 +754,7 @@ STObject::ValueProxy<T>::operator= (U&& u)
 template <class T>
 template <class Fee>
 std::enable_if_t<
-    units::is_usable_unit_v<Fee> &&
+    feeunit::is_usable_unit_v<Fee> &&
     std::is_assignable_v<T, typename Fee::value_type>,
         STObject::ValueProxy<T>&>
 STObject::ValueProxy<T>::operator= (Fee const& u)
@@ -853,7 +853,7 @@ STObject::OptionalProxy<T>::operator=(U&& u)
 template <class T>
 template <class Fee>
 std::enable_if_t<
-    units::is_usable_unit_v<Fee> &&
+    feeunit::is_usable_unit_v<Fee> &&
     std::is_assignable_v<T, typename Fee::value_type>,
         STObject::OptionalProxy<T>&>
 STObject::OptionalProxy<T>::operator= (Fee const& u)
diff --git a/src/ripple/unity/basics1.cpp b/src/ripple/unity/basics1.cpp
index 5b1eab270e4..852523dc50a 100644
--- a/src/ripple/unity/basics1.cpp
+++ b/src/ripple/unity/basics1.cpp
@@ -22,6 +22,7 @@
 #include <ripple/basics/impl/contract.cpp>
 #include <ripple/basics/impl/CountedObject.cpp>
 #include <ripple/basics/impl/FileUtilities.cpp>
+#include <ripple/basics/impl/IOUAmount.cpp>
 #include <ripple/basics/impl/Log.cpp>
 #include <ripple/basics/impl/strHex.cpp>
 #include <ripple/basics/impl/StringUtilities.cpp>
diff --git a/src/ripple/unity/protocol.cpp b/src/ripple/unity/protocol.cpp
index 867557f821a..db5f5a4e5c1 100644
--- a/src/ripple/unity/protocol.cpp
+++ b/src/ripple/unity/protocol.cpp
@@ -58,7 +58,6 @@
 #include <ripple/protocol/impl/STValidation.cpp>
 #include <ripple/protocol/impl/STVar.cpp>
 #include <ripple/protocol/impl/STVector256.cpp>
-#include <ripple/protocol/impl/IOUAmount.cpp>
 
 #if DOXYGEN
 #include <ripple/protocol/README.md>
diff --git a/src/test/protocol/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp
similarity index 99%
rename from src/test/protocol/IOUAmount_test.cpp
rename to src/test/basics/IOUAmount_test.cpp
index a3ba5c32ca2..c7e685c3546 100644
--- a/src/test/protocol/IOUAmount_test.cpp
+++ b/src/test/basics/IOUAmount_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/IOUAmount.h>
+#include <ripple/basics/IOUAmount.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/protocol/XRPAmount_test.cpp b/src/test/basics/XRPAmount_test.cpp
similarity index 100%
rename from src/test/protocol/XRPAmount_test.cpp
rename to src/test/basics/XRPAmount_test.cpp
diff --git a/src/test/basics/feeunits_test.cpp b/src/test/basics/feeunits_test.cpp
index e058ccd63a8..9ba9cc876b6 100644
--- a/src/test/basics/feeunits_test.cpp
+++ b/src/test/basics/feeunits_test.cpp
@@ -84,12 +84,12 @@ class feeunits_test
             FeeLevel64 x{ 1024 };
             BEAST_EXPECT(x.value() == 1024);
             BEAST_EXPECT((std::is_same_v<decltype(x)::unit_type,
-                units::feelevel_tag>));
+                feeunit::feelevel_tag>));
             std::uint64_t m = 4;
             auto y = m * x;
             BEAST_EXPECT(y.value() == 4096);
             BEAST_EXPECT((std::is_same_v<decltype(y)::unit_type,
-                units::feelevel_tag>));
+                feeunit::feelevel_tag>));
 
             XRPAmount basefee{ 10 };
             FeeLevel64 referencefee{ 256 };
diff --git a/src/test/unity/basics_test_unity.cpp b/src/test/unity/basics_test_unity.cpp
index 623e1562ef3..0022a48d200 100644
--- a/src/test/unity/basics_test_unity.cpp
+++ b/src/test/unity/basics_test_unity.cpp
@@ -26,6 +26,7 @@
 #include <test/basics/DetectCrash_test.cpp>
 #include <test/basics/FileUtilities_test.cpp>
 #include <test/basics/hardened_hash_test.cpp>
+#include <test/basics/IOUAmount_test.cpp>
 #include <test/basics/KeyCache_test.cpp>
 #include <test/basics/mulDiv_test.cpp>
 #include <test/basics/PerfLog_test.cpp>
@@ -35,3 +36,4 @@
 #include <test/basics/StringUtilities_test.cpp>
 #include <test/basics/TaggedCache_test.cpp>
 #include <test/basics/tagged_integer_test.cpp>
+#include <test/basics/XRPAmount_test.cpp>
diff --git a/src/test/unity/protocol_test_unity.cpp b/src/test/unity/protocol_test_unity.cpp
index ab1aecfc1d8..52ca621b928 100644
--- a/src/test/unity/protocol_test_unity.cpp
+++ b/src/test/unity/protocol_test_unity.cpp
@@ -21,7 +21,6 @@
 #include <test/protocol/BuildInfo_test.cpp>
 #include <test/protocol/digest_test.cpp>
 #include <test/protocol/InnerObjectFormats_test.cpp>
-#include <test/protocol/IOUAmount_test.cpp>
 #include <test/protocol/Issue_test.cpp>
 #include <test/protocol/PublicKey_test.cpp>
 #include <test/protocol/Quality_test.cpp>
@@ -34,4 +33,3 @@
 #include <test/protocol/STValidation_test.cpp>
 #include <test/protocol/TER_test.cpp>
 #include <test/protocol/types_test.cpp>
-#include <test/protocol/XRPAmount_test.cpp>