diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2cde18ecabd69..ea3a66b299090d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -431,7 +431,7 @@ set(UTIL_SOURCES
         ./src/arith_uint256.cpp
         ./src/uint256.cpp
         ./src/util/threadnames.cpp
-        ./src/util.cpp
+        ./src/util/system.cpp
         ./src/utilstrencodings.cpp
         ./src/utilmoneystr.cpp
         ./src/utiltime.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 014891410f8c21..4d95c06df2654d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,7 +284,7 @@ BITCOIN_CORE_H = \
   uint256.h \
   undo.h \
   util/memory.h \
-  util.h \
+  util/system.h \
   util/macros.h \
   util/threadnames.h \
   utilstrencodings.h \
@@ -548,7 +548,7 @@ libbitcoin_util_a_SOURCES = \
   sync.cpp \
   threadinterrupt.cpp \
   uint256.cpp \
-  util.cpp \
+  util/system.cpp \
   utilmoneystr.cpp \
   util/threadnames.cpp \
   utilstrencodings.cpp \
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index cdd67f1f19a316..318bd7e9637405 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -14,7 +14,7 @@
 #include "random.h"
 #include "streams.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 namespace {
 
diff --git a/src/addrman.h b/src/addrman.h
index 87291668654770..b78d391959aa65 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -12,7 +12,7 @@
 #include "random.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <map>
 #include <set>
diff --git a/src/bench/bench_pivx.cpp b/src/bench/bench_pivx.cpp
index 9bf3993397cbb2..aa3ac218b479ec 100644
--- a/src/bench/bench_pivx.cpp
+++ b/src/bench/bench_pivx.cpp
@@ -6,7 +6,7 @@
 #include "bench.h"
 
 #include "key.h"
-#include "util.h"
+#include "util/system.h"
 
 int
 main(int argc, char** argv)
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index 5e1fa93fac5ef4..6a1bfacfdd0167 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "bench.h"
-#include "util.h"
+#include "util/system.h"
 #include "checkqueue.h"
 #include "prevector.h"
 #include "random.h"
diff --git a/src/bip38.cpp b/src/bip38.cpp
index 6a14e235e7d8e5..8767b35bfd4875 100644
--- a/src/bip38.cpp
+++ b/src/bip38.cpp
@@ -6,7 +6,7 @@
 #include "base58.h"
 #include "hash.h"
 #include "pubkey.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "random.h"
 
diff --git a/src/blockassembler.cpp b/src/blockassembler.cpp
index e500ffccc1ce26..c86a6b5e440d08 100644
--- a/src/blockassembler.cpp
+++ b/src/blockassembler.cpp
@@ -21,7 +21,7 @@
 #include "spork.h"
 #include "timedata.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 #include "validationinterface.h"
 
diff --git a/src/chain.h b/src/chain.h
index 4a3e8250a8a2da..fd16e8e5f68c6c 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -18,7 +18,7 @@
 #include "timedata.h"
 #include "tinyformat.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "libzerocoin/Denominations.h"
 
 #include <vector>
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 3b5b98b3dab8f1..849a850c8587cf 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -7,7 +7,7 @@
 #include "chainparamsbase.h"
 
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <assert.h>
 
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index b0fdae28475568..ef28d107065ccc 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -5,7 +5,7 @@
 
 #include "consensus/params.h"
 #include "consensus/upgrades.h"
-#include "util.h"
+#include "util/system.h"
 
 namespace Consensus {
 
diff --git a/src/core_read.cpp b/src/core_read.cpp
index b9a6eef164d065..9509b4015075af 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -10,7 +10,7 @@
 #include "script/script.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "version.h"
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 266e95e0deebe9..041fcc5563cff3 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 
diff --git a/src/crypter.cpp b/src/crypter.cpp
index f0929f74fb538c..83420a3c048647 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -9,7 +9,7 @@
 #include "crypto/sha512.h"
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 #include "init.h"
 #include "uint256.h"
 
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 5ac82fb2dc5fa6..f44b613cf4972d 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -4,7 +4,7 @@
 
 #include "dbwrapper.h"
 
-#include "util.h"
+#include "util/system.h"
 
 #include <leveldb/cache.h>
 #include <leveldb/env.h>
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 3889651a9d71aa..dd0a48c24b28ed 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -9,7 +9,7 @@
 #include "fs.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 
 #include <typeindex>
diff --git a/src/flatfile.cpp b/src/flatfile.cpp
index cc39bc3e77291e..ec136272e7c3da 100644
--- a/src/flatfile.cpp
+++ b/src/flatfile.cpp
@@ -8,7 +8,7 @@
 #include "flatfile.h"
 #include "logging.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 FlatFileSeq::FlatFileSeq(fs::path dir, const char* prefix, size_t chunk_size) :
     m_dir(std::move(dir)),
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 56bf3047c8b403..24db0d4554140c 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -13,7 +13,7 @@
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "guiinterface.h"
 
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 02317dbea12c84..ed88665cfe93f6 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -7,7 +7,7 @@
 
 #include "chainparamsbase.h"
 #include "compat.h"
-#include "util.h"
+#include "util/system.h"
 #include "netbase.h"
 #include "rpc/protocol.h" // For HTTP status codes
 #include "sync.h"
diff --git a/src/init.cpp b/src/init.cpp
index 2140049630dd9c..158c18c73ba63d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -50,7 +50,7 @@
 #include "torcontrol.h"
 #include "guiinterface.h"
 #include "guiinterfaceutil.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "util/threadnames.h"
 #include "validation.h"
diff --git a/src/kernel.cpp b/src/kernel.cpp
index 0b41f9755ab9f1..a764bef3af3157 100644
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -12,7 +12,7 @@
 #include "policy/policy.h"
 #include "script/interpreter.h"
 #include "stakeinput.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "validation.h"
 #include "zpivchain.h"
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 47e8fa5723b2c0..09c3390b17c6c4 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -10,7 +10,7 @@
 #include "key.h"
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 
 
 bool CKeyStore::AddKey(const CKey& key)
diff --git a/src/libzerocoin/Coin.h b/src/libzerocoin/Coin.h
index 290acc12af5fd1..8860d41c48d69a 100644
--- a/src/libzerocoin/Coin.h
+++ b/src/libzerocoin/Coin.h
@@ -17,7 +17,7 @@
 #include "Params.h"
 #include "amount.h"
 #include "bignum.h"
-#include "util.h"
+#include "util/system.h"
 #include "key.h"
 
 namespace libzerocoin
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index b06d8fb741b793..9ae558cfa265dd 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -15,7 +15,7 @@
 #include "net_processing.h"
 #include "spork.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 
 
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index a7352ebaf8033d..7fcec9276c9be1 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -12,7 +12,7 @@
 #include "masternodeman.h"
 #include "netmessagemaker.h"
 #include "spork.h"
-#include "util.h"
+#include "util/system.h"
 #include "addrman.h"
 // clang-format on
 
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 2e566b56c9f88c..a4780d0635c170 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -11,7 +11,7 @@
 #include "masternodeman.h"
 #include "netbase.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "wallet/wallet.h"
 
 #define MASTERNODE_MIN_CONFIRMATIONS_REGTEST 1
diff --git a/src/masternode.h b/src/masternode.h
index 20f0bd1ab9bdd2..048826fb393a32 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 /* Depth of the block pinged by masternodes */
 static const unsigned int MNPING_DEPTH = 12;
diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp
index 265e4b91a52180..8e156b21a51214 100644
--- a/src/masternodeconfig.cpp
+++ b/src/masternodeconfig.cpp
@@ -6,7 +6,7 @@
 
 #include "fs.h"
 #include "netbase.h"
-#include "util.h"
+#include "util/system.h"
 #include "guiinterface.h"
 #include <base58.h>
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index c4e52e57e5849c..fd38d3e3873a5d 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -16,7 +16,7 @@
 #include "netmessagemaker.h"
 #include "net_processing.h"
 #include "spork.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/thread/thread.hpp>
 
diff --git a/src/masternodeman.h b/src/masternodeman.h
index e675ad0f6684a3..1859304df0ee44 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -13,7 +13,7 @@
 #include "masternode.h"
 #include "net.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 
 #define MASTERNODES_DUMP_SECONDS (15 * 60)
 #define MASTERNODES_DSEG_SECONDS (3 * 60 * 60)
diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp
index 386f47c868853d..46df3e55b82410 100644
--- a/src/messagesigner.cpp
+++ b/src/messagesigner.cpp
@@ -7,7 +7,7 @@
 #include "hash.h"
 #include "messagesigner.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 const std::string strMessageMagic = "DarkNet Signed Message:\n";
diff --git a/src/miner.cpp b/src/miner.cpp
index 3d87d2688ef95a..eea1d806826dad 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -20,7 +20,7 @@
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 442260e58a813e..12123fd47f13ea 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -14,7 +14,7 @@
 #include "sync.h"
 #include "uint256.h"
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #include <atomic>
diff --git a/src/noui.cpp b/src/noui.cpp
index 147d61cdb81ebe..20b280ae8ecfc0 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -8,7 +8,7 @@
 #include "noui.h"
 
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <cstdio>
 #include <stdint.h>
diff --git a/src/pivx-cli.cpp b/src/pivx-cli.cpp
index f98fcb1f619be1..9775106c6d2e55 100644
--- a/src/pivx-cli.cpp
+++ b/src/pivx-cli.cpp
@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #include <stdio.h>
diff --git a/src/pivx-tx.cpp b/src/pivx-tx.cpp
index 94259d7bfdc872..1621aff68ecf45 100644
--- a/src/pivx-tx.cpp
+++ b/src/pivx-tx.cpp
@@ -14,7 +14,7 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include <univalue.h>
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 
diff --git a/src/pivxd.cpp b/src/pivxd.cpp
index bcde06ae07e09f..ad02677ccc8fa6 100644
--- a/src/pivxd.cpp
+++ b/src/pivxd.cpp
@@ -12,7 +12,7 @@
 #include "masternodeconfig.h"
 #include "noui.h"
 #include "rpc/server.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdio.h>
 
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 93f789175260aa..3e2c169c99c9e3 100644
--- a/src/policy/fees.cpp
+++ b/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"
 
 void TxConfirmStats::Initialize(std::vector<double>& defaultBuckets,
                                 unsigned int maxConfirms, double _decay)
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 41f61031449b92..deae2082bead19 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -9,7 +9,7 @@
 
 #include "consensus/tx_verify.h" // for IsFinal()
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "validation.h"
 
diff --git a/src/pow.cpp b/src/pow.cpp
index 384cb742957ccb..6b41d9796956e3 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -11,7 +11,7 @@
 #include "chainparams.h"
 #include "primitives/block.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <math.h>
 
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 84c32be40eae36..e0b7fd2d618cc9 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -11,7 +11,7 @@
 #include "script/sign.h"
 #include "tinyformat.h"
 #include "utilstrencodings.h"
-#include "util.h"
+#include "util/system.h"
 
 uint256 CBlockHeader::GetHash() const
 {
diff --git a/src/protocol.cpp b/src/protocol.cpp
index ea570180ff1b3b..f40fc79aed7ed2 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -7,7 +7,7 @@
 
 #include "protocol.h"
 
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #ifndef WIN32
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 136faffd829ee1..51096dcabaa4a2 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -19,7 +19,7 @@
 #include "net.h"
 #include "netbase.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "warnings.h"
 
 #include <stdint.h>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index eba0957f3dd98b..c258cfb80aa49e 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -17,7 +17,7 @@
 #include "protocol.h"
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 
 #ifdef WIN32
 #ifdef _WIN32_WINNT
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 1ed9cf7985989a..28f8a1e99fdef5 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "guiutil.h"
 
-#include "util.h"
+#include "util/system.h"
 #include "qt/pivx/qtutils.h"
 
 #include <QFileDialog>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 09c1a585bd8067..7f4d39da2702d9 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -18,7 +18,7 @@
 #include "net.h"
 #include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
-#include "util.h"
+#include "util/system.h"
 
 #ifdef ENABLE_WALLET
 #include "masternodeconfig.h"
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index f8265c4fd02769..a9554e7c5b30a0 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -14,7 +14,7 @@
 #include "base58.h"
 #include "chainparams.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "wallet/wallet.h"
 
 #include <cstdlib>
diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp
index d0b9a4d76c68e5..b96eddba420839 100644
--- a/src/qt/pivx.cpp
+++ b/src/qt/pivx.cpp
@@ -33,7 +33,7 @@
 #include "init.h"
 #include "rpc/server.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "warnings.h"
 
 #ifdef ENABLE_WALLET
diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp
index 722ade7abd02bc..f9b32472259c56 100644
--- a/src/qt/pivx/masternodeswidget.cpp
+++ b/src/qt/pivx/masternodeswidget.cpp
@@ -21,7 +21,7 @@
 #include "sync.h"
 #include "wallet/wallet.h"
 #include "askpassphrasedialog.h"
-#include "util.h"
+#include "util/system.h"
 #include "qt/pivx/optionbutton.h"
 #include <iostream>
 #include <fstream>
diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivx/pivxgui.cpp
index 9bf9f44563a4a0..153619b5606e66 100644
--- a/src/qt/pivx/pivxgui.cpp
+++ b/src/qt/pivx/pivxgui.cpp
@@ -19,7 +19,7 @@
 #include "qt/pivx/defaultdialog.h"
 
 #include "init.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <QApplication>
 #include <QColor>
diff --git a/src/qt/pivx/settings/settingsconsolewidget.cpp b/src/qt/pivx/settings/settingsconsolewidget.cpp
index 26df0358f778d7..b457a27bc4c5ce 100644
--- a/src/qt/pivx/settings/settingsconsolewidget.cpp
+++ b/src/qt/pivx/settings/settingsconsolewidget.cpp
@@ -13,7 +13,7 @@
 
 #include "chainparams.h"
 #include "sapling/key_io_sapling.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilitydialog.h"
 
 #ifdef ENABLE_WALLET
diff --git a/src/qt/pivx/settings/settingsinformationwidget.cpp b/src/qt/pivx/settings/settingsinformationwidget.cpp
index 2294a3ddbf0d53..39fbf03ad7b1db 100644
--- a/src/qt/pivx/settings/settingsinformationwidget.cpp
+++ b/src/qt/pivx/settings/settingsinformationwidget.cpp
@@ -8,7 +8,7 @@
 #include "clientmodel.h"
 #include "chainparams.h"
 #include "db.h"
-#include "util.h"
+#include "util/system.h"
 #include "guiutil.h"
 #include "qt/pivx/qtutils.h"
 
diff --git a/src/qt/pivx/splash.cpp b/src/qt/pivx/splash.cpp
index 149f72ff4fee72..fa07fe39311799 100644
--- a/src/qt/pivx/splash.cpp
+++ b/src/qt/pivx/splash.cpp
@@ -10,7 +10,7 @@
 #include "init.h"
 #include "guiinterface.h"
 #include "networkstyle.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 #include "guiutil.h"
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index ac64e526d96b4e..10da3b125dc4a3 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -15,7 +15,7 @@
 
 #include "chainparams.h"
 #include "netbase.h"
-#include "util.h"
+#include "util/system.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #endif // ENABLE_WALLET
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index 5a23c4e9a394ad..085aac9aff3385 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -8,7 +8,7 @@
 #include "config/pivx-config.h"
 #endif
 
-#include "util.h"
+#include "util/system.h"
 #include "uritests.h"
 
 #include <QCoreApplication>
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index da2aaa375ede02..1cea8e4f236ecb 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -16,7 +16,7 @@
 #include "interfaces/handler.h"
 #include "sync.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "wallet/wallet.h"
 
 #include <algorithm>
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 089a58e5c8ea9b..6eea16dd421beb 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -15,7 +15,7 @@
 #include "intro.h"
 #include "guiutil.h"
 #include "qt/pivx/qtutils.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdio.h>
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 395cbc6e79eccc..a3d8d975e68a5a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -18,7 +18,7 @@
 #include "rpc/server.h"
 #include "sync.h"
 #include "txdb.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 #include "hash.h"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index f0d2aebf286a37..965771df31b730 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -14,7 +14,7 @@
 #include "net.h"
 #include "pow.h"
 #include "rpc/server.h"
-#include "util.h"
+#include "util/system.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
 #include "wallet/db.h"
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 794b7fb4fd63c8..7ae80a8d023531 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -16,7 +16,7 @@
 #include "rpc/server.h"
 #include "spork.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 110fae71487066..66fc589ac83f8a 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -14,7 +14,7 @@
 #include "sync.h"
 #include "timedata.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 #include "validation.h"
 
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index 6e4fe2ca930c4c..a493397768e6bc 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -9,7 +9,7 @@
 
 #include "random.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "utiltime.h"
 #include "version.h"
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 482b317d8b324b..7031123e07f389 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -13,7 +13,7 @@
 #include "random.h"
 #include "sync.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #ifdef ENABLE_WALLET
diff --git a/src/sapling/crypter_sapling.cpp b/src/sapling/crypter_sapling.cpp
index b2adb669adfe8e..e1d2bfbcdf0f3a 100644
--- a/src/sapling/crypter_sapling.cpp
+++ b/src/sapling/crypter_sapling.cpp
@@ -7,7 +7,7 @@
 
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 #include "uint256.h"
 
 #include <openssl/aes.h>
diff --git a/src/sapling/sapling_validation.cpp b/src/sapling/sapling_validation.cpp
index e2ac6f248c9901..838ad45d400f0b 100644
--- a/src/sapling/sapling_validation.cpp
+++ b/src/sapling/sapling_validation.cpp
@@ -8,7 +8,7 @@
 #include "consensus/consensus.h" // for MAX_BLOCK_SIZE_CURRENT
 #include "script/interpreter.h" // for SigHash
 #include "consensus/validation.h" // for CValidationState
-#include "util.h" // for error()
+#include "util/system.h" // for error()
 #include "consensus/upgrades.h" // for CurrentEpochBranchId()
 
 #include <librustzcash.h>
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index e9312b4cf5e4fe..7394e7879a0cad 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -11,7 +11,7 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 
 
 
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index 37e0998da63c53..c5198131354eeb 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -11,7 +11,7 @@
 #include "pubkey.h"
 #include "random.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/thread/thread.hpp>
 
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 7a34a872207b0d..12878f4fb88560 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -12,7 +12,7 @@
 #include "primitives/transaction.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 typedef std::vector<unsigned char> valtype;
 
diff --git a/src/spork.h b/src/spork.h
index 89d18955e3f60c..814261e6daa20e 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -13,7 +13,7 @@
 #include "net.h"
 #include "sporkid.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "protocol.h"
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 349af79763f220..36146b6b47d812 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -17,7 +17,7 @@
 #include "pow.h"
 #include "script/sign.h"
 #include "serialize.h"
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 
 #include <stdint.h>
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index 2a35d3b00bfc6a..3d478c10beadaf 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -8,7 +8,7 @@
 //
 
 #include "chainparams.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 9976268ce9c2f6..c22e21ad92b012 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 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/zeroafterfree.h"
 #include "test/test_pivx.h"
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 5e907e58ba3bf9..11b50bbe9f5dc4 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -12,7 +12,7 @@
 #include "key.h"
 #include "script/script.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "test/test_pivx.h"
 
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 9b99d10fca7c4d..63dba3864b0f6c 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "streams.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "test/test_pivx.h"
 
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index 7dac65943ea6c2..c0bcbb7ba67bb7 100644
--- a/src/test/compress_tests.cpp
+++ b/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_pivx.h"
 
 #include <stdint.h>
diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp
index 1bc35d541a84c3..8d0eeb1b604464 100644
--- a/src/test/getarg_tests.cpp
+++ b/src/test/getarg_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT/X11 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_pivx.h"
 
 #include <string>
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index 7cf278d01af2c2..e33de3fe0f5b2b 100644
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -8,7 +8,7 @@
 #include "base58.h"
 #include "script/script.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "test_pivx.h"
 
diff --git a/src/test/librust/wallet_zkeys_tests.cpp b/src/test/librust/wallet_zkeys_tests.cpp
index 2093c9877551f0..cb06c2efbfa8de 100644
--- a/src/test/librust/wallet_zkeys_tests.cpp
+++ b/src/test/librust/wallet_zkeys_tests.cpp
@@ -9,7 +9,7 @@
 #include "sapling/address.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
-#include "util.h"
+#include "util/system.h"
 #include <boost/test/unit_test.hpp>
 
 /**
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 0ca5a76ae982eb..da62536d506f91 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -6,7 +6,7 @@
 
 #include "policy/feerate.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index a0924ad7d14325..317d3d3b1c29d7 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -11,7 +11,7 @@
 #include "miner.h"
 #include "pubkey.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 #include "wallet/wallet.h"
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 9e9e5765598541..91f672d52d8143 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -6,7 +6,7 @@
 #include "policy/fees.h"
 #include "txmempool.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_pivx.h"
 
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 042c2316cfedfe..9a5cb364098f6f 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -8,7 +8,7 @@
 
 #include "base58.h"
 #include "netbase.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_pivx.h"
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 79ebc1aaad1a62..458cc4439fa574 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -11,7 +11,7 @@
 #include "serialize.h"
 #include "script/script.h"
 #include "script/interpreter.h"
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 #include "version.h"
 
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index 17ff327de6834e..e8385f1e2b0dfd 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -5,7 +5,7 @@
 
 #include "test/test_pivx.h"
 
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 
 #include <vector>
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index c5774015c720a1..a66a1ffa728589 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "util.h"
+#include "util/system.h"
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 4963fbdeaac68c..e29cfcad0c966a 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -9,7 +9,7 @@
 #include "guiinterface.h"
 #include "netaddress.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "warnings.h"
 
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index c0439091852cc5..38bbe9b38df887 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -10,7 +10,7 @@
 #include "utilstrencodings.h"
 #include "netbase.h"
 #include "net.h"
-#include "util.h"
+#include "util/system.h"
 #include "crypto/hmac_sha256.h"
 
 #include <vector>
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 4862fcbf941220..42c45ffcc3dd20 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -9,7 +9,7 @@
 #include "random.h"
 #include "pow.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "zpiv/zerocoin.h"
 
 #include <stdint.h>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 42c8ff5bb93f25..e279bb679c61f6 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -14,7 +14,7 @@
 #include "reverse_iterate.h"
 #include "streams.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utiltime.h"
 #include "version.h"
diff --git a/src/util.cpp b/src/util/system.cpp
similarity index 99%
rename from src/util.cpp
rename to src/util/system.cpp
index cb8e7092e29ef7..bc7085985c4577 100644
--- a/src/util.cpp
+++ b/src/util/system.cpp
@@ -9,7 +9,7 @@
 #include "config/pivx-config.h"
 #endif
 
-#include "util.h"
+#include "util/system.h"
 
 #include "chainparamsbase.h"
 #include "random.h"
diff --git a/src/util.h b/src/util/system.h
similarity index 98%
rename from src/util.h
rename to src/util/system.h
index 99839c2845a978..8837ee8784bf53 100644
--- a/src/util.h
+++ b/src/util/system.h
@@ -9,8 +9,8 @@
  * Server/client environment: argument handling, config file parsing,
  * thread wrappers
  */
-#ifndef BITCOIN_UTIL_H
-#define BITCOIN_UTIL_H
+#ifndef BITCOIN_UTIL_SYSTEM_H
+#define BITCOIN_UTIL_SYSTEM_H
 
 #if defined(HAVE_CONFIG_H)
 #include "config/pivx-config.h"
@@ -293,4 +293,4 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific = true);
  */
 int ScheduleBatchPriority(void);
 
-#endif // BITCOIN_UTIL_H
+#endif // BITCOIN_UTIL_SYSTEM_H
diff --git a/src/validation.cpp b/src/validation.cpp
index 7ba97ddc4b61c2..1d843187299b49 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -45,7 +45,7 @@
 #include "txdb.h"
 #include "txmempool.h"
 #include "undo.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "validationinterface.h"
 #include "warnings.h"
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 94b85583c13944..7ea9dfbab1e86d 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -10,7 +10,7 @@
 #include "guiinterfaceutil.h"
 #include "hash.h"
 #include "protocol.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #include <stdint.h>
diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
index 29e37b4fb69ef8..642fb8217e9ae3 100644
--- a/src/wallet/hdchain.cpp
+++ b/src/wallet/hdchain.cpp
@@ -7,7 +7,7 @@
 #include "base58.h"
 #include "chainparams.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 bool CHDChain::SetNull()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index d2af3d405655d5..f476efde8d2475 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -12,7 +12,7 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "utiltime.h"
 #include "wallet/wallet.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e75e86d209390b..43ccaf5ff13f4e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -18,7 +18,7 @@
 #include "policy/feerate.h"
 #include "rpc/server.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "wallet.h"
 #include "walletdb.h"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ef529162553b2d..c00b6f23fa8ed4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -18,7 +18,7 @@
 #include "script/sign.h"
 #include "scheduler.h"
 #include "spork.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "zpivchain.h"
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 27c225ad9ea0ed..ae19ef76ac389a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -24,7 +24,7 @@
 #include "primitives/transaction.h"
 #include "sapling/address.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/memory.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index dda03280b919b4..0e7b50007caf0f 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -15,7 +15,7 @@
 #include "sapling/key_io_sapling.h"
 #include "serialize.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utiltime.h"
 #include "wallet/wallet.h"
 
diff --git a/src/warnings.cpp b/src/warnings.cpp
index 9be652d5c53cea..a7b607a48e4460 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -7,7 +7,7 @@
 
 #include "sync.h"
 #include "clientversion.h"
-#include "util.h"
+#include "util/system.h"
 
 RecursiveMutex cs_warnings;
 std::string strMiscWarning;
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
index 53dac44aebc850..d39d0be0fd7d5c 100644
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "zmqabstractnotifier.h"
-#include "util.h"
+#include "util/system.h"
 
 
 CZMQAbstractNotifier::~CZMQAbstractNotifier()
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 110e2df44ba430..18dfe917bbe90f 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -7,7 +7,7 @@
 
 #include "version.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 
 void zmqError(const char *str)
 {
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index ee08858fe18e87..67998ee27f9600 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -5,7 +5,7 @@
 #include "zmqpublishnotifier.h"
 
 #include "chainparams.h"
-#include "util.h"
+#include "util/system.h"
 #include "crypto/common.h"
 #include "validation.h"     // cs_main
 
diff --git a/src/zpiv/mintpool.cpp b/src/zpiv/mintpool.cpp
index 775f056919dc31..16c8f39b60518c 100644
--- a/src/zpiv/mintpool.cpp
+++ b/src/zpiv/mintpool.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "mintpool.h"
-#include "util.h"
+#include "util/system.h"
 
 
 CMintPool::CMintPool()