From 9dd793f499254600efa468938cef9baa28ac81b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Sun, 5 Jul 2015 14:17:46 +0200 Subject: [PATCH 1/2] TRIVIAL: Missing includes --- src/alert.cpp | 1 + src/bitcoind.cpp | 1 + src/checkpoints.cpp | 1 + src/init.cpp | 5 +++++ src/main.cpp | 2 ++ src/main.h | 1 + src/miner.cpp | 4 ++++ src/qt/bitcoin.cpp | 1 + src/qt/coincontroldialog.cpp | 1 + src/qt/sendcoinsdialog.cpp | 1 + src/qt/transactiontablemodel.cpp | 2 ++ src/qt/walletmodel.cpp | 2 ++ src/rest.cpp | 1 + src/rpcblockchain.cpp | 6 ++++++ src/rpcmining.cpp | 3 +++ src/rpcmisc.cpp | 1 + src/rpcnet.cpp | 2 ++ src/rpcrawtransaction.cpp | 4 ++++ src/test/DoS_tests.cpp | 5 +---- src/test/checkblock_tests.cpp | 1 + src/test/miner_tests.cpp | 5 +++++ src/test/pow_tests.cpp | 3 +++ src/test/script_tests.cpp | 1 + src/test/sighash_tests.cpp | 3 +++ src/test/skiplist_tests.cpp | 1 + src/test/test_bitcoin.cpp | 1 + src/test/transaction_tests.cpp | 1 + src/txdb.cpp | 1 + src/wallet/rpcdump.cpp | 3 +++ src/wallet/rpcwallet.cpp | 1 + src/wallet/wallet.cpp | 2 ++ src/wallet/wallet.h | 1 + src/wallet/wallet_ismine.h | 2 ++ 33 files changed, 66 insertions(+), 4 deletions(-) diff --git a/src/alert.cpp b/src/alert.cpp index ad81e7422..91e54a917 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -11,6 +11,7 @@ #include "timedata.h" #include "ui_interface.h" #include "util.h" +#include "utilstrencodings.h" #include #include diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index cce687ac9..cfa32d981 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -3,6 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "chainparams.h" #include "clientversion.h" #include "rpcserver.h" #include "init.h" diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 87f4ad7f2..a9822eed8 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -4,6 +4,7 @@ #include "checkpoints.h" +#include "chain.h" #include "chainparams.h" #include "main.h" #include "uint256.h" diff --git a/src/init.cpp b/src/init.cpp index 4addc663c..aba711c3e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -11,6 +11,8 @@ #include "addrman.h" #include "amount.h" +#include "chain.h" +#include "chainparams.h" #include "checkpoints.h" #include "compat/sanity.h" #include "consensus/validation.h" @@ -23,11 +25,14 @@ #include "script/standard.h" #include "scheduler.h" #include "txdb.h" +#include "txmempool.h" #include "ui_interface.h" #include "util.h" #include "utilmoneystr.h" +#include "utilstrencodings.h" #include "validationinterface.h" #ifdef ENABLE_WALLET +#include "wallet/db.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" #endif diff --git a/src/main.cpp b/src/main.cpp index fb90d7578..58c42cf96 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,7 @@ #include "checkqueue.h" #include "consensus/consensus.h" #include "consensus/validation.h" +#include "hash.h" #include "init.h" #include "merkleblock.h" #include "net.h" @@ -24,6 +25,7 @@ #include "undo.h" #include "util.h" #include "utilmoneystr.h" +#include "utilstrencodings.h" #include "validationinterface.h" #include diff --git a/src/main.h b/src/main.h index ce18bd709..78a139012 100644 --- a/src/main.h +++ b/src/main.h @@ -18,6 +18,7 @@ #include "primitives/block.h" #include "primitives/transaction.h" #include "script/script.h" +#include "script/script_error.h" #include "script/sigcache.h" #include "script/standard.h" #include "sync.h" diff --git a/src/miner.cpp b/src/miner.cpp index 5e575f45f..e44f3392c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -6,7 +6,9 @@ #include "miner.h" #include "amount.h" +#include "chain.h" #include "chainparams.h" +#include "coins.h" #include "consensus/consensus.h" #include "consensus/validation.h" #include "hash.h" @@ -15,7 +17,9 @@ #include "policy/policy.h" #include "pow.h" #include "primitives/transaction.h" +#include "script/standard.h" #include "timedata.h" +#include "txmempool.h" #include "util.h" #include "utilmoneystr.h" #include "validationinterface.h" diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index ec02c4be9..36b9bc50a 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -8,6 +8,7 @@ #include "bitcoingui.h" +#include "chainparams.h" #include "clientmodel.h" #include "guiconstants.h" #include "guiutil.h" diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 778dbcb1c..764596df3 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -10,6 +10,7 @@ #include "guiutil.h" #include "optionsmodel.h" #include "scicon.h" +#include "txmempool.h" #include "walletmodel.h" #include "coincontrol.h" diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index e13cd714a..9841f6ced 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -19,6 +19,7 @@ #include "coincontrol.h" #include "main.h" #include "ui_interface.h" +#include "txmempool.h" #include "wallet/wallet.h" #include diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index e3d64387f..f384562a5 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -25,6 +25,8 @@ #include #include +#include + // Amount column is right-aligned it contains numbers static int column_alignments[] = { Qt::AlignLeft|Qt::AlignVCenter, /* status */ diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 168a0255f..7820047b6 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -25,6 +25,8 @@ #include #include +#include + WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) : QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0), transactionTableModel(0), diff --git a/src/rest.cpp b/src/rest.cpp index dfe01495f..0dd238b68 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -3,6 +3,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 "primitives/block.h" #include "primitives/transaction.h" #include "main.h" diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index f1c5ffe05..5817f0ce5 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -3,13 +3,19 @@ // 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 "checkpoints.h" +#include "coins.h" #include "consensus/validation.h" #include "main.h" #include "primitives/transaction.h" #include "rpcserver.h" +#include "streams.h" #include "sync.h" +#include "txmempool.h" #include "util.h" +#include "utilstrencodings.h" #include diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 703b0ee65..b7d4ff58f 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -4,6 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "amount.h" +#include "chain.h" #include "chainparams.h" #include "consensus/consensus.h" #include "consensus/validation.h" @@ -14,7 +15,9 @@ #include "net.h" #include "pow.h" #include "rpcserver.h" +#include "txmempool.h" #include "util.h" +#include "utilstrencodings.h" #include "validationinterface.h" #include diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index cab57d702..82003e09b 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -12,6 +12,7 @@ #include "rpcserver.h" #include "timedata.h" #include "util.h" +#include "utilstrencodings.h" #ifdef ENABLE_WALLET #include "wallet/wallet.h" #include "wallet/walletdb.h" diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index dd631905f..ed903f9fd 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -4,6 +4,7 @@ #include "rpcserver.h" +#include "chainparams.h" #include "clientversion.h" #include "main.h" #include "net.h" @@ -12,6 +13,7 @@ #include "sync.h" #include "timedata.h" #include "util.h" +#include "utilstrencodings.h" #include "version.h" #include diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 7d1db0b60..62d2ef69e 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -4,6 +4,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "base58.h" +#include "chain.h" +#include "coins.h" #include "consensus/validation.h" #include "core_io.h" #include "init.h" @@ -18,7 +20,9 @@ #include "script/script_error.h" #include "script/sign.h" #include "script/standard.h" +#include "txmempool.h" #include "uint256.h" +#include "utilstrencodings.h" #ifdef ENABLE_WALLET #include "wallet/wallet.h" #endif diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index bf2554875..da296a046 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -2,12 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -// // Unit tests for denial-of-service detection/prevention code -// - - +#include "chainparams.h" #include "keystore.h" #include "main.h" #include "net.h" diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index 51530c4de..fe9fa86ab 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -5,6 +5,7 @@ #include "clientversion.h" #include "consensus/validation.h" #include "main.h" +#include "primitives/block.h" #include "test/test_bitcoin.h" #include "utiltime.h" diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 212be0d2d..ad79a558c 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -2,12 +2,17 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "chainparams.h" +#include "coins.h" #include "consensus/validation.h" #include "main.h" #include "miner.h" #include "pubkey.h" +#include "script/standard.h" +#include "txmempool.h" #include "uint256.h" #include "util.h" +#include "utilstrencodings.h" #include "test/test_bitcoin.h" diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index a43674928..992f9c971 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -2,8 +2,11 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "chain.h" +#include "chainparams.h" #include "main.h" #include "pow.h" +#include "random.h" #include "util.h" #include "test/test_bitcoin.h" diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 373342569..daf3d8989 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -13,6 +13,7 @@ #include "script/script_error.h" #include "script/sign.h" #include "util.h" +#include "utilstrencodings.h" #include "test/test_bitcoin.h" #if defined(HAVE_CONSENSUS_LIB) diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index a0797d5f3..9fc227cfd 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -4,13 +4,16 @@ #include "consensus/validation.h" #include "data/sighash.json.h" +#include "hash.h" #include "main.h" #include "random.h" #include "script/interpreter.h" #include "script/script.h" #include "serialize.h" +#include "streams.h" #include "test/test_bitcoin.h" #include "util.h" +#include "utilstrencodings.h" #include "version.h" #include diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 86a4bc672..8a061b0de 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_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 "main.h" #include "random.h" #include "util.h" diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index c727303ea..ba616365f 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -6,6 +6,7 @@ #include "test_bitcoin.h" +#include "chainparams.h" #include "key.h" #include "main.h" #include "random.h" diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 260524f7c..5f1af1f94 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -15,6 +15,7 @@ #include "policy/policy.h" #include "script/script.h" #include "script/script_error.h" +#include "utilstrencodings.h" #include #include diff --git a/src/txdb.cpp b/src/txdb.cpp index 935b78467..21ecd6523 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -5,6 +5,7 @@ #include "txdb.h" +#include "chain.h" #include "chainparams.h" #include "hash.h" #include "main.h" diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 5f800474a..dbe36a2be 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -3,6 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "base58.h" +#include "chain.h" #include "rpcserver.h" #include "init.h" #include "main.h" @@ -21,6 +22,8 @@ #include "univalue/univalue.h" +#include + using namespace std; void EnsureWalletIsUnlocked(); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 8d8893387..101fb5376 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5,6 +5,7 @@ #include "amount.h" #include "base58.h" +#include "chain.h" #include "core_io.h" #include "init.h" #include "main.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 7b3cd9803..5a52d931d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -7,6 +7,7 @@ #include "base58.h" #include "checkpoints.h" +#include "chain.h" #include "coincontrol.h" #include "consensus/consensus.h" #include "consensus/validation.h" @@ -16,6 +17,7 @@ #include "script/script.h" #include "script/sign.h" #include "timedata.h" +#include "txmempool.h" #include "util.h" #include "utilmoneystr.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 003266ba1..de3232e56 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -11,6 +11,7 @@ #include "keystore.h" #include "primitives/block.h" #include "primitives/transaction.h" +#include "streams.h" #include "tinyformat.h" #include "ui_interface.h" #include "utilstrencodings.h" diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h index 5b9b0e084..9619410e7 100644 --- a/src/wallet/wallet_ismine.h +++ b/src/wallet/wallet_ismine.h @@ -9,6 +9,8 @@ #include "key.h" #include "script/standard.h" +#include + class CKeyStore; class CScript; From 60c8bac77c6612b84e3496b2227a01058d720ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Sun, 5 Jul 2015 14:30:07 +0200 Subject: [PATCH 2/2] Includes: Cleanup around net main and wallet -Move from .h to .cpp: in main, net and wallet -Remove unnecessary #include "main.h" -Cleanup some wallet files includes --- src/bitcoind.cpp | 1 - src/main.cpp | 6 ++++++ src/main.h | 10 +--------- src/net.cpp | 4 +++- src/net.h | 3 --- src/qt/bitcoin.cpp | 1 - src/qt/clientmodel.cpp | 1 - src/qt/coincontroldialog.cpp | 2 +- src/qt/guiutil.cpp | 2 +- src/qt/optionsdialog.cpp | 2 +- src/qt/optionsmodel.cpp | 2 +- src/qt/paymentserver.cpp | 2 +- src/qt/peertablemodel.h | 2 +- src/qt/rpcconsole.cpp | 1 - src/qt/sendcoinsdialog.cpp | 2 +- src/test/alert_tests.cpp | 5 +---- src/test/checkblock_tests.cpp | 2 +- src/test/mempool_tests.cpp | 1 - src/test/pow_tests.cpp | 1 - src/test/script_tests.cpp | 1 - src/test/sighash_tests.cpp | 2 +- src/test/skiplist_tests.cpp | 1 - src/test/transaction_tests.cpp | 2 +- src/wallet/wallet.cpp | 4 ++++ src/wallet/wallet.h | 4 ---- src/wallet/wallet_ismine.h | 1 - src/wallet/walletdb.cpp | 2 +- src/wallet/walletdb.h | 1 - 28 files changed, 26 insertions(+), 42 deletions(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index cfa32d981..39bb301f4 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -7,7 +7,6 @@ #include "clientversion.h" #include "rpcserver.h" #include "init.h" -#include "main.h" #include "noui.h" #include "scheduler.h" #include "util.h" diff --git a/src/main.cpp b/src/main.cpp index 58c42cf96..cf0002cc3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,12 @@ #include "net.h" #include "policy/policy.h" #include "pow.h" +#include "primitives/block.h" +#include "primitives/transaction.h" +#include "script/script.h" +#include "script/sigcache.h" +#include "script/standard.h" +#include "tinyformat.h" #include "txdb.h" #include "txmempool.h" #include "ui_interface.h" diff --git a/src/main.h b/src/main.h index 78a139012..96ad54cda 100644 --- a/src/main.h +++ b/src/main.h @@ -12,19 +12,10 @@ #include "amount.h" #include "chain.h" -#include "chainparams.h" #include "coins.h" #include "net.h" -#include "primitives/block.h" -#include "primitives/transaction.h" -#include "script/script.h" #include "script/script_error.h" -#include "script/sigcache.h" -#include "script/standard.h" #include "sync.h" -#include "tinyformat.h" -#include "txmempool.h" -#include "uint256.h" #include #include @@ -42,6 +33,7 @@ class CBlockTreeDB; class CBloomFilter; class CInv; class CScriptCheck; +class CTxMemPool; class CValidationInterface; class CValidationState; diff --git a/src/net.cpp b/src/net.cpp index 3d369c7dd..e9fd74db4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -12,10 +12,12 @@ #include "addrman.h" #include "chainparams.h" #include "clientversion.h" +#include "crypto/common.h" +#include "hash.h" #include "primitives/transaction.h" #include "scheduler.h" #include "ui_interface.h" -#include "crypto/common.h" +#include "utilstrencodings.h" #ifdef WIN32 #include diff --git a/src/net.h b/src/net.h index 86d74e217..658f586b1 100644 --- a/src/net.h +++ b/src/net.h @@ -8,7 +8,6 @@ #include "bloom.h" #include "compat.h" -#include "hash.h" #include "limitedmap.h" #include "mruset.h" #include "netbase.h" @@ -17,7 +16,6 @@ #include "streams.h" #include "sync.h" #include "uint256.h" -#include "utilstrencodings.h" #include #include @@ -31,7 +29,6 @@ #include class CAddrMan; -class CBlockIndex; class CScheduler; class CNode; diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 36b9bc50a..708d86391 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -25,7 +25,6 @@ #endif #include "init.h" -#include "main.h" #include "rpcserver.h" #include "scheduler.h" #include "ui_interface.h" diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 92a9ef279..41dc2ea77 100644 --- a/src/qt/clientmodel.cpp +++ b/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" diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 764596df3..934d62d5f 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -15,7 +15,7 @@ #include "coincontrol.h" #include "init.h" -#include "main.h" +#include "main.h" // For minRelayTxFee #include "wallet/wallet.h" #include // for 'map_list_of()' diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 581d2321b..550dbacf9 100644 --- a/src/qt/guiutil.cpp +++ b/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" diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 173bed3b6..062c4540e 100644 --- a/src/qt/optionsdialog.cpp +++ b/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 diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index b4ce8191d..6191edc44 100644 --- a/src/qt/optionsmodel.cpp +++ b/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 diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 6481b0046..0827d9912 100644 --- a/src/qt/paymentserver.cpp +++ b/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" diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h index fcb89b761..5f149ea87 100644 --- a/src/qt/peertablemodel.h +++ b/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 diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 2fafb83d4..b2717558c 100644 --- a/src/qt/rpcconsole.cpp +++ b/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" diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 9841f6ced..2407fcbc4 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -17,7 +17,7 @@ #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" diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index 38dcc6023..b8d5606cc 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -2,17 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -// // Unit tests for alert system -// #include "alert.h" #include "chain.h" #include "chainparams.h" #include "clientversion.h" #include "data/alertTests.raw.h" - -#include "main.h" +#include "main.h" // For PartitionCheck #include "serialize.h" #include "streams.h" #include "util.h" diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index fe9fa86ab..f7e247061 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -4,7 +4,7 @@ #include "clientversion.h" #include "consensus/validation.h" -#include "main.h" +#include "main.h" // For CheckBlock #include "primitives/block.h" #include "test/test_bitcoin.h" #include "utiltime.h" diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 0996e13c4..2439689d7 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "main.h" #include "txmempool.h" #include "util.h" diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index 992f9c971..b6eb39bc3 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -4,7 +4,6 @@ #include "chain.h" #include "chainparams.h" -#include "main.h" #include "pow.h" #include "random.h" #include "util.h" diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index daf3d8989..37c046935 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -8,7 +8,6 @@ #include "core_io.h" #include "key.h" #include "keystore.h" -#include "main.h" #include "script/script.h" #include "script/script_error.h" #include "script/sign.h" diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 9fc227cfd..4b9646156 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -5,7 +5,7 @@ #include "consensus/validation.h" #include "data/sighash.json.h" #include "hash.h" -#include "main.h" +#include "main.h" // For CheckTransaction #include "random.h" #include "script/interpreter.h" #include "script/script.h" diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 8a061b0de..a904e3862 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -3,7 +3,6 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "chain.h" -#include "main.h" #include "random.h" #include "util.h" #include "test/test_bitcoin.h" diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 5f1af1f94..e70ebddc2 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -11,7 +11,7 @@ #include "core_io.h" #include "key.h" #include "keystore.h" -#include "main.h" +#include "main.h" // For CheckTransaction #include "policy/policy.h" #include "script/script.h" #include "script/script_error.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 5a52d931d..58b9ccc07 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -11,9 +11,13 @@ #include "coincontrol.h" #include "consensus/consensus.h" #include "consensus/validation.h" +#include "key.h" +#include "keystore.h" #include "main.h" #include "net.h" #include "policy/policy.h" +#include "primitives/block.h" +#include "primitives/transaction.h" #include "script/script.h" #include "script/sign.h" #include "timedata.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index de3232e56..ae007e467 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -7,10 +7,6 @@ #define BITCOIN_WALLET_WALLET_H #include "amount.h" -#include "key.h" -#include "keystore.h" -#include "primitives/block.h" -#include "primitives/transaction.h" #include "streams.h" #include "tinyformat.h" #include "ui_interface.h" diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h index 9619410e7..7846565f8 100644 --- a/src/wallet/wallet_ismine.h +++ b/src/wallet/wallet_ismine.h @@ -6,7 +6,6 @@ #ifndef BITCOIN_WALLET_WALLET_ISMINE_H #define BITCOIN_WALLET_WALLET_ISMINE_H -#include "key.h" #include "script/standard.h" #include diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index f777926e7..c1eb18458 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -7,7 +7,7 @@ #include "base58.h" #include "consensus/validation.h" -#include "main.h" +#include "main.h" // For CheckTransaction #include "protocol.h" #include "serialize.h" #include "sync.h" diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index bc1a104b5..270f826ae 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -9,7 +9,6 @@ #include "amount.h" #include "wallet/db.h" #include "key.h" -#include "keystore.h" #include #include