diff --git a/src/rpc/abc.cpp b/src/rpc/abc.cpp
--- a/src/rpc/abc.cpp
+++ b/src/rpc/abc.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "config.h"
-#include "consensus/consensus.h"
-#include "rpc/server.h"
-#include "utilstrencodings.h"
-#include "validation.h"
+#include <config.h>
+#include <consensus/consensus.h>
+#include <rpc/server.h>
+#include <utilstrencodings.h>
+#include <validation.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -3,28 +3,28 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/blockchain.h"
-
-#include "amount.h"
-#include "chain.h"
-#include "chainparams.h"
-#include "checkpoints.h"
-#include "coins.h"
-#include "config.h"
-#include "consensus/validation.h"
-#include "core_io.h"
-#include "hash.h"
-#include "policy/policy.h"
-#include "primitives/transaction.h"
-#include "rpc/server.h"
-#include "streams.h"
-#include "sync.h"
-#include "txdb.h"
-#include "txmempool.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "validation.h"
-#include "warnings.h"
+#include <rpc/blockchain.h>
+
+#include <amount.h>
+#include <chain.h>
+#include <chainparams.h>
+#include <checkpoints.h>
+#include <coins.h>
+#include <config.h>
+#include <consensus/validation.h>
+#include <core_io.h>
+#include <hash.h>
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <rpc/server.h>
+#include <streams.h>
+#include <sync.h>
+#include <txdb.h>
+#include <txmempool.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <validation.h>
+#include <warnings.h>
 
 #include <boost/thread/thread.hpp> // boost::thread::interrupt
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.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 "rpc/client.h"
-#include "rpc/protocol.h"
-#include "util.h"
+#include <rpc/client.h>
+#include <rpc/protocol.h>
+#include <util.h>
 
 #include <cstdint>
 #include <set>
diff --git a/src/rpc/command.cpp b/src/rpc/command.cpp
--- a/src/rpc/command.cpp
+++ b/src/rpc/command.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 "command.h"
-#include "jsonrpcrequest.h"
+#include <rpc/command.h>
+#include <rpc/jsonrpcrequest.h>
 
 UniValue
 RPCCommandWithArgsContext::Execute(const JSONRPCRequest &request) const {
diff --git a/src/rpc/jsonrpcrequest.cpp b/src/rpc/jsonrpcrequest.cpp
--- a/src/rpc/jsonrpcrequest.cpp
+++ b/src/rpc/jsonrpcrequest.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/jsonrpcrequest.h"
-#include "logging.h"
-#include "rpc/protocol.h"
-#include "tinyformat.h"
-#include "utilstrencodings.h"
+#include <logging.h>
+#include <rpc/jsonrpcrequest.h>
+#include <rpc/protocol.h>
+#include <tinyformat.h>
+#include <utilstrencodings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/mining.h b/src/rpc/mining.h
--- a/src/rpc/mining.h
+++ b/src/rpc/mining.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_RPC_MINING_H
 #define BITCOIN_RPC_MINING_H
 
-#include "script/script.h"
+#include <script/script.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -3,30 +3,30 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/mining.h"
-#include "amount.h"
-#include "blockvalidity.h"
-#include "chain.h"
-#include "chainparams.h"
-#include "config.h"
-#include "consensus/consensus.h"
-#include "consensus/params.h"
-#include "consensus/validation.h"
-#include "core_io.h"
-#include "dstencode.h"
-#include "init.h"
-#include "miner.h"
-#include "net.h"
-#include "policy/policy.h"
-#include "pow.h"
-#include "rpc/blockchain.h"
-#include "rpc/server.h"
-#include "txmempool.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "validation.h"
-#include "validationinterface.h"
-#include "warnings.h"
+#include <amount.h>
+#include <blockvalidity.h>
+#include <chain.h>
+#include <chainparams.h>
+#include <config.h>
+#include <consensus/consensus.h>
+#include <consensus/params.h>
+#include <consensus/validation.h>
+#include <core_io.h>
+#include <dstencode.h>
+#include <init.h>
+#include <miner.h>
+#include <net.h>
+#include <policy/policy.h>
+#include <pow.h>
+#include <rpc/blockchain.h>
+#include <rpc/mining.h>
+#include <rpc/server.h>
+#include <txmempool.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <validation.h>
+#include <validationinterface.h>
+#include <warnings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/misc.h b/src/rpc/misc.h
--- a/src/rpc/misc.h
+++ b/src/rpc/misc.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_RPCMISC_H
 #define BITCOIN_RPCMISC_H
 
-#include "script/script.h"
+#include <script/script.h>
 
 class CWallet;
 class UniValue;
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -3,27 +3,27 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/misc.h"
-#include "base58.h"
-#include "chain.h"
-#include "clientversion.h"
-#include "config.h"
-#include "dstencode.h"
-#include "init.h"
-#include "net.h"
-#include "netbase.h"
-#include "rpc/blockchain.h"
-#include "rpc/server.h"
-#include "timedata.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "validation.h"
+#include <base58.h>
+#include <chain.h>
+#include <clientversion.h>
+#include <config.h>
+#include <dstencode.h>
+#include <init.h>
+#include <net.h>
+#include <netbase.h>
+#include <rpc/blockchain.h>
+#include <rpc/misc.h>
+#include <rpc/server.h>
+#include <timedata.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <validation.h>
 #ifdef ENABLE_WALLET
-#include "wallet/rpcwallet.h"
-#include "wallet/wallet.h"
-#include "wallet/walletdb.h"
+#include <wallet/rpcwallet.h>
+#include <wallet/wallet.h>
+#include <wallet/walletdb.h>
 #endif
-#include "warnings.h"
+#include <warnings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -2,24 +2,24 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/server.h"
-
-#include "chainparams.h"
-#include "clientversion.h"
-#include "config.h"
-#include "net.h"
-#include "net_processing.h"
-#include "netbase.h"
-#include "policy/policy.h"
-#include "protocol.h"
-#include "sync.h"
-#include "timedata.h"
-#include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "validation.h"
-#include "version.h"
-#include "warnings.h"
+#include <rpc/server.h>
+
+#include <chainparams.h>
+#include <clientversion.h>
+#include <config.h>
+#include <net.h>
+#include <net_processing.h>
+#include <netbase.h>
+#include <policy/policy.h>
+#include <rpc/protocol.h>
+#include <sync.h>
+#include <timedata.h>
+#include <ui_interface.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <validation.h>
+#include <version.h>
+#include <warnings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_RPCPROTOCOL_H
 #define BITCOIN_RPCPROTOCOL_H
 
-#include "fs.h"
+#include <fs.h>
 
 #include <cstdint>
 #include <list>
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -3,14 +3,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/protocol.h"
-
-#include "random.h"
-#include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "utiltime.h"
-#include "version.h"
+#include <rpc/protocol.h>
+
+#include <random.h>
+#include <tinyformat.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <utiltime.h>
+#include <version.h>
 
 #include <cstdint>
 #include <fstream>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -3,32 +3,32 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/rawtransaction.h"
-#include "base58.h"
-#include "chain.h"
-#include "coins.h"
-#include "config.h"
-#include "consensus/validation.h"
-#include "core_io.h"
-#include "dstencode.h"
-#include "init.h"
-#include "keystore.h"
-#include "merkleblock.h"
-#include "net.h"
-#include "policy/policy.h"
-#include "primitives/transaction.h"
-#include "rpc/server.h"
-#include "rpc/tojson.h"
-#include "script/script.h"
-#include "script/script_error.h"
-#include "script/sign.h"
-#include "script/standard.h"
-#include "txmempool.h"
-#include "uint256.h"
-#include "utilstrencodings.h"
-#include "validation.h"
+#include <base58.h>
+#include <chain.h>
+#include <coins.h>
+#include <config.h>
+#include <consensus/validation.h>
+#include <core_io.h>
+#include <dstencode.h>
+#include <init.h>
+#include <keystore.h>
+#include <merkleblock.h>
+#include <net.h>
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <rpc/rawtransaction.h>
+#include <rpc/server.h>
+#include <rpc/tojson.h>
+#include <script/script.h>
+#include <script/script_error.h>
+#include <script/sign.h>
+#include <script/standard.h>
+#include <txmempool.h>
+#include <uint256.h>
+#include <utilstrencodings.h>
+#include <validation.h>
 #ifdef ENABLE_WALLET
-#include "wallet/rpcwallet.h"
+#include <wallet/rpcwallet.h>
 #endif
 
 #include <cstdint>
diff --git a/src/rpc/server.h b/src/rpc/server.h
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -7,13 +7,13 @@
 #ifndef BITCOIN_RPC_SERVER_H
 #define BITCOIN_RPC_SERVER_H
 
-#include "amount.h"
-#include "rpc/command.h"
-#include "rpc/jsonrpcrequest.h"
-#include "rpc/protocol.h"
-#include "rwcollection.h"
-#include "uint256.h"
-#include "util.h"
+#include <amount.h>
+#include <rpc/command.h>
+#include <rpc/jsonrpcrequest.h>
+#include <rpc/protocol.h>
+#include <rwcollection.h>
+#include <uint256.h>
+#include <util.h>
 
 #include <cstdint>
 #include <functional>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -4,17 +4,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpc/server.h"
-
-#include "base58.h"
-#include "config.h"
-#include "fs.h"
-#include "init.h"
-#include "random.h"
-#include "sync.h"
-#include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include <rpc/server.h>
+
+#include <base58.h>
+#include <config.h>
+#include <fs.h>
+#include <init.h>
+#include <random.h>
+#include <sync.h>
+#include <ui_interface.h>
+#include <util.h>
+#include <utilstrencodings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/test/server_tests.cpp b/src/rpc/test/server_tests.cpp
--- a/src/rpc/test/server_tests.cpp
+++ b/src/rpc/test/server_tests.cpp
@@ -1,6 +1,6 @@
-#include "rpc/server.h"
-#include "test/test_bitcoin.h"
-#include "util.h"
+#include <rpc/server.h>
+#include <test/test_bitcoin.h>
+#include <util.h>
 
 #include <cstdint>
 #include <vector>
diff --git a/src/rpc/tojson.h b/src/rpc/tojson.h
--- a/src/rpc/tojson.h
+++ b/src/rpc/tojson.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_RPCTOJSON_H
 #define BITCOIN_RPCTOJSON_H
 
-#include "uint256.h"
+#include <uint256.h>
 
 #include <univalue.h>