diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -1,5 +1,6 @@
 #include <qt/test/wallettests.h>
 
+#include <chain.h>
 #include <chainparams.h>
 #include <config.h>
 #include <dstencode.h>
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -4,6 +4,7 @@
 
 // Unit tests for denial-of-service detection/prevention code
 
+#include <chain.h>
 #include <chainparams.h>
 #include <config.h>
 #include <keystore.h>
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -3,7 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <base58.h>
+#include <clientversion.h>
 #include <key.h>
+#include <streams.h>
 #include <uint256.h>
 #include <util.h>
 #include <utilstrencodings.h>
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -7,7 +7,9 @@
 #include <chainparams.h>
 #include <config.h>
 #include <consensus/merkle.h>
+#include <pow.h>
 #include <random.h>
+#include <streams.h>
 
 #include <test/test_bitcoin.h>
 
diff --git a/src/test/cashaddrenc_tests.cpp b/src/test/cashaddrenc_tests.cpp
--- a/src/test/cashaddrenc_tests.cpp
+++ b/src/test/cashaddrenc_tests.cpp
@@ -8,6 +8,7 @@
 #include <chainparams.h>
 #include <random.h>
 #include <uint256.h>
+#include <utilstrencodings.h>
 
 #include <test/test_bitcoin.h>
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -4,8 +4,10 @@
 
 #include <coins.h>
 
+#include <clientversion.h>
 #include <consensus/validation.h>
 #include <script/standard.h>
+#include <streams.h>
 #include <uint256.h>
 #include <undo.h>
 #include <utilstrencodings.h>
diff --git a/src/test/finalization_tests.cpp b/src/test/finalization_tests.cpp
--- a/src/test/finalization_tests.cpp
+++ b/src/test/finalization_tests.cpp
@@ -2,8 +2,10 @@
 // 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 <utiltime.h>
 #include <validation.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -5,6 +5,8 @@
 #include <crypto/siphash.h>
 #include <hash.h>
 
+#include <clientversion.h>
+#include <streams.h>
 #include <utilstrencodings.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -4,6 +4,8 @@
 
 #include <consensus/merkle.h>
 
+#include <utilstrencodings.h>
+
 #include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -5,6 +5,7 @@
 
 #include <miner.h>
 
+#include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
 #include <config.h>
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -11,6 +11,7 @@
 #include <script/script_error.h>
 #include <script/sighashtype.h>
 #include <script/sign.h>
+#include <tinyformat.h>
 #include <uint256.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -12,6 +12,7 @@
 #include <key.h>
 #include <keystore.h>
 #include <rpc/server.h>
+#include <streams.h>
 #include <util.h>
 #include <utilstrencodings.h>
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -6,6 +6,7 @@
 
 #include <hash.h>
 #include <streams.h>
+#include <utilstrencodings.h>
 
 #include <test/test_bitcoin.h>
 
diff --git a/src/test/sigcache_tests.cpp b/src/test/sigcache_tests.cpp
--- a/src/test/sigcache_tests.cpp
+++ b/src/test/sigcache_tests.cpp
@@ -9,6 +9,8 @@
 #include <base58.h>
 #include <dstencode.h>
 #include <key.h>
+#include <streams.h>
+#include <tinyformat.h>
 #include <utilstrencodings.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/sighashtype_tests.cpp b/src/test/sighashtype_tests.cpp
--- a/src/test/sighashtype_tests.cpp
+++ b/src/test/sighashtype_tests.cpp
@@ -4,6 +4,8 @@
 
 #include <script/sighashtype.h>
 
+#include <streams.h>
+
 #include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -11,7 +11,6 @@
 #include <pubkey.h>
 #include <random.h>
 #include <scheduler.h>
-#include <txdb.h>
 #include <txmempool.h>
 
 #include <boost/thread.hpp>
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -17,6 +17,8 @@
 #include <script/script_error.h>
 #include <script/sign.h>
 #include <script/standard.h>
+#include <streams.h>
+#include <util.h>
 #include <utilstrencodings.h>
 #include <validation.h>
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.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 <config.h>
 #include <consensus/validation.h>
 #include <key.h>
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -4,6 +4,7 @@
 #include <uint256.h>
 
 #include <arith_uint256.h>
+#include <streams.h>
 #include <version.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/undo_tests.cpp b/src/test/undo_tests.cpp
--- a/src/test/undo_tests.cpp
+++ b/src/test/undo_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <undo.h>
 
+#include <chain.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <validation.h>
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -6,9 +6,11 @@
 #include <validation.h>
 
 #include <chainparams.h>
+#include <clientversion.h>
 #include <config.h>
 #include <consensus/consensus.h>
 #include <primitives/transaction.h>
+#include <streams.h>
 #include <util.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.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 <config.h>
 #include <consensus/validation.h>