scripted-diff: Move util files to separate directory.

-BEGIN VERIFY SCRIPT-
mkdir -p src/util
git mv src/util.h src/util/system.h
git mv src/util.cpp src/util/system.cpp
git mv src/utilmemory.h src/util/memory.h
git mv src/utilmoneystr.h src/util/moneystr.h
git mv src/utilmoneystr.cpp src/util/moneystr.cpp
git mv src/utilstrencodings.h src/util/strencodings.h
git mv src/utilstrencodings.cpp src/util/strencodings.cpp
git mv src/utiltime.h src/util/time.h
git mv src/utiltime.cpp src/util/time.cpp

sed -i 's/<util\.h>/<util\/system\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i 's/<utilmemory\.h>/<util\/memory\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i 's/<utilmoneystr\.h>/<util\/moneystr\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i 's/<utilstrencodings\.h>/<util\/strencodings\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i 's/<utiltime\.h>/<util\/time\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')

sed -i 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h
sed -i 's/BITCOIN_UTILMEMORY_H/BITCOIN_UTIL_MEMORY_H/g' src/util/memory.h
sed -i 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h
sed -i 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h
sed -i 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h

sed -i 's/ util\.\(h\|cpp\)/ util\/system\.\1/g' src/Makefile.am
sed -i 's/utilmemory\.\(h\|cpp\)/util\/memory\.\1/g' src/Makefile.am
sed -i 's/utilmoneystr\.\(h\|cpp\)/util\/moneystr\.\1/g' src/Makefile.am
sed -i 's/utilstrencodings\.\(h\|cpp\)/util\/strencodings\.\1/g' src/Makefile.am
sed -i 's/utiltime\.\(h\|cpp\)/util\/time\.\1/g' src/Makefile.am

sed -i 's/-> util ->/-> util\/system ->/' test/lint/lint-circular-dependencies.sh
sed -i 's/src\/util\.cpp/src\/util\/system\.cpp/g' test/lint/lint-format-strings.py test/lint/lint-locale-dependence.sh
sed -i 's/src\/utilmoneystr\.cpp/src\/util\/moneystr\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i 's/src\/utilstrencodings\.\(h\|cpp\)/src\/util\/strencodings\.\1/g' test/lint/lint-locale-dependence.sh
sed -i 's/src\\utilstrencodings\.cpp/src\\util\\strencodings\.cpp/' build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj
-END VERIFY SCRIPT-

build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj

@@ -40,7 +40,7 @@
     <ClCompile Include="..\..\src\script\script.cpp" />
     <ClCompile Include="..\..\src\script\script_error.cpp" />
     <ClCompile Include="..\..\src\uint256.cpp" />
-    <ClCompile Include="..\..\src\utilstrencodings.cpp" />
+    <ClCompile Include="..\..\src\util\strencodings.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/Makefile.am

@@ -183,10 +183,10 @@ BITCOIN_CORE_H = \
   txmempool.h \
   ui_interface.h \
   undo.h \
-  util.h \
-  utilmemory.h \
-  utilmoneystr.h \
-  utiltime.h \
+  util/system.h \
+  util/memory.h \
+  util/moneystr.h \
+  util/time.h \
   validation.h \
   validationinterface.h \
   versionbits.h \
@@ -377,8 +377,8 @@ libbitcoin_consensus_a_SOURCES = \
   tinyformat.h \
   uint256.cpp \
   uint256.h \
-  utilstrencodings.cpp \
-  utilstrencodings.h \
+  util/strencodings.cpp \
+  util/strencodings.h \
   version.h
 
 # common: shared between bitcoind, and bitcoin-qt and non-server tools
@@ -427,10 +427,10 @@ libbitcoin_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   threadinterrupt.cpp \
-  util.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
+  util/system.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
   $(BITCOIN_CORE_H)
 
 if GLIBC_BACK_COMPAT

src/addrdb.cpp

@@ -12,7 +12,7 @@
 #include <random.h>
 #include <streams.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 namespace {
 

src/addrman.h

@@ -11,7 +11,7 @@
 #include <random.h>
 #include <sync.h>
 #include <timedata.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <map>
 #include <set>

src/arith_uint256.cpp

@@ -6,7 +6,7 @@
 #include <arith_uint256.h>
 
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <crypto/common.h>
 
 #include <stdio.h>

src/base58.cpp

@@ -6,7 +6,7 @@
 
 #include <hash.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <assert.h>
 #include <string.h>

src/bench/bech32.cpp

@@ -6,7 +6,7 @@
 
 #include <validation.h>
 #include <bech32.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <vector>
 #include <string>

src/bench/bench_bitcoin.cpp

@@ -7,8 +7,8 @@
 #include <crypto/sha256.h>
 #include <key.h>
 #include <random.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <validation.h>
 
 #include <memory>

src/bench/block_assemble.cpp

@@ -13,7 +13,7 @@
 #include <scheduler.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <utiltime.h>
+#include <util/time.h>
 #include <validation.h>
 #include <validationinterface.h>
 

src/bench/checkqueue.cpp

@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <checkqueue.h>
 #include <prevector.h>

src/bench/crypto_hash.cpp

@@ -9,7 +9,7 @@
 #include <hash.h>
 #include <random.h>
 #include <uint256.h>
-#include <utiltime.h>
+#include <util/time.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>

src/bench/examples.cpp

@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <validation.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.

src/bitcoin-cli.cpp

@@ -12,8 +12,8 @@
 #include <fs.h>
 #include <rpc/client.h>
 #include <rpc/protocol.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <memory>
 #include <stdio.h>

src/bitcoin-tx.cpp

@@ -18,9 +18,9 @@
 #include <script/script.h>
 #include <script/sign.h>
 #include <univalue.h>
-#include <util.h>
-#include <utilmoneystr.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/moneystr.h>
+#include <util/strencodings.h>
 
 #include <memory>
 #include <stdio.h>

src/bitcoind.cpp

@@ -15,10 +15,10 @@
 #include <init.h>
 #include <noui.h>
 #include <shutdown.h>
-#include <util.h>
+#include <util/system.h>
 #include <httpserver.h>
 #include <httprpc.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <walletinitinterface.h>
 
 #include <stdio.h>

src/blockencodings.cpp

@@ -11,7 +11,7 @@
 #include <streams.h>
 #include <txmempool.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <unordered_map>
 

src/chainparams.cpp

@@ -8,8 +8,8 @@
 #include <chainparamsseeds.h>
 #include <consensus/merkle.h>
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <versionbitsinfo.h>
 
 #include <assert.h>

src/chainparamsbase.cpp

@@ -6,8 +6,8 @@
 #include <chainparamsbase.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilmemory.h>
+#include <util/system.h>
+#include <util/memory.h>
 
 #include <assert.h>
 

src/consensus/merkle.cpp

@@ -4,7 +4,7 @@
 
 #include <consensus/merkle.h>
 #include <hash.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 /*     WARNING! If you're reading this because you're learning about crypto
        and/or designing a new system that will use merkle trees, keep in mind

src/consensus/tx_verify.cpp

@@ -12,7 +12,7 @@
 // TODO remove the following dependencies
 #include <chain.h>
 #include <coins.h>
-#include <utilmoneystr.h>
+#include <util/moneystr.h>
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {

src/core_read.cpp

@@ -11,8 +11,8 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <version.h>
 
 #include <boost/algorithm/string/classification.hpp>

src/core_write.cpp

@@ -12,9 +12,9 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <util.h>
-#include <utilmoneystr.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/moneystr.h>
+#include <util/strencodings.h>
 
 UniValue ValueFromAmount(const CAmount& amount)
 {

src/dbwrapper.h

@@ -9,8 +9,8 @@
 #include <fs.h>
 #include <serialize.h>
 #include <streams.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <version.h>
 
 #include <leveldb/db.h>

src/dummywallet.cpp

@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <stdio.h>
-#include <util.h>
+#include <util/system.h>
 #include <walletinitinterface.h>
 
 class CWallet;

src/httprpc.cpp

@@ -11,8 +11,8 @@
 #include <rpc/server.h>
 #include <random.h>
 #include <sync.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <ui_interface.h>
 #include <walletinitinterface.h>
 #include <crypto/hmac_sha256.h>

src/httpserver.cpp

@@ -6,8 +6,8 @@
 
 #include <chainparamsbase.h>
 #include <compat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <netbase.h>
 #include <rpc/protocol.h> // For HTTP status codes
 #include <sync.h>

src/index/base.cpp

@@ -7,7 +7,7 @@
 #include <shutdown.h>
 #include <tinyformat.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <warnings.h>
 

src/index/txindex.cpp

@@ -5,7 +5,7 @@
 #include <index/txindex.h>
 #include <shutdown.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <boost/thread.hpp>

src/init.cpp

@@ -41,8 +41,8 @@
 #include <txmempool.h>
 #include <torcontrol.h>
 #include <ui_interface.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validationinterface.h>
 #include <warnings.h>
 #include <walletinitinterface.h>

src/init.h

@@ -8,7 +8,7 @@
 
 #include <memory>
 #include <string>
-#include <util.h>
+#include <util/system.h>
 
 class CScheduler;
 class CWallet;

src/interfaces/handler.cpp

@@ -4,7 +4,7 @@
 
 #include <interfaces/handler.h>
 
-#include <utilmemory.h>
+#include <util/memory.h>
 
 #include <boost/signals2/connection.hpp>
 #include <utility>

src/interfaces/node.cpp

@@ -25,7 +25,7 @@
 #include <sync.h>
 #include <txmempool.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <warnings.h>
 

src/key_io.cpp

@@ -7,7 +7,7 @@
 #include <base58.h>
 #include <bech32.h>
 #include <script/script.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>

src/keystore.cpp

@@ -5,7 +5,7 @@
 
 #include <keystore.h>
 
-#include <util.h>
+#include <util/system.h>
 
 void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)
 {

src/logging.cpp

@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <logging.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 const char * const DEFAULT_DEBUGLOGFILE = "debug.log";
 

src/merkleblock.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <consensus/consensus.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 
 CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter* filter, const std::set<uint256>* txids)

src/miner.cpp

@@ -21,8 +21,8 @@
 #include <primitives/transaction.h>
 #include <script/standard.h>
 #include <timedata.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validationinterface.h>
 
 #include <algorithm>

src/net.cpp

@@ -18,7 +18,7 @@
 #include <netbase.h>
 #include <scheduler.h>
 #include <ui_interface.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #ifdef WIN32
 #include <string.h>

src/net_processing.cpp

@@ -25,9 +25,9 @@
 #include <tinyformat.h>
 #include <txmempool.h>
 #include <ui_interface.h>
-#include <util.h>
-#include <utilmoneystr.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/moneystr.h>
+#include <util/strencodings.h>
 
 #include <memory>
 

src/netaddress.cpp

@@ -5,7 +5,7 @@
 
 #include <netaddress.h>
 #include <hash.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <tinyformat.h>
 
 static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };

src/netbase.cpp

@@ -10,8 +10,8 @@
 #include <uint256.h>
 #include <random.h>
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <atomic>
 

src/noui.cpp

@@ -6,7 +6,7 @@
 #include <noui.h>
 
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <cstdio>
 #include <stdint.h>

src/policy/fees.cpp

@@ -10,7 +10,7 @@
 #include <primitives/transaction.h>
 #include <streams.h>
 #include <txmempool.h>
-#include <util.h>
+#include <util/system.h>
 
 static constexpr double INF_FEERATE = 1e99;
 

src/policy/policy.cpp

@@ -11,8 +11,8 @@
 #include <validation.h>
 #include <coins.h>
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 
 CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)

src/primitives/block.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <crypto/common.h>
 
 uint256 CBlockHeader::GetHash() const

src/primitives/transaction.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 std::string COutPoint::ToString() const
 {

src/protocol.cpp

@@ -5,8 +5,8 @@
 
 #include <protocol.h>
 
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #ifndef WIN32
 # include <arpa/inet.h>

src/qt/bantablemodel.cpp

@@ -10,7 +10,7 @@
 
 #include <interfaces/node.h>
 #include <sync.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 #include <QDebug>
 #include <QList>

src/qt/bitcoin.cpp

@@ -32,7 +32,7 @@
 #include <rpc/server.h>
 #include <ui_interface.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 #include <warnings.h>
 
 #include <walletinitinterface.h>

src/qt/bitcoingui.cpp

@@ -33,7 +33,7 @@
 #include <interfaces/node.h>
 #include <noui.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <iostream>
 

src/qt/clientmodel.cpp

@@ -20,7 +20,7 @@
 #include <netbase.h>
 #include <txmempool.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <warnings.h>
 
 #include <stdint.h>

src/qt/guiutil.cpp

@@ -18,7 +18,7 @@
 #include <protocol.h>
 #include <script/script.h>
 #include <script/standard.h>
-#include <util.h>
+#include <util/system.h>
 
 #ifdef WIN32
 #ifdef _WIN32_WINNT

src/qt/intro.cpp

@@ -13,7 +13,7 @@
 #include <qt/guiutil.h>
 
 #include <interfaces/node.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <QFileDialog>
 #include <QSettings>

src/qt/paymentrequestplus.cpp

@@ -9,7 +9,7 @@
 
 #include <qt/paymentrequestplus.h>
 
-#include <util.h>
+#include <util/system.h>
 
 #include <stdexcept>
 

src/qt/paymentserver.cpp

@@ -17,7 +17,7 @@
 #include <policy/policy.h>
 #include <key_io.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <wallet/wallet.h>
 
 #include <cstdlib>

src/qt/rpcconsole.cpp

@@ -18,7 +18,7 @@
 #include <netbase.h>
 #include <rpc/server.h>
 #include <rpc/client.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <openssl/crypto.h>
 

src/qt/splashscreen.cpp

@@ -15,7 +15,7 @@
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
 #include <ui_interface.h>
-#include <util.h>
+#include <util/system.h>
 #include <version.h>
 
 #include <QApplication>

src/qt/test/paymentservertests.cpp

@@ -13,8 +13,8 @@
 #include <random.h>
 #include <script/script.h>
 #include <script/standard.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>

src/qt/test/rpcnestedtests.cpp

@@ -14,7 +14,7 @@
 #include <qt/rpcconsole.h>
 #include <test/test_bitcoin.h>
 #include <univalue.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <QDir>
 #include <QtGlobal>

src/qt/test/test_main.cpp

@@ -8,7 +8,7 @@
 
 #include <chainparams.h>
 #include <qt/test/rpcnestedtests.h>
-#include <util.h>
+#include <util/system.h>
 #include <qt/test/uritests.h>
 #include <qt/test/compattests.h>
 

src/qt/transactiondesc.cpp

@@ -19,7 +19,7 @@
 #include <validation.h>
 #include <script/script.h>
 #include <timedata.h>
-#include <util.h>
+#include <util/system.h>
 #include <wallet/db.h>
 #include <wallet/wallet.h>
 #include <policy/policy.h>

src/qt/transactiontablemodel.cpp

@@ -18,7 +18,7 @@
 #include <interfaces/node.h>
 #include <sync.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <QColor>

src/qt/utilitydialog.cpp

@@ -22,7 +22,7 @@
 #include <clientversion.h>
 #include <init.h>
 #include <interfaces/node.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <stdio.h>
 

src/qt/walletmodel.cpp

@@ -20,7 +20,7 @@
 #include <interfaces/node.h>
 #include <key_io.h>
 #include <ui_interface.h>
-#include <util.h> // for GetBoolArg
+#include <util/system.h> // for GetBoolArg
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
 

src/qt/winshutdownmonitor.cpp

@@ -6,7 +6,7 @@
 
 #if defined(Q_OS_WIN)
 #include <shutdown.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <windows.h>
 

src/random.cpp

@@ -13,7 +13,7 @@
 #endif
 #include <logging.h>  // for LogPrint()
 #include <sync.h>     // for WAIT_LOCK
-#include <utiltime.h> // for GetTime()
+#include <util/time.h> // for GetTime()
 
 #include <stdlib.h>
 #include <chrono>
@@ -35,7 +35,7 @@
 #include <sys/random.h>
 #endif
 #ifdef HAVE_SYSCTL_ARND
-#include <utilstrencodings.h> // for ARRAYLEN
+#include <util/strencodings.h> // for ARRAYLEN
 #include <sys/sysctl.h>
 #endif
 

src/rest.cpp

@@ -16,7 +16,7 @@
 #include <streams.h>
 #include <sync.h>
 #include <txmempool.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <version.h>
 
 #include <boost/algorithm/string.hpp>

src/rpc/blockchain.cpp

@@ -26,8 +26,8 @@
 #include <sync.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <hash.h>
 #include <validationinterface.h>
 #include <versionbitsinfo.h>

src/rpc/client.cpp

@@ -5,7 +5,7 @@
 
 #include <rpc/client.h>
 #include <rpc/protocol.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <set>
 #include <stdint.h>

src/rpc/mining.cpp

@@ -20,8 +20,8 @@
 #include <rpc/server.h>
 #include <shutdown.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <validation.h>
 #include <validationinterface.h>
 #include <versionbitsinfo.h>

src/rpc/misc.cpp

@@ -17,8 +17,8 @@
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <timedata.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <warnings.h>
 
 #include <stdint.h>

src/rpc/net.cpp

@@ -16,8 +16,8 @@
 #include <sync.h>
 #include <timedata.h>
 #include <ui_interface.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <version.h>
 #include <warnings.h>
 

src/rpc/protocol.cpp

@@ -7,9 +7,9 @@
 
 #include <random.h>
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
-#include <utiltime.h>
+#include <util/system.h>
+#include <util/strencodings.h>
+#include <util/time.h>
 #include <version.h>
 
 /**

src/rpc/rawtransaction.cpp

@@ -26,7 +26,7 @@
 #include <script/standard.h>
 #include <txmempool.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <future>
 #include <stdint.h>

src/rpc/server.cpp

@@ -11,8 +11,8 @@
 #include <shutdown.h>
 #include <sync.h>
 #include <ui_interface.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <boost/bind.hpp>
 #include <boost/signals2/signal.hpp>

src/rpc/util.cpp

@@ -7,7 +7,7 @@
 #include <rpc/protocol.h>
 #include <rpc/util.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 // Converts a hex string to a public key if possible
 CPubKey HexToPubKey(const std::string& hex_in)

src/script/descriptor.cpp

@@ -10,8 +10,8 @@
 #include <script/standard.h>
 
 #include <span.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <memory>
 #include <string>

src/script/script.cpp

@@ -6,7 +6,7 @@
 #include <script/script.h>
 
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 const char* GetOpName(opcodetype opcode)
 {

src/script/sigcache.cpp

@@ -9,7 +9,7 @@
 #include <pubkey.h>
 #include <random.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <cuckoocache.h>
 #include <boost/thread.hpp>

src/script/standard.cpp

@@ -8,8 +8,8 @@
 #include <crypto/sha256.h>
 #include <pubkey.h>
 #include <script/script.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 
 typedef std::vector<unsigned char> valtype;

src/sync.cpp

@@ -5,7 +5,7 @@
 #include <sync.h>
 
 #include <logging.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <stdio.h>
 

src/test/allocator_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 <util.h>
+#include <util/system.h>
 
 #include <support/allocators/secure.h>
 #include <test/test_bitcoin.h>

src/test/base32_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 <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>

src/test/base58_tests.cpp

@@ -6,7 +6,7 @@
 
 #include <base58.h>
 #include <test/test_bitcoin.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <univalue.h>
 

src/test/base64_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 <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>

src/test/bip32_tests.cpp

@@ -7,8 +7,8 @@
 #include <key.h>
 #include <key_io.h>
 #include <uint256.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <string>

src/test/blockfilter_tests.cpp

@@ -10,7 +10,7 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
 

src/test/bloom_tests.cpp

@@ -13,8 +13,8 @@
 #include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <vector>

src/test/checkqueue_tests.cpp

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <util.h>
-#include <utiltime.h>
+#include <util/system.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <test/test_bitcoin.h>

src/test/coins_tests.cpp

@@ -6,7 +6,7 @@
 #include <script/standard.h>
 #include <uint256.h>
 #include <undo.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 #include <validation.h>
 #include <consensus/validation.h>

src/test/compress_tests.cpp

@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <compressor.h>
-#include <util.h>
+#include <util/system.h>
 #include <test/test_bitcoin.h>
 
 #include <stdint.h>

src/test/crypto_tests.cpp

@@ -11,7 +11,7 @@
 #include <crypto/hmac_sha256.h>
 #include <crypto/hmac_sha512.h>
 #include <random.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <vector>

src/test/denialofservice_tests.cpp

@@ -11,7 +11,7 @@
 #include <pow.h>
 #include <script/sign.h>
 #include <serialize.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <test/test_bitcoin.h>

src/test/descriptor_tests.cpp

@@ -9,7 +9,7 @@
 #include <test/test_bitcoin.h>
 #include <boost/test/unit_test.hpp>
 #include <script/descriptor.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 namespace {
 

src/test/getarg_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 <util.h>
+#include <util/system.h>
 #include <test/test_bitcoin.h>
 
 #include <string>

src/test/hash_tests.cpp

@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <hash.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <vector>

src/test/key_io_tests.cpp

@@ -8,7 +8,7 @@
 #include <key.h>
 #include <key_io.h>
 #include <script/script.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>

src/test/key_properties.cpp

@@ -6,8 +6,8 @@
 #include <base58.h>
 #include <script/script.h>
 #include <uint256.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 #include <string>
 #include <vector>

src/test/key_tests.cpp

@@ -7,8 +7,8 @@
 #include <key_io.h>
 #include <script/script.h>
 #include <uint256.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 
 #include <string>

src/test/mempool_tests.cpp

@@ -4,7 +4,7 @@
 
 #include <policy/policy.h>
 #include <txmempool.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <test/test_bitcoin.h>