merge bitcoin#14555: Move util files to directory

(script modified to account for Dash backports, doesn't account for rebasing)

------------- BEGIN 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
git mv src/utilasmap.h src/util/asmap.h
git mv src/utilasmap.cpp src/util/asmap.cpp
git mv src/utilstring.h src/util/string.h
git mv src/utilstring.cpp src/util/string.cpp

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

gsed -i 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h
gsed -i 's/BITCOIN_UTILMEMORY_H/BITCOIN_UTIL_MEMORY_H/g' src/util/memory.h
gsed -i 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h
gsed -i 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h
gsed -i 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h
gsed -i 's/BITCOIN_UTILASMAP_H/BITCOIN_UTIL_ASMAP_H/g' src/util/asmap.h
gsed -i 's/BITCOIN_UTILSTRING_H/BITCOIN_UTIL_STRING_H/g' src/util/string.h

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

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

src/Makefile.am

@@ -260,13 +260,13 @@ BITCOIN_CORE_H = \
   ui_interface.h \
   undo.h \
   unordered_lru_cache.h \
-  util.h \
-  utilasmap.h \
-  utilmemory.h \
-  utilmoneystr.h \
-  utilstring.h \
-  utiltime.h \
-  utilthreadnames.h \
+  util/system.h \
+  util/asmap.h \
+  util/memory.h \
+  util/moneystr.h \
+  util/string.h \
+  util/time.h \
+  util/threadnames.h \
   validation.h \
   validationinterface.h \
   versionbits.h \
@@ -529,8 +529,8 @@ libdash_consensus_a_SOURCES = \
   tinyformat.h \
   uint256.cpp \
   uint256.h \
-  utilstrencodings.cpp \
-  utilstrencodings.h \
+  util/strencodings.cpp \
+  util/strencodings.h \
   version.h
 
 # common: shared between dashd, and dash-qt and non-server tools
@@ -588,13 +588,13 @@ libdash_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   threadinterrupt.cpp \
-  util.cpp \
-  utilasmap.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
-  utilstring.cpp \
-  utilthreadnames.cpp \
+  util/system.cpp \
+  util/asmap.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
+  util/string.cpp \
+  util/threadnames.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

@@ -13,7 +13,7 @@
 #include <sync.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <fs.h>
 #include <hash.h>

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,8 +6,8 @@
 
 #include <hash.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
-#include <utilstring.h>
+#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <assert.h>
 #include <stdint.h>

src/batchedlogger.cpp

@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <batchedlogger.h>
-#include <util.h>
+#include <util/system.h>
 
 CBatchedLogger::CBatchedLogger(BCLog::LogFlags _category, const std::string& _header) :
     accept(LogAcceptCategory(_category)), header(_header)

src/bench/bench_dash.cpp

@@ -8,7 +8,7 @@
 #include <key.h>
 #include <stacktraces.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 #include <random.h>
 
 #include <boost/lexical_cast.hpp>

src/bench/bls.cpp

@@ -5,7 +5,7 @@
 #include <bench/bench.h>
 #include <random.h>
 #include <bls/bls_worker.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 #include <iostream>
 

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

@@ -10,7 +10,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/bench/string_cast.cpp

@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/lexical_cast.hpp>
 #include <string>

src/bench/util_time.cpp

@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 
-#include <utiltime.h>
+#include <util/time.h>
 
 static void BenchTimeDeprecated(benchmark::State& state)
 {

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/bls/bls.h

@@ -8,7 +8,7 @@
 #include <hash.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 // bls-dash uses relic, which may define DEBUG and ERROR, which leads to many warnings in some build setups
 #undef ERROR

src/bls/bls_worker.cpp

@@ -6,7 +6,7 @@
 #include <hash.h>
 #include <serialize.h>
 
-#include <util.h>
+#include <util/system.h>
 
 #include <memory>
 #include <utility>

src/chainparams.cpp

@@ -8,8 +8,8 @@
 #include <consensus/merkle.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <arith_uint256.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/checkqueue.h

@@ -7,7 +7,7 @@
 
 #include <sync.h>
 #include <tinyformat.h>
-#include <utilthreadnames.h>
+#include <util/threadnames.h>
 
 #include <algorithm>
 #include <vector>

src/coinjoin/coinjoin-client-options.cpp

@@ -4,7 +4,7 @@
 
 #include <coinjoin/coinjoin-client-options.h>
 
-#include <util.h>
+#include <util/system.h>
 #include <univalue.h>
 
 #include <cassert>

src/coinjoin/coinjoin-client.cpp

@@ -15,8 +15,8 @@
 #include <net_processing.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>
 #include <wallet/coincontrol.h>

src/coinjoin/coinjoin-server.cpp

@@ -15,8 +15,8 @@
 #include <netmessagemaker.h>
 #include <script/interpreter.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>
 

src/coinjoin/coinjoin.cpp

@@ -11,8 +11,8 @@
 #include <netmessagemaker.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <bls/bls.h>
 #include <masternode/activemasternode.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

@@ -10,8 +10,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

@@ -13,9 +13,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>
 
 #include <spentindex.h>
 

src/dash-cli.cpp

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

src/dash-tx.cpp

@@ -17,9 +17,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/dashd.cpp

@@ -15,11 +15,11 @@
 #include <rpc/server.h>
 #include <init.h>
 #include <noui.h>
-#include <util.h>
+#include <util/system.h>
 #include <httpserver.h>
 #include <httprpc.h>
-#include <utilstrencodings.h>
-#include <utilthreadnames.h>
+#include <util/strencodings.h>
+#include <util/threadnames.h>
 #include <walletinitinterface.h>
 #include <stacktraces.h>
 

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

src/flat-database.h

@@ -10,7 +10,7 @@
 #include <fs.h>
 #include <hash.h>
 #include <streams.h>
-#include <util.h>
+#include <util/system.h>
 
 /**
 *   Generic Dumping and Loading

src/governance/governance-classes.cpp

@@ -10,7 +10,7 @@
 #include <primitives/transaction.h>
 #include <script/standard.h>
 #include <timedata.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <validation.h>
 
 #include <boost/algorithm/string.hpp>

src/governance/governance-validators.cpp

@@ -8,7 +8,7 @@
 #include <key_io.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <algorithm>
 

src/governance/governance-vote.cpp

@@ -9,7 +9,7 @@
 #include <masternode/masternode-sync.h>
 #include <messagesigner.h>
 #include <net.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <evo/deterministicmns.h>
 

src/hdchain.cpp

@@ -6,8 +6,8 @@
 #include <hdchain.h>
 #include <key_io.h>
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 bool CHDChain::SetNull()
 {

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 <crypto/hmac_sha256.h>
 #include <stdio.h>

src/httpserver.cpp

@@ -7,9 +7,9 @@
 #include <init.h>
 #include <chainparamsbase.h>
 #include <compat.h>
-#include <util.h>
-#include <utilstrencodings.h>
-#include <utilthreadnames.h>
+#include <util/system.h>
+#include <util/strencodings.h>
+#include <util/threadnames.h>
 #include <netbase.h>
 #include <rpc/protocol.h> // For HTTP status codes
 #include <sync.h>

src/index/txindex.cpp

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

src/init.cpp

@@ -39,15 +39,15 @@
 #include <script/standard.h>
 #include <script/sigcache.h>
 #include <scheduler.h>
-#include <utilthreadnames.h>
+#include <util/threadnames.h>
 #include <timedata.h>
 #include <txdb.h>
 #include <txmempool.h>
 #include <torcontrol.h>
 #include <ui_interface.h>
-#include <util.h>
-#include <utilasmap.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/asmap.h>
+#include <util/moneystr.h>
 #include <validationinterface.h>
 
 #include <masternode/activemasternode.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 <util.h>
+#include <util/system.h>
 
 #include <boost/signals2/connection.hpp>
 #include <memory>

src/interfaces/node.cpp

@@ -27,7 +27,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/keepass.cpp

@@ -15,8 +15,8 @@
 #include <script/script.h>
 #include <script/standard.h>
 
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <event2/event.h>
 #include <event2/http.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>
 
 bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const
 {

src/logging.cpp

@@ -4,9 +4,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <logging.h>
-#include <util.h>
-#include <utilthreadnames.h>
-#include <utiltime.h>
+#include <util/system.h>
+#include <util/threadnames.h>
+#include <util/time.h>
 
 #include <mutex>
 

src/logging/timer.h

@@ -8,7 +8,7 @@
 
 #include <logging.h>
 #include <sync.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 #include <chrono>
 #include <string>

src/merkleblock.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <consensus/consensus.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 
 std::vector<unsigned char> BitsToBytes(const std::vector<bool>& bits)

src/messagesigner.cpp

@@ -7,7 +7,7 @@
 #include <validation.h> // For strMessageMagic
 #include <messagesigner.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 bool CMessageSigner::GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CPubKey& pubkeyRet)
 {

src/miner.cpp

@@ -22,8 +22,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 <masternode/masternode-payments.h>
 #include <masternode/masternode-sync.h>
 #include <validationinterface.h>

src/net.cpp

@@ -20,7 +20,7 @@
 #include <netbase.h>
 #include <scheduler.h>
 #include <ui_interface.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <validation.h>
 
 #include <masternode/masternode-meta.h>

src/net.h

@@ -21,7 +21,7 @@
 #include <streams.h>
 #include <sync.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 #include <threadinterrupt.h>
 #include <consensus/params.h>
 

src/net_processing.cpp

@@ -28,9 +28,9 @@
 #include <index/txindex.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

@@ -10,9 +10,9 @@
 #include <hash.h>
 #include <prevector.h>
 #include <tinyformat.h>
-#include <utilasmap.h>
-#include <utilstrencodings.h>
-#include <utilstring.h>
+#include <util/asmap.h>
+#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <algorithm>
 #include <array>

src/netaddress.h

@@ -15,8 +15,8 @@
 #include <serialize.h>
 #include <span.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
-#include <utilstring.h>
+#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <array>
 #include <cstdint>

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>
 #include <cstdint>

src/netfulfilledman.cpp

@@ -5,7 +5,7 @@
 #include <chainparams.h>
 #include <init.h>
 #include <netfulfilledman.h>
-#include <util.h>
+#include <util/system.h>
 
 CNetFulfilledRequestManager netfulfilledman;
 

src/node/coinstats.cpp

@@ -13,7 +13,7 @@
 #include <validation.h>
 #include <uint256.h>
 // #include <util/system.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <map>
 

src/noui.cpp

@@ -7,7 +7,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

@@ -10,8 +10,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

@@ -8,7 +8,7 @@
 #include <hash.h>
 #include <streams.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/appearancewidget.cpp

@@ -11,7 +11,7 @@
 #include <qt/appearancewidget.h>
 #include <qt/optionsmodel.h>
 
-#include <util.h>
+#include <util/system.h>
 
 #include <QComboBox>
 #include <QDataWidgetMapper>

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/bitcoingui.cpp

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

src/qt/clientmodel.cpp

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

src/qt/dash.cpp

@@ -34,7 +34,7 @@
 #include <stacktraces.h>
 #include <ui_interface.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 #include <warnings.h>
 
 #include <walletinitinterface.h>

src/qt/guiutil.cpp

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

src/qt/intro.cpp

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

src/qt/masternodelist.h

@@ -3,7 +3,7 @@
 
 #include <primitives/transaction.h>
 #include <sync.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <QMenu>
 #include <QTimer>

src/qt/networkstyle.cpp

@@ -10,7 +10,7 @@
 
 #include <chainparams.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <QApplication>
 

src/qt/paymentrequestplus.cpp

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

src/qt/paymentserver.cpp

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

src/qt/rpcconsole.cpp

@@ -20,7 +20,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/signverifymessagedialog.cpp

@@ -12,7 +12,7 @@
 
 #include <init.h>
 #include <key_io.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <validation.h> // For strMessageMagic
 
 #include <string>

src/qt/splashscreen.cpp

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

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_dash.h>
 #include <univalue.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <llmq/quorums_init.h>
 

src/qt/test/test_main.cpp

@@ -9,7 +9,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>
 #include <qt/test/trafficgraphdatatests.h>

src/qt/transactiondesc.cpp

@@ -16,7 +16,7 @@
 #include <validation.h>
 #include <script/script.h>
 #include <timedata.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <stdint.h>
 #include <string>

src/qt/transactiontablemodel.cpp

@@ -16,7 +16,7 @@
 #include <validation.h>
 #include <sync.h>
 #include <uint256.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <QColor>
 #include <QDateTime>

src/qt/utilitydialog.cpp

@@ -21,7 +21,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

@@ -16,7 +16,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 <init.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 <validation.h>
 #include <version.h>
 

src/rpc/blockchain.cpp

@@ -23,8 +23,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 <warnings.h>

src/rpc/client.cpp

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

src/rpc/coinjoin.cpp

@@ -10,7 +10,7 @@
 #endif // ENABLE_WALLET
 #include <coinjoin/coinjoin-server.h>
 #include <rpc/server.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <univalue.h>
 

src/rpc/governance.cpp

@@ -16,7 +16,7 @@
 #include <messagesigner.h>
 #include <net.h>
 #include <rpc/server.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <wallet/rpcwallet.h>
 #ifdef ENABLE_WALLET

src/rpc/mining.cpp

@@ -22,8 +22,8 @@
 #include <rpc/mining.h>
 #include <rpc/server.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <validationinterface.h>
 #include <warnings.h>
 

src/rpc/misc.cpp

@@ -19,8 +19,8 @@
 #include <rpc/util.h>
 #include <timedata.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <validation.h>
 #ifdef ENABLE_WALLET
 #include <wallet/rpcwallet.h>

src/rpc/net.cpp

@@ -17,8 +17,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

@@ -8,9 +8,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>
 #ifdef ENABLE_WALLET
 #include <wallet/rpcwallet.h>
 #endif

src/rpc/rpcevo.cpp

@@ -10,7 +10,7 @@
 #include <messagesigner.h>
 #include <rpc/server.h>
 #include <txmempool.h>
-#include <utilmoneystr.h>
+#include <util/moneystr.h>
 #include <validation.h>
 
 #ifdef ENABLE_WALLET

src/rpc/server.cpp

@@ -12,8 +12,8 @@
 #include <random.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>