diff --git a/src/addrdb.h b/src/addrdb.h
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -6,8 +6,8 @@
 #ifndef BITCOIN_ADDRDB_H
 #define BITCOIN_ADDRDB_H
 
-#include "fs.h"
-#include "serialize.h"
+#include <fs.h>
+#include <serialize.h>
 
 #include <map>
 #include <string>
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -3,17 +3,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "addrdb.h"
-
-#include "addrman.h"
-#include "chainparams.h"
-#include "clientversion.h"
-#include "fs.h"
-#include "hash.h"
-#include "random.h"
-#include "streams.h"
-#include "tinyformat.h"
-#include "util.h"
+#include <addrdb.h>
+
+#include <addrman.h>
+#include <chainparams.h>
+#include <clientversion.h>
+#include <fs.h>
+#include <hash.h>
+#include <random.h>
+#include <streams.h>
+#include <tinyformat.h>
+#include <util.h>
 
 CBanDB::CBanDB(const CChainParams &chainParamsIn) : chainParams(chainParamsIn) {
     pathBanlist = GetDataDir() / "banlist.dat";
diff --git a/src/addrman.h b/src/addrman.h
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -6,12 +6,12 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include "netaddress.h"
-#include "protocol.h"
-#include "random.h"
-#include "sync.h"
-#include "timedata.h"
-#include "util.h"
+#include <netaddress.h>
+#include <protocol.h>
+#include <random.h>
+#include <sync.h>
+#include <timedata.h>
+#include <util.h>
 
 #include <cstdint>
 #include <map>
diff --git a/src/addrman.cpp b/src/addrman.cpp
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -3,11 +3,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "addrman.h"
+#include <addrman.h>
 
-#include "hash.h"
-#include "serialize.h"
-#include "streams.h"
+#include <hash.h>
+#include <serialize.h>
+#include <streams.h>
 
 #include <cmath>
 
diff --git a/src/amount.h b/src/amount.h
--- a/src/amount.h
+++ b/src/amount.h
@@ -7,7 +7,7 @@
 #ifndef BITCOIN_AMOUNT_H
 #define BITCOIN_AMOUNT_H
 
-#include "serialize.h"
+#include <serialize.h>
 
 #include <cstdlib>
 #include <ostream>
diff --git a/src/amount.cpp b/src/amount.cpp
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -4,9 +4,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "amount.h"
+#include <amount.h>
 
-#include "tinyformat.h"
+#include <tinyformat.h>
 
 const std::string CURRENCY_UNIT = "BCH";
 
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -3,11 +3,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "arith_uint256.h"
+#include <arith_uint256.h>
 
-#include "crypto/common.h"
-#include "uint256.h"
-#include "utilstrencodings.h"
+#include <crypto/common.h>
+#include <uint256.h>
+#include <utilstrencodings.h>
 
 #include <cstdio>
 #include <cstring>
diff --git a/src/avalanche.h b/src/avalanche.h
--- a/src/avalanche.h
+++ b/src/avalanche.h
@@ -5,12 +5,12 @@
 #ifndef BITCOIN_AVALANCHE_H
 #define BITCOIN_AVALANCHE_H
 
-#include "blockindexworkcomparator.h"
-#include "net.h"
-#include "protocol.h" // for CInv
-#include "rwcollection.h"
-#include "serialize.h"
-#include "uint256.h"
+#include <blockindexworkcomparator.h>
+#include <net.h>
+#include <protocol.h> // for CInv
+#include <rwcollection.h>
+#include <serialize.h>
+#include <uint256.h>
 
 #include <boost/multi_index/composite_key.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/src/avalanche.cpp b/src/avalanche.cpp
--- a/src/avalanche.cpp
+++ b/src/avalanche.cpp
@@ -2,14 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "avalanche.h"
-
-#include "chain.h"
-#include "config/bitcoin-config.h"
-#include "netmessagemaker.h"
-#include "reverse_iterator.h"
-#include "scheduler.h"
-#include "validation.h"
+#include <avalanche.h>
+
+#include <chain.h>
+#include <config/bitcoin-config.h>
+#include <netmessagemaker.h>
+#include <reverse_iterator.h>
+#include <scheduler.h>
+#include <validation.h>
 
 #include <tuple>
 
diff --git a/src/base58.h b/src/base58.h
--- a/src/base58.h
+++ b/src/base58.h
@@ -16,11 +16,11 @@
 #ifndef BITCOIN_BASE58_H
 #define BITCOIN_BASE58_H
 
-#include "chainparams.h"
-#include "key.h"
-#include "pubkey.h"
-#include "script/standard.h"
-#include "support/allocators/zeroafterfree.h"
+#include <chainparams.h>
+#include <key.h>
+#include <pubkey.h>
+#include <script/standard.h>
+#include <support/allocators/zeroafterfree.h>
 
 #include <string>
 #include <vector>
diff --git a/src/base58.cpp b/src/base58.cpp
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -2,15 +2,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "base58.h"
+#include <base58.h>
 
-#include "hash.h"
-#include "script/script.h"
-#include "uint256.h"
-#include "utilstrencodings.h"
+#include <hash.h>
+#include <script/script.h>
+#include <uint256.h>
+#include <utilstrencodings.h>
 
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
+
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -4,26 +4,27 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
+#include <config/bitcoin-config.h>
 #endif
 
-#include "chainparamsbase.h"
-#include "clientversion.h"
-#include "fs.h"
-#include "rpc/client.h"
-#include "rpc/protocol.h"
-#include "support/events.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include <chainparamsbase.h>
+#include <clientversion.h>
+#include <fs.h>
+#include <rpc/client.h>
+#include <rpc/protocol.h>
+#include <support/events.h>
+#include <util.h>
+#include <utilstrencodings.h>
 
 #include <boost/filesystem/operations.hpp>
-#include <cstdio>
 
 #include <event2/buffer.h>
 #include <event2/keyvalq_struct.h>
 
 #include <univalue.h>
 
+#include <cstdio>
+
 static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
 static const int DEFAULT_HTTP_CLIENT_TIMEOUT = 900;
 static const bool DEFAULT_NAMED = false;
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -3,30 +3,31 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
+#include <config/bitcoin-config.h>
 #endif
 
-#include "base58.h"
-#include "chainparams.h"
-#include "clientversion.h"
-#include "coins.h"
-#include "consensus/consensus.h"
-#include "core_io.h"
-#include "dstencode.h"
-#include "keystore.h"
-#include "policy/policy.h"
-#include "primitives/transaction.h"
-#include "script/script.h"
-#include "script/sign.h"
-#include "univalue.h"
-#include "util.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
-
-#include <cstdio>
+#include <base58.h>
+#include <chainparams.h>
+#include <clientversion.h>
+#include <coins.h>
+#include <consensus/consensus.h>
+#include <core_io.h>
+#include <dstencode.h>
+#include <keystore.h>
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <script/sign.h>
+#include <util.h>
+#include <utilmoneystr.h>
+#include <utilstrencodings.h>
 
 #include <boost/algorithm/string.hpp>
 
+#include <univalue.h>
+
+#include <cstdio>
+
 static bool fCreateBlank;
 static std::map<std::string, UniValue> registers;
 static const int CONTINUE_EXECUTION = -1;
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -4,22 +4,22 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
+#include <config/bitcoin-config.h>
 #endif
 
-#include "chainparams.h"
-#include "clientversion.h"
-#include "compat.h"
-#include "config.h"
-#include "fs.h"
-#include "httprpc.h"
-#include "httpserver.h"
-#include "init.h"
-#include "noui.h"
-#include "rpc/server.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "walletinitinterface.h"
+#include <chainparams.h>
+#include <clientversion.h>
+#include <compat.h>
+#include <config.h>
+#include <fs.h>
+#include <httprpc.h>
+#include <httpserver.h>
+#include <init.h>
+#include <noui.h>
+#include <rpc/server.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <walletinitinterface.h>
 
 #include <boost/thread.hpp>
 
diff --git a/src/blockencodings.h b/src/blockencodings.h
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_BLOCK_ENCODINGS_H
 #define BITCOIN_BLOCK_ENCODINGS_H
 
-#include "primitives/block.h"
+#include <primitives/block.h>
 
 #include <memory>
 
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -2,17 +2,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "blockencodings.h"
-#include "chainparams.h"
-#include "config.h"
-#include "consensus/consensus.h"
-#include "consensus/validation.h"
-#include "hash.h"
-#include "random.h"
-#include "streams.h"
-#include "txmempool.h"
-#include "util.h"
-#include "validation.h"
+#include <blockencodings.h>
+
+#include <chainparams.h>
+#include <config.h>
+#include <consensus/consensus.h>
+#include <consensus/validation.h>
+#include <hash.h>
+#include <random.h>
+#include <streams.h>
+#include <txmempool.h>
+#include <util.h>
+#include <validation.h>
 
 #include <unordered_map>
 
diff --git a/src/blockfileinfo.h b/src/blockfileinfo.h
--- a/src/blockfileinfo.h
+++ b/src/blockfileinfo.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_BLOCKFILEINFO_H
 #define BITCOIN_BLOCKFILEINFO_H
 
-#include "serialize.h"
+#include <serialize.h>
 
 #include <cstdint>
 #include <string>
diff --git a/src/blockindexworkcomparator.h b/src/blockindexworkcomparator.h
--- a/src/blockindexworkcomparator.h
+++ b/src/blockindexworkcomparator.h
@@ -6,7 +6,7 @@
 #define BITCOIN_BLOCK_INDEX_WORK_COMPARATOR_H
 
 // TODO: Split chain.h apart and only include CBlockIndex
-#include "chain.h"
+#include <chain.h>
 
 struct CBlockIndexWorkComparator {
     bool operator()(const CBlockIndex *pa, const CBlockIndex *pb) const {
diff --git a/src/blockstatus.h b/src/blockstatus.h
--- a/src/blockstatus.h
+++ b/src/blockstatus.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_BLOCKSTATUS_H
 #define BITCOIN_BLOCKSTATUS_H
 
-#include "blockvalidity.h"
-#include "serialize.h"
+#include <blockvalidity.h>
+#include <serialize.h>
 
 #include <cstdint>
 
diff --git a/src/bloom.cpp b/src/bloom.cpp
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -2,14 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "bloom.h"
-
-#include "hash.h"
-#include "primitives/transaction.h"
-#include "random.h"
-#include "script/script.h"
-#include "script/standard.h"
-#include "streams.h"
+#include <bloom.h>
+
+#include <hash.h>
+#include <primitives/transaction.h>
+#include <random.h>
+#include <script/script.h>
+#include <script/standard.h>
+#include <streams.h>
 
 #include <cmath>
 #include <cstdlib>