fix: add missing includes and remove obsolete includes

src/bench/addrman.cpp

@@ -7,7 +7,6 @@
 #include <random.h>
 #include <util/time.h>
 
-#include <optional>
 #include <vector>
 
 /* A "source" is a source address from which we have received a bunch of other addresses. */

src/bitcoin-tx.cpp

@@ -25,6 +25,7 @@
 
 #include <functional>
 #include <memory>
+#include <optional>
 #include <stdio.h>
 
 #include <stacktraces.h>

src/bitcoind.cpp

@@ -26,7 +26,6 @@
 #include <util/url.h>
 
 #include <functional>
-#include <optional>
 #include <stdio.h>
 
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;

src/chainparams.h

@@ -15,6 +15,7 @@
 #include <util/hash_type.h>
 
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 

src/coinjoin/client.h

@@ -9,8 +9,9 @@
 #include <coinjoin/coinjoin.h>
 #include <util/translation.h>
 
-#include <utility>
 #include <atomic>
+#include <deque>
+#include <utility>
 
 class CDeterministicMN;
 using CDeterministicMNCPtr = std::shared_ptr<const CDeterministicMN>;

src/coinjoin/coinjoin.h

@@ -17,6 +17,8 @@
 #include <util/translation.h>
 #include <version.h>
 
+#include <atomic>
+#include <optional>
 #include <utility>
 
 class CCoinJoin;

src/consensus/params.h

@@ -10,7 +10,6 @@
 #include <llmq/params.h>
 
 #include <limits>
-#include <map>
 
 namespace Consensus {
 

src/dbwrapper.cpp

@@ -13,6 +13,7 @@
 #include <memenv.h>
 #include <stdint.h>
 #include <algorithm>
+#include <optional>
 
 class CBitcoinLevelDBLogger : public leveldb::Logger {
 public:

src/evo/cbtx.h

@@ -9,6 +9,8 @@
 #include <primitives/transaction.h>
 #include <univalue.h>
 
+#include <optional>
+
 class BlockValidationState;
 class CBlock;
 class CBlockIndex;

src/evo/deterministicmns.h

@@ -19,6 +19,7 @@
 
 #include <immer/map.hpp>
 
+#include <atomic>
 #include <limits>
 #include <numeric>
 #include <unordered_map>

src/evo/mnauth.cpp

@@ -17,8 +17,6 @@
 #include <netmessagemaker.h>
 #include <validation.h>
 
-#include <unordered_set>
-
 void CMNAuth::PushMNAUTH(CNode& peer, CConnman& connman, const CBlockIndex* tip)
 {
     LOCK(activeMasternodeInfoCs);

src/index/base.h

@@ -11,6 +11,8 @@
 #include <threadinterrupt.h>
 #include <validationinterface.h>
 
+#include <atomic>
+
 class CBlockIndex;
 class CChainState;
 

src/init.cpp

@@ -102,6 +102,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <memory>
+#include <optional>
 #include <set>
 #include <thread>
 #include <vector>

src/llmq/chainlocks.h

@@ -17,6 +17,8 @@
 #include <sync.h>
 
 #include <atomic>
+#include <map>
+#include <unordered_map>
 #include <unordered_set>
 
 class CChainState;

src/llmq/dkgsession.cpp

@@ -19,6 +19,7 @@
 #include <validation.h>
 
 #include <cxxtimer.hpp>
+#include <atomic>
 #include <memory>
 #include <util/irange.h>
 #include <util/underlying.h>

src/llmq/dkgsessionhandler.h

@@ -9,6 +9,8 @@
 #include <ctpl_stl.h>
 #include <net.h>
 
+#include <atomic>
+#include <map>
 #include <optional>
 
 class CBlockIndex;

src/llmq/dkgsessionmgr.h

@@ -10,6 +10,9 @@
 #include <bls/bls.h>
 #include <bls/bls_worker.h>
 
+#include <map>
+#include <memory>
+
 class CBlockIndex;
 class CChainState;
 class CDKGDebugManager;

src/llmq/instantsend.h

@@ -15,6 +15,7 @@
 #include <threadinterrupt.h>
 #include <txmempool.h>
 
+#include <atomic>
 #include <unordered_map>
 #include <unordered_set>
 

src/llmq/quorums.h

@@ -16,6 +16,9 @@
 
 #include <evo/evodb.h>
 
+#include <atomic>
+#include <map>
+
 class CBlockIndex;
 class CChainState;
 class CConnman;

src/llmq/signing_shares.h

@@ -14,6 +14,7 @@
 #include <sync.h>
 #include <uint256.h>
 
+#include <atomic>
 #include <optional>
 #include <thread>
 #include <unordered_map>

src/llmq/utils.cpp

@@ -22,6 +22,7 @@
 #include <validation.h>
 #include <versionbits.h>
 
+#include <atomic>
 #include <optional>
 
 static constexpr int TESTNET_LLMQ_25_67_ACTIVATION_HEIGHT = 847000;

src/net.h

@@ -36,7 +36,6 @@
 #include <thread>
 #include <memory>
 #include <condition_variable>
-#include <unordered_set>
 #include <optional>
 #include <queue>
 

src/net_processing.cpp

@@ -34,6 +34,7 @@
 
 #include <list>
 #include <memory>
+#include <optional>
 #include <typeinfo>
 
 #include <spork.h>

src/net_processing.h

@@ -10,6 +10,8 @@
 #include <sync.h>
 #include <validationinterface.h>
 
+#include <atomic>
+
 class CAddrMan;
 class CTxMemPool;
 class ChainstateManager;

src/node/blockstorage.h

@@ -8,7 +8,6 @@
 #include <fs.h>
 #include <protocol.h> // For CMessageHeader::MessageStartChars
 
-#include <atomic>
 #include <cstdint>
 #include <vector>
 

src/node/coinstats.h

@@ -14,6 +14,7 @@
 
 #include <cstdint>
 #include <functional>
+#include <optional>
 
 class BlockManager;
 class CCoinsView;

src/node/interfaces.cpp

@@ -60,6 +60,7 @@
 #include <boost/signals2/signal.hpp>
 
 #include <memory>
+#include <optional>
 #include <utility>
 
 using interfaces::BlockTip;

src/protocol.cpp

@@ -7,6 +7,8 @@
 
 #include <util/system.h>
 
+#include <atomic>
+
 static std::atomic<bool> g_initial_block_download_completed(false);
 
 #define MAKE_MSG(var_name, p2p_name_str)   \

src/rpc/blockchain.cpp

@@ -51,6 +51,7 @@
 
 #include <merkleblock.h>
 
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
 

src/rpc/misc.cpp

@@ -33,7 +33,6 @@
 #include <spork.h>
 
 #include <stdint.h>
-#include <tuple>
 #ifdef HAVE_MALLOC_INFO
 #include <malloc.h>
 #endif

src/rpc/net.cpp

@@ -27,8 +27,6 @@
 #include <version.h>
 #include <warnings.h>
 
-#include <optional>
-
 #include <univalue.h>
 
 static UniValue getconnectioncount(const JSONRPCRequest& request)

src/rpc/quorums.cpp

@@ -25,6 +25,7 @@
 #include <llmq/snapshot.h>
 
 #include <iomanip>
+#include <optional>
 
 namespace llmq {
 extern const std::string CLSIG_REQUESTID_PREFIX;

src/rpc/server.cpp

@@ -17,6 +17,7 @@
 #include <boost/signals2/signal.hpp>
 
 #include <algorithm>
+#include <atomic>
 #include <memory> // for unique_ptr
 #include <unordered_map>
 

src/rpc/util.cpp

@@ -15,8 +15,6 @@
 #include <util/string.h>
 #include <util/translation.h>
 
-#include <tuple>
-
 const std::string UNIX_EPOCH_TIME = "UNIX epoch time";
 const std::string EXAMPLE_ADDRESS[2] = {"XunLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPw0", "XwQQkwA4FYkq2XERzMY2CiAZhJTEDAbtc0"};
 

src/test/addrman_tests.cpp

@@ -13,7 +13,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <optional>
 #include <string>
 
 class CAddrManTest : public CAddrMan

src/test/checkqueue_tests.cpp

@@ -14,7 +14,6 @@
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 

src/test/descriptor_tests.cpp

@@ -10,6 +10,7 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include <optional>
 #include <string>
 #include <vector>
 

src/test/evo_assetlocks_tests.cpp

@@ -16,7 +16,6 @@
 #include <boost/test/unit_test.hpp>
 
 
-#include <optional>
 //
 // Helper: create two dummy transactions, each with
 // two outputs.  The first has 11 and 50 CENT outputs

src/test/fuzz/autofile.cpp

@@ -10,7 +10,6 @@
 #include <array>
 #include <cstdint>
 #include <iostream>
-#include <optional>
 #include <string>
 #include <vector>
 

src/test/fuzz/integer.cpp

@@ -38,6 +38,7 @@
 #include <chrono>
 #include <ctime>
 #include <limits>
+#include <optional>
 #include <set>
 #include <vector>
 

src/test/fuzz/rolling_bloom_filter.cpp

@@ -10,7 +10,6 @@
 
 #include <cassert>
 #include <cstdint>
-#include <optional>
 #include <string>
 #include <vector>
 

src/test/fuzz/script_descriptor_cache.cpp

@@ -9,7 +9,6 @@
 #include <test/fuzz/util.h>
 
 #include <cstdint>
-#include <optional>
 #include <string>
 #include <vector>
 

src/util/enumerate.h

@@ -5,7 +5,6 @@
 #ifndef BITCOIN_UTIL_ENUMERATE_H
 #define BITCOIN_UTIL_ENUMERATE_H
 
-#include <tuple>
 #include <iterator>
 
 /**

src/util/overflow.h

@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_OVERFLOW_H
 
 #include <limits>
+#include <optional>
 #include <type_traits>
 
 template <class T>

src/util/system.cpp

@@ -35,6 +35,7 @@
 #endif // __linux__
 
 #include <algorithm>
+#include <atomic>
 #include <cassert>
 #include <fcntl.h>
 #include <sched.h>

src/validation.cpp

@@ -62,6 +62,7 @@
 
 #include <statsd_client.h>
 
+#include <deque>
 #include <optional>
 #include <string>
 

src/wallet/bdb.h

@@ -13,7 +13,6 @@
 #include <util/system.h>
 #include <wallet/db.h>
 
-#include <atomic>
 #include <map>
 #include <memory>
 #include <string>