From 7193245cd66791216d4e586ca09302b26d4b7528 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 18 Feb 2025 10:29:51 +0000
Subject: [PATCH] doc: remove For ... comments

We don't add or maintain these, and they are of little value, as
well as having the effect of polluting diffs.

They are also wrong, i.e DEFAULT_SCRIPTCHECK_THREADS is not in
validation.h.
---
 src/banman.h                       |  4 ++--
 src/common/args.cpp                |  8 ++++----
 src/crypto/sha3.cpp                |  7 +++----
 src/cuckoocache.h                  |  2 +-
 src/headerssync.h                  |  4 ++--
 src/httpserver.cpp                 |  6 ++++--
 src/index/base.cpp                 |  7 ++++++-
 src/interfaces/chain.h             |  9 +++++----
 src/interfaces/mining.h            | 24 ++++++++++++------------
 src/interfaces/node.h              | 16 ++++++++--------
 src/qt/bantablemodel.cpp           |  4 ++--
 src/qt/guiutil.cpp                 |  4 ++--
 src/qt/optionsmodel.cpp            |  9 ++++-----
 src/qt/peertablemodel.h            |  4 ++--
 src/qt/signverifymessagedialog.cpp |  6 ++++--
 src/qt/walletmodel.cpp             | 10 ++++++----
 src/rpc/net.cpp                    | 11 +++++++----
 src/support/lockedpool.cpp         |  9 ++++-----
 src/test/util_tests.cpp            | 11 ++++++-----
 src/txrequest.h                    |  8 ++++----
 src/util/fs_helpers.cpp            |  6 +++---
 src/validation.h                   |  2 +-
 src/validationinterface.h          |  4 ++--
 src/wallet/migrate.cpp             |  7 ++++++-
 src/wallet/spend.h                 |  9 +++++++--
 src/wallet/test/db_tests.cpp       |  7 ++++++-
 26 files changed, 113 insertions(+), 85 deletions(-)

diff --git a/src/banman.h b/src/banman.h
index 23e19506df6..93149e63c5a 100644
--- a/src/banman.h
+++ b/src/banman.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_BANMAN_H
@@ -7,7 +7,7 @@
 
 #include <addrdb.h>
 #include <common/bloom.h>
-#include <net_types.h> // For banmap_t
+#include <net_types.h>
 #include <sync.h>
 #include <util/fs.h>
 
diff --git a/src/common/args.cpp b/src/common/args.cpp
index 1e3f6d1b88d..71dcd1ac10c 100644
--- a/src/common/args.cpp
+++ b/src/common/args.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -19,9 +19,9 @@
 #include <util/string.h>
 
 #ifdef WIN32
-#include <codecvt>    /* for codecvt_utf8_utf16 */
-#include <shellapi.h> /* for CommandLineToArgvW */
-#include <shlobj.h>   /* for CSIDL_APPDATA */
+#include <codecvt>
+#include <shellapi.h>
+#include <shlobj.h>
 #endif
 
 #include <algorithm>
diff --git a/src/crypto/sha3.cpp b/src/crypto/sha3.cpp
index 77ea2a8ebfb..4c61bce5f62 100644
--- a/src/crypto/sha3.cpp
+++ b/src/crypto/sha3.cpp
@@ -7,13 +7,12 @@
 
 #include <crypto/sha3.h>
 #include <crypto/common.h>
-#include <span.h>
 
 #include <algorithm>
-#include <array> // For std::begin and std::end.
+#include <array>
 #include <bit>
-
-#include <stdint.h>
+#include <cstdint>
+#include <span>
 
 void KeccakF(uint64_t (&st)[25])
 {
diff --git a/src/cuckoocache.h b/src/cuckoocache.h
index 83701793952..281efbd0696 100644
--- a/src/cuckoocache.h
+++ b/src/cuckoocache.h
@@ -7,7 +7,7 @@
 
 #include <util/fastrange.h>
 
-#include <algorithm> // std::find
+#include <algorithm>
 #include <array>
 #include <atomic>
 #include <cmath>
diff --git a/src/headerssync.h b/src/headerssync.h
index 5e399eb8615..2e7017f115d 100644
--- a/src/headerssync.h
+++ b/src/headerssync.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 The Bitcoin Core developers
+// Copyright (c) 2022-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -8,7 +8,7 @@
 #include <arith_uint256.h>
 #include <chain.h>
 #include <consensus/params.h>
-#include <net.h> // For NodeId
+#include <net.h>
 #include <primitives/block.h>
 #include <uint256.h>
 #include <util/bitdeque.h>
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index bd2dec19b97..6bfeba90b36 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2022 The Bitcoin Core developers
+// Copyright (c) 2015-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -11,7 +11,7 @@
 #include <logging.h>
 #include <netbase.h>
 #include <node/interface_ui.h>
-#include <rpc/protocol.h> // For HTTP status codes
+#include <rpc/protocol.h>
 #include <sync.h>
 #include <util/check.h>
 #include <util/signalinterrupt.h>
@@ -27,7 +27,9 @@
 #include <optional>
 #include <span>
 #include <string>
+#include <thread>
 #include <unordered_map>
+#include <vector>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/index/base.cpp b/src/index/base.cpp
index 1169a1c86b7..5767116ce53 100644
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -17,9 +17,14 @@
 #include <util/string.h>
 #include <util/thread.h>
 #include <util/translation.h>
-#include <validation.h> // For g_chainman
+#include <validation.h>
 
+#include <chrono>
+#include <memory>
+#include <optional>
+#include <stdexcept>
 #include <string>
+#include <thread>
 #include <utility>
 
 constexpr uint8_t DB_BEST_BLOCK{'B'};
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h
index 6945416cced..de99262e982 100644
--- a/src/interfaces/chain.h
+++ b/src/interfaces/chain.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -7,14 +7,15 @@
 
 #include <blockfilter.h>
 #include <common/settings.h>
-#include <primitives/transaction.h> // For CTransactionRef
+#include <primitives/transaction.h>
 #include <util/result.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
+#include <map>
 #include <memory>
 #include <optional>
-#include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <vector>
 
diff --git a/src/interfaces/mining.h b/src/interfaces/mining.h
index 95658dd95b2..3ecb86e8ea1 100644
--- a/src/interfaces/mining.h
+++ b/src/interfaces/mining.h
@@ -1,22 +1,22 @@
-// Copyright (c) 2024 The Bitcoin Core developers
+// Copyright (c) 2024-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_INTERFACES_MINING_H
 #define BITCOIN_INTERFACES_MINING_H
 
-#include <consensus/amount.h>       // for CAmount
-#include <interfaces/types.h>       // for BlockRef
-#include <node/types.h>             // for BlockCreateOptions, BlockWaitOptions
-#include <primitives/block.h>       // for CBlock, CBlockHeader
-#include <primitives/transaction.h> // for CTransactionRef
-#include <stdint.h>                 // for int64_t
-#include <uint256.h>                // for uint256
-#include <util/time.h>              // for MillisecondsDouble
+#include <consensus/amount.h>
+#include <interfaces/types.h>
+#include <node/types.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <uint256.h>
+#include <util/time.h>
 
-#include <memory>   // for unique_ptr, shared_ptr
-#include <optional> // for optional
-#include <vector>   // for vector
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <vector>
 
 namespace node {
 struct NodeContext;
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index b7bcb431214..a17aa4afefc 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -6,13 +6,13 @@
 #define BITCOIN_INTERFACES_NODE_H
 
 #include <common/settings.h>
-#include <consensus/amount.h>          // For CAmount
-#include <logging.h>                   // For BCLog::CategoryMask
-#include <net.h>                       // For NodeId
-#include <net_types.h>                 // For banmap_t
-#include <netaddress.h>                // For Network
-#include <netbase.h>                   // For ConnectionDirection
-#include <support/allocators/secure.h> // For SecureString
+#include <consensus/amount.h>
+#include <logging.h>
+#include <net.h>
+#include <net_types.h>
+#include <netaddress.h>
+#include <netbase.h>
+#include <support/allocators/secure.h>
 #include <util/translation.h>
 
 #include <functional>
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 4592d29abc9..d19d30fc410 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -1,11 +1,11 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qt/bantablemodel.h>
 
 #include <interfaces/node.h>
-#include <net_types.h> // For banmap_t
+#include <net_types.h>
 
 #include <utility>
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index c1bf5a56032..adf54953675 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -64,7 +64,7 @@
 #include <QSize>
 #include <QStandardPaths>
 #include <QString>
-#include <QTextDocument> // for Qt::mightBeRichText
+#include <QTextDocument>
 #include <QThread>
 #include <QUrlQuery>
 #include <QtGlobal>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 5782a57a265..3d876a8f63b 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -17,9 +17,10 @@
 #include <netbase.h>
 #include <node/caches.h>
 #include <node/chainstatemanager_args.h>
+#include <univalue.h>
 #include <util/string.h>
-#include <validation.h>    // For DEFAULT_SCRIPTCHECK_THREADS
-#include <wallet/wallet.h> // For DEFAULT_SPEND_ZEROCONF_CHANGE
+#include <validation.h>
+#include <wallet/wallet.h>
 
 #include <QDebug>
 #include <QLatin1Char>
@@ -27,8 +28,6 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <univalue.h>
-
 const char *DEFAULT_GUI_PROXY_HOST = "127.0.0.1";
 
 static QString GetDefaultProxyAddress();
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
index a0174c3af40..5bc8c094e9b 100644
--- a/src/qt/peertablemodel.h
+++ b/src/qt/peertablemodel.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_QT_PEERTABLEMODEL_H
 #define BITCOIN_QT_PEERTABLEMODEL_H
 
-#include <net_processing.h> // For CNodeStateStats
+#include <net_processing.h>
 #include <net.h>
 
 #include <QAbstractTableModel>
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index e46fe061624..e87f1b84f67 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,11 +10,13 @@
 #include <qt/platformstyle.h>
 #include <qt/walletmodel.h>
 
-#include <common/signmessage.h> // For MessageSign(), MessageVerify()
+#include <common/signmessage.h>
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 #include <key_io.h>
 #include <wallet/wallet.h>
 
+#include <string>
+#include <variant>
 #include <vector>
 
 #include <QClipboard>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 81af94ac8e9..a2fb50739a5 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -14,7 +14,7 @@
 #include <qt/sendcoinsdialog.h>
 #include <qt/transactiontablemodel.h>
 
-#include <common/args.h> // for GetBoolArg
+#include <common/args.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <key_io.h>
@@ -23,10 +23,12 @@
 #include <psbt.h>
 #include <util/translation.h>
 #include <wallet/coincontrol.h>
-#include <wallet/wallet.h> // for CRecipient
+#include <wallet/wallet.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
+#include <memory>
+#include <vector>
 
 #include <QDebug>
 #include <QMessageBox>
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index d46e3e99132..2739b0d7dd0 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -12,7 +12,7 @@
 #include <core_io.h>
 #include <net_permissions.h>
 #include <net_processing.h>
-#include <net_types.h> // For banmap_t
+#include <net_types.h>
 #include <netbase.h>
 #include <node/context.h>
 #include <node/protocol_version.h>
@@ -24,6 +24,7 @@
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <sync.h>
+#include <univalue.h>
 #include <util/chaintype.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -31,9 +32,11 @@
 #include <util/translation.h>
 #include <validation.h>
 
+#include <chrono>
 #include <optional>
-
-#include <univalue.h>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 using node::NodeContext;
 using util::Join;
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index 01eef2b93d3..cbb117fc3e1 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2022 The Bitcoin Core developers
+// Copyright (c) 2016-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -8,10 +8,9 @@
 #ifdef WIN32
 #include <windows.h>
 #else
-#include <sys/mman.h> // for mmap
-#include <sys/resource.h> // for getrlimit
-#include <limits.h> // for PAGESIZE
-#include <unistd.h> // for sysconf
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <unistd.h>
 #endif
 
 #include <algorithm>
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index dc0e630a225..df481ff3f57 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <clientversion.h>
-#include <common/signmessage.h> // For MessageSign(), MessageVerify(), MESSAGE_MAGIC
-#include <hash.h> // For Hash()
-#include <key.h>  // For CKey
+#include <common/signmessage.h>
+#include <hash.h>
+#include <key.h>
 #include <script/parsing.h>
 #include <span.h>
 #include <sync.h>
@@ -26,12 +26,13 @@
 
 #include <array>
 #include <cmath>
+#include <cstdint>
+#include <cstring>
 #include <fstream>
 #include <limits>
 #include <map>
 #include <optional>
-#include <stdint.h>
-#include <string.h>
+#include <string>
 #include <thread>
 #include <univalue.h>
 #include <utility>
diff --git a/src/txrequest.h b/src/txrequest.h
index 10667554355..98ad43b79aa 100644
--- a/src/txrequest.h
+++ b/src/txrequest.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020 The Bitcoin Core developers
+// Copyright (c) 2020-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -6,14 +6,14 @@
 #define BITCOIN_TXREQUEST_H
 
 #include <primitives/transaction.h>
-#include <net.h> // For NodeId
+#include <net.h>
 #include <uint256.h>
 
 #include <chrono>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
-#include <stdint.h>
-
 /** Data structure to keep track of, and schedule, transaction downloads from peers.
  *
  * === Specification ===
diff --git a/src/util/fs_helpers.cpp b/src/util/fs_helpers.cpp
index 4d06afe1442..ec848155651 100644
--- a/src/util/fs_helpers.cpp
+++ b/src/util/fs_helpers.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2023 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -37,8 +37,8 @@
 #include <sys/resource.h>
 #include <unistd.h>
 #else
-#include <io.h> /* For _get_osfhandle, _chsize */
-#include <shlobj.h> /* For SHGetSpecialFolderPathW */
+#include <io.h>
+#include <shlobj.h>
 #endif // WIN32
 
 /** Mutex to protect dir_locks. */
diff --git a/src/validation.h b/src/validation.h
index 7411ab400c2..5b488ba4b53 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -25,7 +25,7 @@
 #include <script/sigcache.h>
 #include <sync.h>
 #include <txdb.h>
-#include <txmempool.h> // For CTxMemPool::cs
+#include <txmempool.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/fs.h>
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 3cf75aa210d..36698fec4e7 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -8,7 +8,7 @@
 
 #include <kernel/chain.h>
 #include <kernel/cs_main.h>
-#include <primitives/transaction.h> // CTransaction(Ref)
+#include <primitives/transaction.h>
 #include <sync.h>
 
 #include <cstddef>
diff --git a/src/wallet/migrate.cpp b/src/wallet/migrate.cpp
index aab31f7ab15..603a0d2bab1 100644
--- a/src/wallet/migrate.cpp
+++ b/src/wallet/migrate.cpp
@@ -1,15 +1,20 @@
+// Copyright (c) 2024-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <compat/byteswap.h>
-#include <crypto/common.h> // For ReadBE32
+#include <crypto/common.h>
 #include <logging.h>
 #include <streams.h>
 #include <util/translation.h>
 #include <wallet/migrate.h>
 
+#include <array>
+#include <cstddef>
 #include <optional>
+#include <stdexcept>
 #include <variant>
+#include <vector>
 
 namespace wallet {
 // Magic bytes in both endianness's
diff --git a/src/wallet/spend.h b/src/wallet/spend.h
index 62a7b4e4c89..bdbfd750954 100644
--- a/src/wallet/spend.h
+++ b/src/wallet/spend.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 The Bitcoin Core developers
+// Copyright (c) 2021-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -6,13 +6,18 @@
 #define BITCOIN_WALLET_SPEND_H
 
 #include <consensus/amount.h>
-#include <policy/fees.h> // for FeeCalculation
+#include <policy/fees.h>
 #include <util/result.h>
 #include <wallet/coinselection.h>
 #include <wallet/transaction.h>
 #include <wallet/wallet.h>
 
+#include <map>
+#include <memory>
 #include <optional>
+#include <set>
+#include <unordered_set>
+#include <vector>
 
 namespace wallet {
 /** Get the marginal bytes if spending the specified output from this transaction.
diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
index cef1ec8b39a..8b71634ed80 100644
--- a/src/wallet/test/db_tests.cpp
+++ b/src/wallet/test/db_tests.cpp
@@ -11,11 +11,16 @@
 #include <wallet/sqlite.h>
 #include <wallet/migrate.h>
 #include <wallet/test/util.h>
-#include <wallet/walletutil.h> // for WALLET_FLAG_DESCRIPTORS
+#include <wallet/walletutil.h>
 
+#include <cstddef>
 #include <fstream>
 #include <memory>
+#include <span>
 #include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 inline std::ostream& operator<<(std::ostream& os, const std::pair<const SerializeData, SerializeData>& kv)
 {