Remove version.h include from primitive headers

Use where actually needed instead.

src/bench/checkblock.cpp

@@ -11,6 +11,7 @@
 #include <streams.h>
 #include <util/chaintype.h>
 #include <validation.h>
+#include <version.h>
 
 // These are the two major time-sinks which happen after we have fully received
 // a block off the wire, but before we can relay the block on to peers using

src/bench/rpc_blockchain.cpp

@@ -10,6 +10,7 @@
 #include <test/util/setup_common.h>
 #include <util/chaintype.h>
 #include <validation.h>
+#include <version.h>
 
 #include <univalue.h>
 

src/bench/verify_script.cpp

@@ -11,6 +11,7 @@
 #include <script/interpreter.h>
 #include <streams.h>
 #include <test/util/transaction_utils.h>
+#include <version.h>
 
 #include <array>
 

src/blockencodings.cpp

@@ -14,6 +14,7 @@
 #include <streams.h>
 #include <txmempool.h>
 #include <validation.h>
+#include <version.h>
 
 #include <unordered_map>
 

src/consensus/validation.h

@@ -7,7 +7,6 @@
 #define BITCOIN_CONSENSUS_VALIDATION_H
 
 #include <string>
-#include <version.h>
 #include <consensus/consensus.h>
 #include <primitives/transaction.h>
 #include <primitives/block.h>

src/external_signer.cpp

@@ -8,6 +8,7 @@
 #include <psbt.h>
 #include <util/strencodings.h>
 #include <external_signer.h>
+#include <version.h>
 
 #include <algorithm>
 #include <stdexcept>

src/hash.h

@@ -14,7 +14,6 @@
 #include <serialize.h>
 #include <span.h>
 #include <uint256.h>
-#include <version.h>
 
 #include <string>
 #include <vector>

src/net.h

@@ -30,6 +30,7 @@
 #include <util/check.h>
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
+#include <version.h>
 
 #include <atomic>
 #include <condition_variable>

src/primitives/transaction.cpp

@@ -13,7 +13,6 @@
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <util/transaction_identifier.h>
-#include <version.h>
 
 #include <cassert>
 #include <stdexcept>

src/psbt.cpp

@@ -8,6 +8,7 @@
 #include <script/signingprovider.h>
 #include <util/check.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 
 PartiallySignedTransaction::PartiallySignedTransaction(const CMutableTransaction& tx) : tx(tx)

src/qt/psbtoperationsdialog.cpp

@@ -15,6 +15,7 @@
 #include <qt/optionsmodel.h>
 #include <util/fs.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 #include <fstream>
 #include <iostream>

src/qt/sendcoinsdialog.cpp

@@ -25,6 +25,7 @@
 #include <policy/fees.h>
 #include <txmempool.h>
 #include <validation.h>
+#include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
 #include <wallet/wallet.h>

src/qt/walletmodel.cpp

@@ -25,6 +25,7 @@
 #include <node/interface_ui.h>
 #include <psbt.h>
 #include <util/translation.h>
+#include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h> // for CRecipient
 

src/rpc/rawtransaction.cpp

@@ -40,6 +40,7 @@
 #include <util/vector.h>
 #include <validation.h>
 #include <validationinterface.h>
+#include <version.h>
 
 #include <numeric>
 #include <stdint.h>

src/script/interpreter.cpp

@@ -11,6 +11,7 @@
 #include <pubkey.h>
 #include <script/script.h>
 #include <uint256.h>
+#include <version.h>
 
 typedef std::vector<unsigned char> valtype;
 

src/script/sign.cpp

@@ -17,6 +17,7 @@
 #include <uint256.h>
 #include <util/translation.h>
 #include <util/vector.h>
+#include <version.h>
 
 typedef std::vector<unsigned char> valtype;
 

src/signet.cpp

@@ -22,6 +22,7 @@
 #include <streams.h>
 #include <uint256.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 static constexpr uint8_t SIGNET_HEADER[4] = {0xec, 0xc7, 0xda, 0xa2};
 

src/test/blockencodings_tests.cpp

@@ -11,6 +11,7 @@
 #include <test/util/txmempool.h>
 
 #include <test/util/setup_common.h>
+#include <version.h>
 
 #include <boost/test/unit_test.hpp>
 

src/test/bloom_tests.cpp

@@ -17,6 +17,7 @@
 #include <test/util/setup_common.h>
 #include <uint256.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 #include <vector>
 

src/test/miniscript_tests.cpp

@@ -21,6 +21,7 @@
 #include <script/miniscript.h>
 #include <script/script_error.h>
 #include <script/signingprovider.h>
+#include <version.h>
 
 namespace {
 

src/test/script_tests.cpp

@@ -22,6 +22,7 @@
 #include <test/util/transaction_utils.h>
 #include <util/fs.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 #if defined(HAVE_CONSENSUS_LIB)
 #include <script/bitcoinconsensus.h>

src/test/streams_tests.cpp

@@ -7,6 +7,7 @@
 #include <test/util/setup_common.h>
 #include <util/fs.h>
 #include <util/strencodings.h>
+#include <version.h>
 
 #include <boost/test/unit_test.hpp>
 

src/undo.h

@@ -11,7 +11,6 @@
 #include <consensus/consensus.h>
 #include <primitives/transaction.h>
 #include <serialize.h>
-#include <version.h>
 
 /** Formatter for undo information for a CTxIn
  *

src/wallet/rpc/spend.cpp

@@ -13,6 +13,7 @@
 #include <util/rbf.h>
 #include <util/translation.h>
 #include <util/vector.h>
+#include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/feebumper.h>
 #include <wallet/fees.h>

src/wallet/spend.cpp

@@ -20,6 +20,7 @@
 #include <util/rbf.h>
 #include <util/trace.h>
 #include <util/translation.h>
+#include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
 #include <wallet/receive.h>

src/wallet/test/psbt_wallet_tests.cpp

@@ -5,6 +5,7 @@
 #include <key_io.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
+#include <version.h>
 #include <wallet/wallet.h>
 
 #include <boost/test/unit_test.hpp>