diff --git a/src/random.h b/src/random.h
--- a/src/random.h
+++ b/src/random.h
@@ -6,9 +6,9 @@
 #ifndef BITCOIN_RANDOM_H
 #define BITCOIN_RANDOM_H
 
-#include "crypto/chacha20.h"
-#include "crypto/common.h"
-#include "uint256.h"
+#include <crypto/chacha20.h>
+#include <crypto/common.h>
+#include <uint256.h>
 
 #include <cstdint>
 
diff --git a/src/random.cpp b/src/random.cpp
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -3,23 +3,26 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "random.h"
+#include <random.h>
 
-#include "crypto/sha512.h"
-#include "support/cleanse.h"
 #ifdef WIN32
-#include "compat.h" // for Windows API
+#include <compat.h> // for Windows API
 #include <wincrypt.h>
 #endif
-#include "logging.h"  // for LogPrint()
-#include "sync.h"     // for WAIT_LOCK
-#include "utiltime.h" // for GetTime()
+#include <crypto/sha512.h>
+#include <logging.h> // for LogPrint()
+#include <support/cleanse.h>
+#include <sync.h>     // for WAIT_LOCK
+#include <utiltime.h> // for GetTime()
+
+#include <openssl/err.h>
+#include <openssl/rand.h>
 
 #include <chrono>
 #include <cstdlib>
 #include <limits>
+#include <mutex>
 #include <thread>
-
 #ifndef WIN32
 #include <fcntl.h>
 #include <sys/time.h>
@@ -41,15 +44,10 @@
 #include <utilstrencodings.h> // for ARRAYLEN
 #endif
 
-#include <mutex>
-
 #if defined(__x86_64__) || defined(__amd64__) || defined(__i386__)
 #include <cpuid.h>
 #endif
 
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
 [[noreturn]] static void RandFailure() {
     LogPrintf("Failed to read randomness, aborting\n");
     std::abort();
diff --git a/src/rcu.cpp b/src/rcu.cpp
--- a/src/rcu.cpp
+++ b/src/rcu.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rcu.h"
-#include "sync.h"
+#include <rcu.h>
+
+#include <sync.h>
 
 #include <algorithm>
 #include <chrono>
diff --git a/src/rest.cpp b/src/rest.cpp
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -3,22 +3,22 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "chain.h"
-#include "chainparams.h"
-#include "config.h"
-#include "core_io.h"
-#include "httpserver.h"
-#include "primitives/block.h"
-#include "primitives/transaction.h"
-#include "rpc/blockchain.h"
-#include "rpc/server.h"
-#include "rpc/tojson.h"
-#include "streams.h"
-#include "sync.h"
-#include "txmempool.h"
-#include "utilstrencodings.h"
-#include "validation.h"
-#include "version.h"
+#include <chain.h>
+#include <chainparams.h>
+#include <config.h>
+#include <core_io.h>
+#include <httpserver.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <rpc/blockchain.h>
+#include <rpc/server.h>
+#include <rpc/tojson.h>
+#include <streams.h>
+#include <sync.h>
+#include <txmempool.h>
+#include <utilstrencodings.h>
+#include <validation.h>
+#include <version.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/scheduler.h b/src/scheduler.h
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_SCHEDULER_H
 #define BITCOIN_SCHEDULER_H
 
-#include "sync.h"
+#include <sync.h>
 
 //
 // NOTE:
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -2,12 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "scheduler.h"
+#include <scheduler.h>
 
-#include "random.h"
-#include "reverselock.h"
+#include <random.h>
+#include <reverselock.h>
 
 #include <boost/bind.hpp>
+
 #include <cassert>
 #include <utility>
 
diff --git a/src/serialize.h b/src/serialize.h
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -6,7 +6,8 @@
 #ifndef BITCOIN_SERIALIZE_H
 #define BITCOIN_SERIALIZE_H
 
-#include "compat/endian.h"
+#include <compat/endian.h>
+#include <prevector.h>
 
 #include <algorithm>
 #include <cassert>
@@ -21,8 +22,6 @@
 #include <utility>
 #include <vector>
 
-#include "prevector.h"
-
 static const uint64_t MAX_SIZE = 0x02000000;
 
 /**
diff --git a/src/streams.h b/src/streams.h
--- a/src/streams.h
+++ b/src/streams.h
@@ -6,8 +6,8 @@
 #ifndef BITCOIN_STREAMS_H
 #define BITCOIN_STREAMS_H
 
-#include "serialize.h"
-#include "support/allocators/zeroafterfree.h"
+#include <serialize.h>
+#include <support/allocators/zeroafterfree.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/sync.h b/src/sync.h
--- a/src/sync.h
+++ b/src/sync.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_SYNC_H
 #define BITCOIN_SYNC_H
 
-#include "threadsafety.h"
+#include <threadsafety.h>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/src/sync.cpp b/src/sync.cpp
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sync.h"
+#include <sync.h>
 
-#include "logging.h"
-#include "utilstrencodings.h"
+#include <logging.h>
+#include <utilstrencodings.h>
 
 #include <cstdio>
 #include <map>
diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp
--- a/src/threadinterrupt.cpp
+++ b/src/threadinterrupt.cpp
@@ -3,9 +3,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "threadinterrupt.h"
+#include <threadinterrupt.h>
 
-#include "sync.h"
+#include <sync.h>
 
 CThreadInterrupt::operator bool() const {
     return flag.load(std::memory_order_acquire);
diff --git a/src/timedata.cpp b/src/timedata.cpp
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -3,17 +3,17 @@
 // 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 "timedata.h"
+#include <timedata.h>
 
-#include "netaddress.h"
-#include "sync.h"
-#include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "warnings.h"
+#include <netaddress.h>
+#include <sync.h>
+#include <ui_interface.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <warnings.h>
 
 static CCriticalSection cs_nTimeOffset;
 static int64_t nTimeOffset = 0;
diff --git a/src/torcontrol.h b/src/torcontrol.h
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -8,7 +8,7 @@
 #ifndef BITCOIN_TORCONTROL_H
 #define BITCOIN_TORCONTROL_H
 
-#include "scheduler.h"
+#include <scheduler.h>
 
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -2,17 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "torcontrol.h"
-#include "crypto/hmac_sha256.h"
-#include "net.h"
-#include "netbase.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include <torcontrol.h>
 
-#include <cstdlib>
-#include <deque>
-#include <set>
-#include <vector>
+#include <crypto/hmac_sha256.h>
+#include <net.h>
+#include <netbase.h>
+#include <util.h>
+#include <utilstrencodings.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -27,6 +23,11 @@
 #include <event2/thread.h>
 #include <event2/util.h>
 
+#include <cstdlib>
+#include <deque>
+#include <set>
+#include <vector>
+
 /** Default control port */
 const std::string DEFAULT_TOR_CONTROL = "127.0.0.1:9051";
 /** Tor cookie size (from control-spec.txt) */
diff --git a/src/txdb.h b/src/txdb.h
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -6,11 +6,11 @@
 #ifndef BITCOIN_TXDB_H
 #define BITCOIN_TXDB_H
 
-#include "blockfileinfo.h"
-#include "chain.h"
-#include "coins.h"
-#include "dbwrapper.h"
-#include "diskblockpos.h"
+#include <blockfileinfo.h>
+#include <chain.h>
+#include <coins.h>
+#include <dbwrapper.h>
+#include <diskblockpos.h>
 
 #include <map>
 #include <string>
diff --git a/src/txdb.cpp b/src/txdb.cpp
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -3,16 +3,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "txdb.h"
-
-#include "chainparams.h"
-#include "hash.h"
-#include "init.h"
-#include "pow.h"
-#include "random.h"
-#include "ui_interface.h"
-#include "uint256.h"
-#include "util.h"
+#include <txdb.h>
+
+#include <chainparams.h>
+#include <hash.h>
+#include <init.h>
+#include <pow.h>
+#include <random.h>
+#include <ui_interface.h>
+#include <uint256.h>
+#include <util.h>
 
 #include <boost/thread.hpp>