Merge pull request #5697

60c8bac Includes: Cleanup around net main and wallet (Jorge Timón)
9dd793f TRIVIAL: Missing includes (Jorge Timón)

src/qt/bitcoin.cpp

@@ -8,6 +8,7 @@
 
 #include "bitcoingui.h"
 
+#include "chainparams.h"
 #include "clientmodel.h"
 #include "guiconstants.h"
 #include "guiutil.h"
@@ -24,7 +25,6 @@
 #endif
 
 #include "init.h"
-#include "main.h"
 #include "rpcserver.h"
 #include "scheduler.h"
 #include "ui_interface.h"

src/qt/clientmodel.cpp

@@ -11,7 +11,6 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
-#include "main.h"
 #include "net.h"
 #include "ui_interface.h"
 #include "util.h"

src/qt/coincontroldialog.cpp

@@ -10,11 +10,12 @@
 #include "guiutil.h"
 #include "optionsmodel.h"
 #include "scicon.h"
+#include "txmempool.h"
 #include "walletmodel.h"
 
 #include "coincontrol.h"
 #include "init.h"
-#include "main.h"
+#include "main.h" // For minRelayTxFee
 #include "wallet/wallet.h"
 
 #include <boost/assign/list_of.hpp> // for 'map_list_of()'

src/qt/guiutil.cpp

@@ -11,7 +11,7 @@
 
 #include "primitives/transaction.h"
 #include "init.h"
-#include "main.h"
+#include "main.h" // For minRelayTxFee
 #include "protocol.h"
 #include "script/script.h"
 #include "script/standard.h"

src/qt/optionsdialog.cpp

@@ -13,7 +13,7 @@
 #include "guiutil.h"
 #include "optionsmodel.h"
 
-#include "main.h" // for MAX_SCRIPTCHECK_THREADS
+#include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
 #include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
 

src/qt/optionsmodel.cpp

@@ -13,7 +13,7 @@
 
 #include "amount.h"
 #include "init.h"
-#include "main.h"
+#include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
 #include "txdb.h" // for -dbcache defaults
 

src/qt/paymentserver.cpp

@@ -10,7 +10,7 @@
 
 #include "base58.h"
 #include "chainparams.h"
-#include "main.h"
+#include "main.h" // For minRelayTxFee
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet/wallet.h"

src/qt/peertablemodel.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_PEERTABLEMODEL_H
 #define BITCOIN_QT_PEERTABLEMODEL_H
 
-#include "main.h"
+#include "main.h" // For CNodeStateStats
 #include "net.h"
 
 #include <QAbstractTableModel>

src/qt/rpcconsole.cpp

@@ -10,7 +10,6 @@
 #include "peertablemodel.h"
 #include "scicon.h"
 
-#include "main.h"
 #include "chainparams.h"
 #include "rpcserver.h"
 #include "rpcclient.h"

src/qt/sendcoinsdialog.cpp

@@ -17,8 +17,9 @@
 
 #include "base58.h"
 #include "coincontrol.h"
-#include "main.h"
+#include "main.h" // mempool and minRelayTxFee
 #include "ui_interface.h"
+#include "txmempool.h"
 #include "wallet/wallet.h"
 
 #include <QMessageBox>

src/qt/transactiontablemodel.cpp

@@ -25,6 +25,8 @@
 #include <QIcon>
 #include <QList>
 
+#include <boost/foreach.hpp>
+
 // Amount column is right-aligned it contains numbers
 static int column_alignments[] = {
         Qt::AlignLeft|Qt::AlignVCenter, /* status */

src/qt/walletmodel.cpp

@@ -25,6 +25,8 @@
 #include <QSet>
 #include <QTimer>
 
+#include <boost/foreach.hpp>
+
 WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
     QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
     transactionTableModel(0),