Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

a720b92 Remove includes in .cpp files for things the corresponding .h file already included (practicalswift)

Pull request description:

  Remove includes in .cpp files for things the corresponding .h file already included.

  Example case:
  * `addrdb.cpp` includes `addrdb.h` and `fs.h`
  * `addrdb.h` includes `fs.h`

  Then remove the direct inclusion of `fs.h` in `addrman.cpp` and rely on the indirect inclusion of `fs.h` via the included `addrdb.h`.

  In line with the header include guideline (see #10575).

Tree-SHA512: 8704b9de3011a4c234db336a39f7d2c139e741cf0f7aef08a5d3e05197e1e18286b863fdab25ae9638af4ff86b3d52e5cab9eed66bfa2476063aa5c79f9b0346

37 files changed, 0 insertions, 76 deletions

diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index 0f9ccf1e9a..7d7f34863d 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -8,7 +8,6 @@
 #include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
-#include <fs.h>
 #include <hash.h>
 #include <random.h>
 #include <streams.h>
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 2ef4dd8330..929d864588 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -8,7 +8,6 @@
 #include <chainparams.h>
 #include <reverse_iterator.h>
 #include <validation.h>
-#include <uint256.h>
 
 #include <stdint.h>
 
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index f7ded63e6a..1934e71bbc 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -6,7 +6,6 @@
 
 #include <tinyformat.h>
 
-#include <string>
 
 /**
  * Name of client reported in the 'version' message. Report the same name
diff --git a/src/coins.cpp b/src/coins.cpp
index 03138ef878..afaf5ccc13 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -5,11 +5,8 @@
 #include <coins.h>
 
 #include <consensus/consensus.h>
-#include <memusage.h>
 #include <random.h>
 
-#include <assert.h>
-
 bool CCoinsView::GetCoin(const COutPoint &outpoint, Coin &coin) const { return false; }
 uint256 CCoinsView::GetBestBlock() const { return uint256(); }
 std::vector<uint256> CCoinsView::GetHeadBlocks() const { return std::vector<uint256>(); }
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index eb29be05c5..6ff740f581 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -4,8 +4,6 @@
 
 #include <dbwrapper.h>
 
-#include <fs.h>
-#include <util.h>
 #include <random.h>
 
 #include <leveldb/cache.h>
diff --git a/src/key.cpp b/src/key.cpp
index 73983caf41..9d4c4498d8 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -7,7 +7,6 @@
 #include <arith_uint256.h>
 #include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
-#include <pubkey.h>
 #include <random.h>
 
 #include <secp256k1.h>
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 5718a14ca2..4ab089e032 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -5,8 +5,6 @@
 
 #include <keystore.h>
 
-#include <key.h>
-#include <pubkey.h>
 #include <util.h>
 
 bool CKeyStore::AddKey(const CKey &key) {
diff --git a/src/miner.cpp b/src/miner.cpp
index 397d99fc9a..0fb9b774d3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -22,7 +22,6 @@
 #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/net.cpp b/src/net.cpp
index 8a101b2cf2..c0f31e83dd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -9,13 +9,11 @@
 
 #include <net.h>
 
-#include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <consensus/consensus.h>
 #include <crypto/common.h>
 #include <crypto/sha256.h>
-#include <hash.h>
 #include <primitives/transaction.h>
 #include <netbase.h>
 #include <scheduler.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 99b96a988a..359489e653 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -14,7 +14,6 @@
 #include <init.h>
 #include <validation.h>
 #include <merkleblock.h>
-#include <net.h>
 #include <netmessagemaker.h>
 #include <netbase.h>
 #include <policy/fees.h>
@@ -30,7 +29,6 @@
 #include <util.h>
 #include <utilmoneystr.h>
 #include <utilstrencodings.h>
-#include <validationinterface.h>
 
 #if defined(NDEBUG)
 # error "Bitcoin cannot be compiled without assertions."
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index 3ef3c67ae4..fa1c191559 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -3,10 +3,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifdef HAVE_CONFIG_H
-#include <config/bitcoin-config.h>
-#endif
-
 #include <netaddress.h>
 #include <hash.h>
 #include <utilstrencodings.h>
diff --git a/src/netbase.cpp b/src/netbase.cpp
index bd1eaf062f..da3729b286 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -3,10 +3,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifdef HAVE_CONFIG_H
-#include <config/bitcoin-config.h>
-#endif
-
 #include <netbase.h>
 
 #include <hash.h>
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 013116318b..dc88c4f91a 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -6,10 +6,8 @@
 #include <policy/fees.h>
 #include <policy/policy.h>
 
-#include <amount.h>
 #include <clientversion.h>
 #include <primitives/transaction.h>
-#include <random.h>
 #include <streams.h>
 #include <txmempool.h>
 #include <util.h>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index cd3234c564..f925ec5359 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -2,10 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <qt/bitcoingui.h>
 
 #include <qt/bitcoinunits.h>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 03e633e375..49f4e74a9f 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -28,9 +28,7 @@
 #include <QFlags>
 #include <QIcon>
 #include <QSettings>
-#include <QString>
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
 
 QList<CAmount> CoinControlDialog::payAmounts;
 CCoinControl* CoinControlDialog::coinControl = new CCoinControl();
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 80ee35a341..eb5d3304af 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -9,7 +9,6 @@
 #include <qt/qvalidatedlineedit.h>
 #include <qt/walletmodel.h>
 
-#include <fs.h>
 #include <primitives/transaction.h>
 #include <init.h>
 #include <policy/policy.h>
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 4f8732a9ce..f4383bf679 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -6,7 +6,6 @@
 
 #include <QApplication>
 #include <QByteArray>
-#include <QIcon>
 #include <QImageWriter>
 #include <QMessageBox>
 #include <QMetaType>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 52b4d4e42e..c9e4f517c7 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -11,7 +11,6 @@
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 
-#include <amount.h>
 #include <init.h>
 #include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS
 #include <net.h>
diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp
index cc8ea3622b..0e1bd59ada 100644
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@@ -8,10 +8,8 @@
 
 #include <QApplication>
 #include <QColor>
-#include <QIcon>
 #include <QImage>
 #include <QPalette>
-#include <QPixmap>
 
 static const struct {
     const char *platformId;
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index d6e2beb312..e9dcbc0a72 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -8,7 +8,6 @@
 #include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
 #include <qt/bitcoinunits.h>
-#include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/receiverequestdialog.h>
@@ -17,7 +16,6 @@
 
 #include <QAction>
 #include <QCursor>
-#include <QItemSelection>
 #include <QMessageBox>
 #include <QScrollBar>
 #include <QTextDocument>
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index c69fea1c93..d30e9b2dca 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -9,7 +9,6 @@
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
-#include <qt/walletmodel.h>
 
 #include <QClipboard>
 #include <QDrag>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 54a6e837c1..0b90205270 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -11,7 +11,6 @@
 
 #include <qt/bantablemodel.h>
 #include <qt/clientmodel.h>
-#include <qt/guiutil.h>
 #include <qt/platformstyle.h>
 #include <chainparams.h>
 #include <netbase.h>
@@ -35,7 +34,6 @@
 #include <QScrollBar>
 #include <QSettings>
 #include <QSignalMapper>
-#include <QThread>
 #include <QTime>
 #include <QTimer>
 #include <QStringList>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index e2b9177885..2a46cdab8c 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -13,7 +13,6 @@
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/sendcoinsentry.h>
-#include <qt/walletmodel.h>
 
 #include <base58.h>
 #include <chainparams.h>
@@ -25,11 +24,9 @@
 #include <wallet/fees.h>
 
 #include <QFontMetrics>
-#include <QMessageBox>
 #include <QScrollBar>
 #include <QSettings>
 #include <QTextDocument>
-#include <QTimer>
 
 static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
 int getConfTargetForIndex(int index) {
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 20e39bdeba..4cf4bb9ef7 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -10,7 +10,6 @@
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
-#include <qt/walletmodel.h>
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index ada73a73df..47890fc7e2 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -9,8 +9,6 @@
 
 #include <cstdlib>
 
-#include <QDateTime>
-
 // Earliest date that can be represented (far in the past)
 const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0);
 // Last date that can be represented (far in the future)
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 4d2aac12f0..b7e39e05ec 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -8,7 +8,6 @@
 #include <qt/bitcoinunits.h>
 #include <qt/csvmodelwriter.h>
 #include <qt/editaddressdialog.h>
-#include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/sendcoinsdialog.h>
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index a595b6ec27..f2fa114313 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -10,8 +10,6 @@
 #include <set>
 #include <stdint.h>
 
-#include <univalue.h>
-
 class CRPCConvertParam
 {
 public:
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 1753ecd3fc..d003be4954 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -29,8 +29,6 @@
 #include <memory>
 #include <stdint.h>
 
-#include <univalue.h>
-
 unsigned int ParseConfirmTarget(const UniValue& value)
 {
     int target = value.get_int();
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index 4cb28c2104..d999a08d74 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -12,7 +12,6 @@
 #include <utiltime.h>
 #include <version.h>
 
-#include <stdint.h>
 #include <fstream>
 
 /**
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 0e4cd41689..2e7e0ba474 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -14,8 +14,6 @@
 #include <util.h>
 #include <utilstrencodings.h>
 
-#include <univalue.h>
-
 #include <boost/bind.hpp>
 #include <boost/signals2/signal.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 9091af4c0c..3c3f92fe46 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -5,7 +5,6 @@
 
 #include <script/interpreter.h>
 
-#include <primitives/transaction.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 60bef3b701..5849f55651 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -8,7 +8,6 @@
 #include <key.h>
 #include <keystore.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <script/sign.h>
 
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 419106194e..f52c8ccc21 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -8,15 +8,9 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <crypto/sha256.h>
-#include <fs.h>
-#include <key.h>
 #include <validation.h>
 #include <miner.h>
 #include <net_processing.h>
-#include <pubkey.h>
-#include <random.h>
-#include <txdb.h>
-#include <txmempool.h>
 #include <ui_interface.h>
 #include <streams.h>
 #include <rpc/server.h>
diff --git a/src/util.cpp b/src/util.cpp
index 1aa18c73b3..a3e4b0acfb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,18 +3,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <util.h>
 
 #include <chainparamsbase.h>
-#include <fs.h>
 #include <random.h>
 #include <serialize.h>
 #include <utilstrencodings.h>
-#include <utiltime.h>
 
 #include <stdarg.h>
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 946a916e82..75c40b22fc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -15,7 +15,6 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <cuckoocache.h>
-#include <fs.h>
 #include <hash.h>
 #include <init.h>
 #include <policy/fees.h>
@@ -39,10 +38,8 @@
 #include <utilmoneystr.h>
 #include <utilstrencodings.h>
 #include <validationinterface.h>
-#include <versionbits.h>
 #include <warnings.h>
 
-#include <atomic>
 #include <sstream>
 
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 79ff27279c..d4cd30dfac 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -6,7 +6,6 @@
 #include <wallet/db.h>
 
 #include <addrman.h>
-#include <fs.h>
 #include <hash.h>
 #include <protocol.h>
 #include <util.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index cb81ec37f5..bbaba8e1bd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -23,12 +23,10 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
-#include <script/sign.h>
 #include <scheduler.h>
 #include <timedata.h>
 #include <txmempool.h>
 #include <util.h>
-#include <ui_interface.h>
 #include <utilmoneystr.h>
 #include <wallet/fees.h>