diff --git a/src/Makefile.am b/src/Makefile.am
index 65bf28035a..1ba29a075c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -699,11 +699,11 @@ crypto_libbitcoin_crypto_arm_shani_a_SOURCES = crypto/sha256_arm_shani.cpp
 libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_consensus_a_SOURCES = \
-  amount.h \
   arith_uint256.cpp \
   arith_uint256.h \
   bls/bls.cpp \
   bls/bls.h \
+  consensus/amount.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
   consensus/params.h \
diff --git a/src/addressindex.h b/src/addressindex.h
index b5cbcefc1f..55dbc8284a 100644
--- a/src/addressindex.h
+++ b/src/addressindex.h
@@ -8,7 +8,7 @@
 #ifndef BITCOIN_ADDRESSINDEX_H
 #define BITCOIN_ADDRESSINDEX_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <util/underlying.h>
diff --git a/src/coinjoin/common.h b/src/coinjoin/common.h
index 165664c3d1..def3ffc83a 100644
--- a/src/coinjoin/common.h
+++ b/src/coinjoin/common.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_COINJOIN_COMMON_H
 #define BITCOIN_COINJOIN_COMMON_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <primitives/transaction.h>
 
 #include <array>
diff --git a/src/coinjoin/options.h b/src/coinjoin/options.h
index 5c48a84a6e..8782df0e1b 100644
--- a/src/coinjoin/options.h
+++ b/src/coinjoin/options.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_COINJOIN_OPTIONS_H
 #define BITCOIN_COINJOIN_OPTIONS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
+
 #include <atomic>
 #include <mutex>
 
diff --git a/src/amount.h b/src/consensus/amount.h
similarity index 80%
rename from src/amount.h
rename to src/consensus/amount.h
index 47968e80b1..8b41a2277d 100644
--- a/src/amount.h
+++ b/src/consensus/amount.h
@@ -3,15 +3,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_AMOUNT_H
-#define BITCOIN_AMOUNT_H
+#ifndef BITCOIN_CONSENSUS_AMOUNT_H
+#define BITCOIN_CONSENSUS_AMOUNT_H
 
-#include <stdint.h>
+#include <cstdint>
 
 /** Amount in satoshis (Can be negative) */
 typedef int64_t CAmount;
 
-static const CAmount COIN = 100000000;
+static constexpr CAmount COIN = 100000000;
 
 /** No amount larger than this (in satoshi) is valid.
  *
@@ -22,7 +22,7 @@ static const CAmount COIN = 100000000;
  * critical; in unusual circumstances like a(nother) overflow bug that allowed
  * for the creation of coins out of thin air modification could lead to a fork.
  * */
-static const CAmount MAX_MONEY = 21000000 * COIN;
+static constexpr CAmount MAX_MONEY = 21000000 * COIN;
 inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 
-#endif //  BITCOIN_AMOUNT_H
+#endif //  BITCOIN_CONSENSUS_AMOUNT_H
diff --git a/src/consensus/tx_check.cpp b/src/consensus/tx_check.cpp
index 6300879914..3908f483d0 100644
--- a/src/consensus/tx_check.cpp
+++ b/src/consensus/tx_check.cpp
@@ -7,6 +7,7 @@
 #include <consensus/consensus.h>
 #include <consensus/tx_check.h>
 
+#include <consensus/amount.h>
 #include <primitives/transaction.h>
 #include <consensus/validation.h>
 
diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h
index 4fbae4c540..76bbe68311 100644
--- a/src/consensus/tx_verify.h
+++ b/src/consensus/tx_verify.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
 #define BITCOIN_CONSENSUS_TX_VERIFY_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <stdint.h>
 #include <vector>
diff --git a/src/core_io.h b/src/core_io.h
index a24d7d5d7f..c416dd8501 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CORE_IO_H
 #define BITCOIN_CORE_IO_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <attributes.h>
 
 #include <string>
diff --git a/src/core_write.cpp b/src/core_write.cpp
index a2cdf68aa4..35f9bc2555 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -4,6 +4,7 @@
 
 #include <core_io.h>
 
+#include <consensus/amount.h>
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <primitives/transaction.h>
diff --git a/src/evo/dmn_types.h b/src/evo/dmn_types.h
index edc36187dd..d532c6b3a6 100644
--- a/src/evo/dmn_types.h
+++ b/src/evo/dmn_types.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_EVO_DMN_TYPES_H
 #define BITCOIN_EVO_DMN_TYPES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <limits>
 #include <string_view>
diff --git a/src/governance/classes.h b/src/governance/classes.h
index 3e42f2bdf0..030ae5f050 100644
--- a/src/governance/classes.h
+++ b/src/governance/classes.h
@@ -4,7 +4,7 @@
 #ifndef BITCOIN_GOVERNANCE_CLASSES_H
 #define BITCOIN_GOVERNANCE_CLASSES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <governance/object.h>
 #include <script/script.h>
 #include <script/standard.h>
diff --git a/src/init.cpp b/src/init.cpp
index 1723a2c72e..bdcc8296d4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -11,13 +11,13 @@
 #include <init.h>
 
 #include <addrman.h>
-#include <amount.h>
 #include <banman.h>
 #include <base58.h>
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <context.h>
+#include <consensus/amount.h>
 #include <deploymentstatus.h>
 #include <node/coinstats.h>
 #include <fs.h>
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 46b6f64317..cda4c1add1 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_INTERFACES_NODE_H
 #define BITCOIN_INTERFACES_NODE_H
 
-#include <amount.h>     // For CAmount
+#include <consensus/amount.h> // For CAmount
 #include <net.h>        // For NodeId
 #include <net_types.h>  // For banmap_t
 #include <netaddress.h> // For Network
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 06ff08caf8..9e9ba4ec27 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_INTERFACES_WALLET_H
 #define BITCOIN_INTERFACES_WALLET_H
 
-#include <amount.h>                    // For CAmount
+#include <consensus/amount.h>          // For CAmount
 #include <fs.h>
 #include <interfaces/chain.h>          // For ChainClient
 #include <pubkey.h>                    // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp
index dd743d2256..916bc5e2ff 100644
--- a/src/masternode/payments.cpp
+++ b/src/masternode/payments.cpp
@@ -4,9 +4,9 @@
 
 #include <masternode/payments.h>
 
-#include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
diff --git a/src/masternode/payments.h b/src/masternode/payments.h
index 660899927c..a4df891c8c 100644
--- a/src/masternode/payments.h
+++ b/src/masternode/payments.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_MASTERNODE_PAYMENTS_H
 #define BITCOIN_MASTERNODE_PAYMENTS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <string>
 #include <vector>
diff --git a/src/miner.cpp b/src/miner.cpp
index 5e5269dda2..f25c6865e6 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -6,9 +6,9 @@
 
 #include <miner.h>
 
-#include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
diff --git a/src/net.h b/src/net.h
index 1691f6f8d5..313c5be205 100644
--- a/src/net.h
+++ b/src/net.h
@@ -10,6 +10,7 @@
 #include <bloom.h>
 #include <chainparams.h>
 #include <compat.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <crypto/siphash.h>
 #include <hash.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c06829523c..53ea23a500 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -10,6 +10,7 @@
 #include <blockencodings.h>
 #include <blockfilter.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/validation.h>
 #include <hash.h>
 #include <index/blockfilterindex.h>
diff --git a/src/node/coinstats.h b/src/node/coinstats.h
index e86ac70e17..6cbdeee893 100644
--- a/src/node/coinstats.h
+++ b/src/node/coinstats.h
@@ -6,9 +6,9 @@
 #ifndef BITCOIN_NODE_COINSTATS_H
 #define BITCOIN_NODE_COINSTATS_H
 
-#include <amount.h>
 #include <chain.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <streams.h>
 #include <uint256.h>
 
diff --git a/src/policy/feerate.h b/src/policy/feerate.h
index a51b540b05..df700dfed5 100644
--- a/src/policy/feerate.h
+++ b/src/policy/feerate.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_POLICY_FEERATE_H
 #define BITCOIN_POLICY_FEERATE_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 
 #include <string>
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 35e52ebbd8..7b5b625170 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_POLICY_FEES_H
 #define BITCOIN_POLICY_FEES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/feerate.h>
 #include <uint256.h>
 #include <random.h>
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index feb97c0894..ed305e3c8b 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -5,6 +5,7 @@
 
 #include <primitives/transaction.h>
 
+#include <consensus/amount.h>
 #include <hash.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index ba56ef366d..4e9a04b914 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_PRIMITIVES_TRANSACTION_H
 #define BITCOIN_PRIMITIVES_TRANSACTION_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index 6968389be7..e51f8770b2 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_BITCOINAMOUNTFIELD_H
 #define BITCOIN_QT_BITCOINAMOUNTFIELD_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QValidator>
 #include <QWidget>
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 7b86531fbe..4462ab5579 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -11,7 +11,7 @@
 
 #include <qt/optionsdialog.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QLabel>
 #include <QMainWindow>
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index be39f756f0..e22d3b69a3 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -6,6 +6,8 @@
 #include <qt/bitcoinunits.h>
 #include <chainparams.h>
 
+#include <consensus/amount.h>
+
 #include <QSettings>
 #include <QStringList>
 
diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
index 6db69edc04..6d778c5c48 100644
--- a/src/qt/bitcoinunits.h
+++ b/src/qt/bitcoinunits.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_QT_BITCOINUNITS_H
 #define BITCOIN_QT_BITCOINUNITS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QAbstractListModel>
 #include <QString>
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 601b4bcb5b..eece1047d1 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_COINCONTROLDIALOG_H
 #define BITCOIN_QT_COINCONTROLDIALOG_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QAbstractButton>
 #include <QAction>
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 3507043262..438d170cfc 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_GUIUTIL_H
 #define BITCOIN_QT_GUIUTIL_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <qt/guiconstants.h>
 #include <net.h>
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index eaf4a8f6f8..4ce93d406f 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_QT_OPTIONSMODEL_H
 #define BITCOIN_QT_OPTIONSMODEL_H
 
-#include <amount.h>
 #include <qt/guiconstants.h>
 
 #include <cstdint>
diff --git a/src/qt/sendcoinsrecipient.h b/src/qt/sendcoinsrecipient.h
index bbabaebff4..6b2a0707b8 100644
--- a/src/qt/sendcoinsrecipient.h
+++ b/src/qt/sendcoinsrecipient.h
@@ -9,7 +9,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 
 #include <string>
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
index dada370296..0996289928 100644
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_TRANSACTIONFILTERPROXY_H
 #define BITCOIN_QT_TRANSACTIONFILTERPROXY_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QDateTime>
 #include <QSortFilterProxyModel>
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 92a6086d65..abd50f206d 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_TRANSACTIONRECORD_H
 #define BITCOIN_QT_TRANSACTIONRECORD_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <uint256.h>
 #include <key_io.h>
 
diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
index 14b2ba33f2..7a6b5704c3 100644
--- a/src/qt/walletmodeltransaction.h
+++ b/src/qt/walletmodeltransaction.h
@@ -8,7 +8,7 @@
 #include <primitives/transaction.h>
 #include <qt/sendcoinsrecipient.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QObject>
 
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index 8886de7ecb..05f0aaad1e 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_WALLETVIEW_H
 #define BITCOIN_QT_WALLETVIEW_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <qt/governancelist.h>
 #include <qt/masternodelist.h>
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9699375e18..21abcd4a0e 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -6,11 +6,11 @@
 
 #include <rpc/blockchain.h>
 
-#include <amount.h>
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <core_io.h>
 #include <consensus/params.h>
 #include <consensus/validation.h>
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index b67055bb66..f147776152 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_RPC_BLOCKCHAIN_H
 #define BITCOIN_RPC_BLOCKCHAIN_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <core_io.h>
 #include <streams.h>
 #include <sync.h>
diff --git a/src/rpc/index_util.h b/src/rpc/index_util.h
index 577e496f58..6bd3b73124 100644
--- a/src/rpc/index_util.h
+++ b/src/rpc/index_util.h
@@ -6,15 +6,15 @@
 #ifndef BITCOIN_RPC_INDEX_UTIL_H
 #define BITCOIN_RPC_INDEX_UTIL_H
 
-#include <cstdint>
-#include <vector>
-
-#include <amount.h>
+#include <consensus/amount.h>
 #include <addressindex.h>
 #include <spentindex.h>
 #include <sync.h>
 #include <threadsafety.h>
 
+#include <cstdint>
+#include <vector>
+
 class CBlockTreeDB;
 class CTxMemPool;
 class uint160;
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 2a24bf1eb7..2a6bbd6f1f 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -4,9 +4,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/params.h>
 #include <consensus/validation.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index e06382711e..09e7c7d862 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -7,6 +7,7 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <core_io.h>
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
index 6453c14622..9e41942965 100644
--- a/src/rpc/rawtransaction_util.cpp
+++ b/src/rpc/rawtransaction_util.cpp
@@ -6,6 +6,7 @@
 #include <rpc/rawtransaction_util.h>
 
 #include <coins.h>
+#include <consensus/amount.h>
 #include <core_io.h>
 #include <interfaces/chain.h>
 #include <key_io.h>
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 5a03ba1b4a..cb1b23acbd 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_RPC_SERVER_H
 #define BITCOIN_RPC_SERVER_H
 
-#include <amount.h>
 #include <rpc/request.h>
 #include <rpc/util.h>
 
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 4a63378b84..7768ffc838 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparamsbase.h>
+#include <consensus/amount.h>
 #include <key_io.h>
 #include <outputtype.h>
 #include <pubkey.h>
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index c9491f65f5..63bab32f70 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -5,6 +5,7 @@
 
 #include <script/sign.h>
 
+#include <consensus/amount.h>
 #include <key.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/spentindex.h b/src/spentindex.h
index eea95e9eb4..5382a2b096 100644
--- a/src/spentindex.h
+++ b/src/spentindex.h
@@ -9,7 +9,7 @@
 #define BITCOIN_SPENTINDEX_H
 
 #include <addressindex.h>
-#include <amount.h>
+#include <consensus/amount.h>
 #include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
index efcc372d5b..6404f07cbf 100644
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/feerate.h>
 
 #include <limits>
diff --git a/src/test/evo_assetlocks_tests.cpp b/src/test/evo_assetlocks_tests.cpp
index 92b3c76013..a37305d73a 100644
--- a/src/test/evo_assetlocks_tests.cpp
+++ b/src/test/evo_assetlocks_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <test/util/setup_common.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <consensus/tx_check.h>
 #include <consensus/validation.h>
 #include <evo/assetlocktx.h>
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index ef3dcc7e55..3c7d7d2682 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
 #include <chainparams.h>
 #include <chainparamsbase.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <consensus/tx_check.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
diff --git a/src/test/fuzz/fee_rate.cpp b/src/test/fuzz/fee_rate.cpp
index dff0e58000..a852f8fb60 100644
--- a/src/test/fuzz/fee_rate.cpp
+++ b/src/test/fuzz/fee_rate.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/feerate.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
diff --git a/src/test/fuzz/fees.cpp b/src/test/fuzz/fees.cpp
index 6e4348f4eb..ae6270f0cd 100644
--- a/src/test/fuzz/fees.cpp
+++ b/src/test/fuzz/fees.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/fees.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index fae1fc6b46..5ab3810578 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -5,6 +5,7 @@
 #include <arith_uint256.h>
 #include <chainparams.h>
 #include <compressor.h>
+#include <consensus/amount.h>
 #include <consensus/merkle.h>
 #include <core_io.h>
 #include <crypto/common.h>
diff --git a/src/test/fuzz/script_flags.cpp b/src/test/fuzz/script_flags.cpp
index c38dbfb4d8..c31350d317 100644
--- a/src/test/fuzz/script_flags.cpp
+++ b/src/test/fuzz/script_flags.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <consensus/amount.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <streams.h>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 521164bad4..b3438cfba3 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -5,12 +5,12 @@
 #ifndef BITCOIN_TEST_FUZZ_UTIL_H
 #define BITCOIN_TEST_FUZZ_UTIL_H
 
-#include <amount.h>
 #include <arith_uint256.h>
 #include <attributes.h>
 #include <chainparamsbase.h>
 #include <coins.h>
 #include <compat.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <key.h>
 #include <merkleblock.h>
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
index b0172e9321..f534c19c2b 100644
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <consensus/amount.h>
 #include <net.h>
 #include <uint256.h>
 #include <validation.h>
diff --git a/src/txmempool.h b/src/txmempool.h
index 7e570afc3e..d7d49b91a7 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -15,17 +15,17 @@
 #include <vector>
 
 #include <addressindex.h>
-#include <spentindex.h>
-#include <amount.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <gsl/pointers.h>
 #include <indirectmap.h>
+#include <netaddress.h>
 #include <policy/feerate.h>
 #include <policy/packages.h>
 #include <primitives/transaction.h>
-#include <random.h>
-#include <netaddress.h>
 #include <pubkey.h>
+#include <random.h>
+#include <spentindex.h>
 #include <sync.h>
 #include <util/epochguard.h>
 #include <util/hasher.h>
diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp
index 95a919ad12..1aed7daacf 100644
--- a/src/util/moneystr.cpp
+++ b/src/util/moneystr.cpp
@@ -5,7 +5,7 @@
 
 #include <util/moneystr.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/util/moneystr.h b/src/util/moneystr.h
index b71dffd0db..f37dc1cffd 100644
--- a/src/util/moneystr.h
+++ b/src/util/moneystr.h
@@ -9,8 +9,8 @@
 #ifndef BITCOIN_UTIL_MONEYSTR_H
 #define BITCOIN_UTIL_MONEYSTR_H
 
-#include <amount.h>
 #include <attributes.h>
+#include <consensus/amount.h>
 
 #include <optional>
 #include <string>
diff --git a/src/util/system.h b/src/util/system.h
index 4ab1905459..da838c61c4 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -18,12 +18,12 @@
 #include <attributes.h>
 #include <compat.h>
 #include <compat/assumptions.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <logging.h>
 #include <sync.h>
 #include <util/settings.h>
 #include <util/time.h>
-#include <amount.h>
 
 #include <exception>
 #include <map>
diff --git a/src/validation.cpp b/src/validation.cpp
index c185b7cbc7..3d42bc6bc3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -10,6 +10,7 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <checkqueue.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_check.h>
diff --git a/src/validation.h b/src/validation.h
index 51664f4739..031ef19b55 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -11,10 +11,10 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <amount.h>
 #include <arith_uint256.h>
 #include <attributes.h>
 #include <chain.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <node/blockstorage.h>
 #include <policy/feerate.h>
diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h
index 0734927ad2..487636ffa4 100644
--- a/src/wallet/coinselection.h
+++ b/src/wallet/coinselection.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_WALLET_COINSELECTION_H
 #define BITCOIN_WALLET_COINSELECTION_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <random.h>
diff --git a/src/wallet/fees.h b/src/wallet/fees.h
index 26d9394999..1df3d7e291 100644
--- a/src/wallet/fees.h
+++ b/src/wallet/fees.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_WALLET_FEES_H
 #define BITCOIN_WALLET_FEES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 class CCoinControl;
 class CFeeRate;
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index af1c53e0fc..d1996ecc19 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -4,8 +4,8 @@
 
 #include <interfaces/wallet.h>
 
-#include <amount.h>
 #include <coinjoin/client.h>
+#include <consensus/amount.h>
 #include <interfaces/chain.h>
 #include <interfaces/coinjoin.h>
 #include <interfaces/handler.h>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index cbd98674a4..b4ca6de160 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4,8 +4,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <core_io.h>
 #include <httpserver.h>
 #include <interfaces/chain.h>
diff --git a/src/wallet/test/coinjoin_tests.cpp b/src/wallet/test/coinjoin_tests.cpp
index 0615943b4e..e4143eae42 100644
--- a/src/wallet/test/coinjoin_tests.cpp
+++ b/src/wallet/test/coinjoin_tests.cpp
@@ -4,12 +4,12 @@
 
 #include <test/util/setup_common.h>
 
-#include <amount.h>
 #include <coinjoin/client.h>
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/context.h>
 #include <coinjoin/options.h>
 #include <coinjoin/util.h>
+#include <consensus/amount.h>
 #include <node/context.h>
 #include <util/translation.h>
 #include <validation.h>
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp
index 88eb119d7b..e7731a9c4d 100644
--- a/src/wallet/test/coinselector_tests.cpp
+++ b/src/wallet/test/coinselector_tests.cpp
@@ -2,13 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
+#include <test/util/setup_common.h>
+
+#include <consensus/amount.h>
 #include <node/context.h>
 #include <primitives/transaction.h>
 #include <random.h>
-#include <test/util/setup_common.h>
-#include <validation.h>
 #include <util/translation.h>
+#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/coinselection.h>
 #include <wallet/test/wallet_test_fixture.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 19e5b1ad93..049100a764 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -8,6 +8,7 @@
 
 #include <chain.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <crypto/common.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index af80efb535..dd0238595b 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -7,7 +7,7 @@
 #ifndef BITCOIN_WALLET_WALLET_H
 #define BITCOIN_WALLET_WALLET_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <governance/common.h>
 #include <interfaces/chain.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 7c4427123d..c2d9dfd256 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_WALLET_WALLETDB_H
 #define BITCOIN_WALLET_WALLETDB_H
 
-#include <amount.h>
 #include <script/sign.h>
 #include <wallet/db.h>
 #include <wallet/walletutil.h>