Skip to content

Commit 8a893c9

Browse files
committed
Includes: Do not include main.h from any other header
1 parent eca0b1e commit 8a893c9

12 files changed

+22
-4
lines changed

src/qt/addresstablemodel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include "base58.h"
1111
#include "wallet/wallet.h"
1212

13+
#include <boost/foreach.hpp>
14+
1315
#include <QFont>
1416
#include <QDebug>
1517

src/qt/paymentserver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include "base58.h"
1212
#include "chainparams.h"
13+
#include "main.h"
1314
#include "ui_interface.h"
1415
#include "util.h"
1516
#include "wallet/wallet.h"

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "base58.h"
1919
#include "coincontrol.h"
20+
#include "main.h"
2021
#include "ui_interface.h"
2122
#include "wallet/wallet.h"
2223

src/qt/signverifymessagedialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "base58.h"
1414
#include "init.h"
15+
#include "main.h" // For strMessageMagic
1516
#include "wallet/wallet.h"
1617

1718
#include <string>

src/qt/transactionrecord.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
#include "transactionrecord.h"
66

77
#include "base58.h"
8+
#include "main.h"
89
#include "timedata.h"
910
#include "wallet/wallet.h"
1011

1112
#include <stdint.h>
1213

14+
#include <boost/foreach.hpp>
15+
1316
/* Return positive answer if transaction should be shown in list.
1417
*/
1518
bool TransactionRecord::showTransaction(const CWalletTx &wtx)

src/test/rpc_wallet_tests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "rpcclient.h"
77

88
#include "base58.h"
9+
#include "main.h"
910
#include "wallet/wallet.h"
1011

1112
#include "test/test_bitcoin.h"

src/txdb.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "txdb.h"
77

8+
#include "main.h"
89
#include "pow.h"
910
#include "uint256.h"
1011

src/txdb.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
#ifndef BITCOIN_TXDB_H
77
#define BITCOIN_TXDB_H
88

9+
#include "coins.h"
910
#include "leveldbwrapper.h"
10-
#include "main.h"
1111

1212
#include <map>
1313
#include <string>
1414
#include <utility>
1515
#include <vector>
1616

17-
class CCoins;
17+
class CBlockFileInfo;
18+
class CBlockIndex;
19+
class CDiskTxPos;
1820
class uint256;
1921

2022
//! -dbcache default (MiB)

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
#include "amount.h"
77
#include "base58.h"
88
#include "core_io.h"
9-
#include "rpcserver.h"
109
#include "init.h"
10+
#include "main.h"
1111
#include "net.h"
1212
#include "netbase.h"
13+
#include "rpcserver.h"
1314
#include "timedata.h"
1415
#include "util.h"
1516
#include "utilmoneystr.h"

src/wallet/wallet.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "base58.h"
99
#include "checkpoints.h"
1010
#include "coincontrol.h"
11+
#include "main.h"
1112
#include "net.h"
1213
#include "script/script.h"
1314
#include "script/sign.h"

src/wallet/wallet.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
#include "amount.h"
1010
#include "key.h"
1111
#include "keystore.h"
12-
#include "main.h"
1312
#include "primitives/block.h"
1413
#include "primitives/transaction.h"
14+
#include "tinyformat.h"
1515
#include "ui_interface.h"
16+
#include "utilstrencodings.h"
1617
#include "validationinterface.h"
1718
#include "wallet/crypter.h"
1819
#include "wallet/wallet_ismine.h"
@@ -49,10 +50,12 @@ static const CAmount nHighTransactionMaxFeeWarning = 100 * nHighTransactionFeeWa
4950
static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
5051

5152
class CAccountingEntry;
53+
class CBlockIndex;
5254
class CCoinControl;
5355
class COutput;
5456
class CReserveKey;
5557
class CScript;
58+
class CTxMemPool;
5659
class CWalletTx;
5760

5861
/** (client) version numbers for particular wallet features */

src/wallet/walletdb.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "wallet/walletdb.h"
77

88
#include "base58.h"
9+
#include "main.h"
910
#include "protocol.h"
1011
#include "serialize.h"
1112
#include "sync.h"

0 commit comments

Comments
 (0)