diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 9573fe43d..8e20836c6 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -10,6 +10,8 @@
 #include "base58.h"
 #include "wallet/wallet.h"
 
+#include <boost/foreach.hpp>
+
 #include <QFont>
 #include <QDebug>
 
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 40d6e16f5..ad489de34 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -10,6 +10,7 @@
 
 #include "base58.h"
 #include "chainparams.h"
+#include "main.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet/wallet.h"
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 28c8fb95f..774667d4a 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -17,6 +17,7 @@
 
 #include "base58.h"
 #include "coincontrol.h"
+#include "main.h"
 #include "ui_interface.h"
 #include "wallet/wallet.h"
 
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 76da6904a..ce166f367 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -12,6 +12,7 @@
 
 #include "base58.h"
 #include "init.h"
+#include "main.h" // For strMessageMagic
 #include "wallet/wallet.h"
 
 #include <string>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 19e3fc0dc..9db5ad0fd 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -5,11 +5,14 @@
 #include "transactionrecord.h"
 
 #include "base58.h"
+#include "main.h"
 #include "timedata.h"
 #include "wallet/wallet.h"
 
 #include <stdint.h>
 
+#include <boost/foreach.hpp>
+
 /* Return positive answer if transaction should be shown in list.
  */
 bool TransactionRecord::showTransaction(const CWalletTx &wtx)
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index d97bea8bd..4d5e92cbd 100644
--- a/src/test/rpc_wallet_tests.cpp
+++ b/src/test/rpc_wallet_tests.cpp
@@ -6,6 +6,7 @@
 #include "rpcclient.h"
 
 #include "base58.h"
+#include "main.h"
 #include "wallet/wallet.h"
 
 #include "test/test_bitcoin.h"
diff --git a/src/txdb.cpp b/src/txdb.cpp
index da271bd5d..f32815028 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -5,6 +5,7 @@
 
 #include "txdb.h"
 
+#include "main.h"
 #include "pow.h"
 #include "uint256.h"
 
diff --git a/src/txdb.h b/src/txdb.h
index f6b6b84fc..1ce93969d 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -6,15 +6,17 @@
 #ifndef BITCOIN_TXDB_H
 #define BITCOIN_TXDB_H
 
+#include "coins.h"
 #include "leveldbwrapper.h"
-#include "main.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-class CCoins;
+class CBlockFileInfo;
+class CBlockIndex;
+class CDiskTxPos;
 class uint256;
 
 //! -dbcache default (MiB)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5502b0b26..9318c1b2b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -6,10 +6,11 @@
 #include "amount.h"
 #include "base58.h"
 #include "core_io.h"
-#include "rpcserver.h"
 #include "init.h"
+#include "main.h"
 #include "net.h"
 #include "netbase.h"
+#include "rpcserver.h"
 #include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index cc03d5632..09bcda577 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -8,6 +8,7 @@
 #include "base58.h"
 #include "checkpoints.h"
 #include "coincontrol.h"
+#include "main.h"
 #include "net.h"
 #include "script/script.h"
 #include "script/sign.h"
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 9abc73f9c..4a13f0219 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -9,10 +9,11 @@
 #include "amount.h"
 #include "key.h"
 #include "keystore.h"
-#include "main.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
+#include "tinyformat.h"
 #include "ui_interface.h"
+#include "utilstrencodings.h"
 #include "validationinterface.h"
 #include "wallet/crypter.h"
 #include "wallet/wallet_ismine.h"
@@ -49,10 +50,12 @@ static const CAmount nHighTransactionMaxFeeWarning = 100 * nHighTransactionFeeWa
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 
 class CAccountingEntry;
+class CBlockIndex;
 class CCoinControl;
 class COutput;
 class CReserveKey;
 class CScript;
+class CTxMemPool;
 class CWalletTx;
 
 /** (client) version numbers for particular wallet features */
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index d7f70e435..de56a2d1a 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -6,6 +6,7 @@
 #include "wallet/walletdb.h"
 
 #include "base58.h"
+#include "main.h"
 #include "protocol.h"
 #include "serialize.h"
 #include "sync.h"