diff --git a/src/checkqueue.h b/src/checkqueue.h
index ea12df66d..63c104c02 100644
--- a/src/checkqueue.h
+++ b/src/checkqueue.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_CHECKQUEUE_H
 #define BITCOIN_CHECKQUEUE_H
 
+#include "sync.h"
+
 #include <algorithm>
 #include <vector>
 
diff --git a/src/coins.h b/src/coins.h
index faa7632b3..eef64dc22 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_COINS_H
 #define BITCOIN_COINS_H
 
+#include "primitives/transaction.h"
 #include "compressor.h"
 #include "core_memusage.h"
 #include "hash.h"
diff --git a/src/net.h b/src/net.h
index 694ed56a1..8d2904990 100644
--- a/src/net.h
+++ b/src/net.h
@@ -52,7 +52,6 @@
 #define DEFAULT_ALLOW_OPTIMISTIC_SEND false
 #endif
 
-class CAddrMan;
 class CScheduler;
 class CNode;
 
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index eb41ad170..53347b5ff 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -8,6 +8,7 @@
 #include "policy/policy.h"
 
 #include "validation.h"
+#include "coins.h"
 #include "tinyformat.h"
 #include "util.h"
 #include "utilstrencodings.h"
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 0a636c476..bc3f2e60b 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -11,6 +11,7 @@
 #include "peertablemodel.h"
 
 #include "alert.h"
+#include "chain.h"
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index ca518b8ce..080b9a92d 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -14,6 +14,7 @@
 #include "transactiontablemodel.h"
 
 #include "base58.h"
+#include "chain.h"
 #include "keystore.h"
 #include "validation.h"
 #include "net.h" // for g_connman
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 779527971..159273cbe 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -5,6 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "base58.h"
+#include "chain.h"
 #include "clientversion.h"
 #include "init.h"
 #include "net.h"
diff --git a/src/validation.cpp b/src/validation.cpp
index caf93eee8..efee26789 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -9,6 +9,7 @@
 #include "alert.h"
 #include "arith_uint256.h"
 #include "blockencodings.h"
+#include "chain.h"
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "checkqueue.h"
diff --git a/src/validation.h b/src/validation.h
index cab4ed6c1..a0921302e 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -12,7 +12,6 @@
 #endif
 
 #include "amount.h"
-#include "chain.h"
 #include "coins.h"
 #include "fs.h"
 #include "protocol.h" // For CMessageHeader::MessageStartChars
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9f29f4523..49c1c119a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -10,6 +10,7 @@
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
+#include "wallet/coincontrol.h"
 #include "instantsend.h"
 #include "net.h"
 #include "policy/fees.h"
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 6134fde4a..44bb9b9b4 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -2,6 +2,7 @@
 // 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 "streams.h"
 #include "zmqpublishnotifier.h"