From 83986f464c59a6517f790a960a72574e167f3f72 Mon Sep 17 00:00:00 2001
From: Anthony Towns <aj@erisian.com.au>
Date: Wed, 15 Nov 2023 12:19:34 +1000
Subject: Include version.h in fewer places

---
 src/bitcoin-util.cpp            | 1 -
 src/coins.cpp                   | 1 -
 src/consensus/validation.h      | 1 -
 src/core_read.cpp               | 1 -
 src/external_signer.cpp         | 4 +++-
 src/hash.h                      | 1 -
 src/kernel/coinstats.cpp        | 1 -
 src/net.h                       | 1 +
 src/primitives/transaction.cpp  | 1 -
 src/psbt.cpp                    | 1 +
 src/rest.cpp                    | 1 -
 src/rpc/rawtransaction.cpp      | 1 +
 src/script/bitcoinconsensus.cpp | 1 -
 src/signet.cpp                  | 1 +
 src/test/util/setup_common.h    | 1 +
 src/undo.h                      | 1 -
 src/wallet/rpc/spend.cpp        | 1 +
 src/zmq/zmqpublishnotifier.cpp  | 1 -
 18 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index 8b68d04b2b..96387e8c71 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -19,7 +19,6 @@
 #include <util/exception.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
-#include <version.h>
 
 #include <atomic>
 #include <cstdio>
diff --git a/src/coins.cpp b/src/coins.cpp
index 976fb50855..f576fae748 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -8,7 +8,6 @@
 #include <logging.h>
 #include <random.h>
 #include <util/trace.h>
-#include <version.h>
 
 bool CCoinsView::GetCoin(const COutPoint &outpoint, Coin &coin) const { return false; }
 uint256 CCoinsView::GetBestBlock() const { return uint256(); }
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index 3fdc01e66b..1556c7888f 100644
--- a/src/consensus/validation.h
+++ b/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>
diff --git a/src/core_read.cpp b/src/core_read.cpp
index bffb9e9042..e32e46d1b9 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -12,7 +12,6 @@
 #include <streams.h>
 #include <util/result.h>
 #include <util/strencodings.h>
-#include <version.h>
 
 #include <algorithm>
 #include <string>
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 102c58b56a..15024f6e0f 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -2,12 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <external_signer.h>
+
 #include <chainparams.h>
 #include <common/run_command.h>
 #include <core_io.h>
 #include <psbt.h>
 #include <util/strencodings.h>
-#include <external_signer.h>
+#include <version.h>
 
 #include <algorithm>
 #include <stdexcept>
diff --git a/src/hash.h b/src/hash.h
index 132e1a9fb3..52babf8b1d 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -14,7 +14,6 @@
 #include <serialize.h>
 #include <span.h>
 #include <uint256.h>
-#include <version.h>
 
 #include <string>
 #include <vector>
diff --git a/src/kernel/coinstats.cpp b/src/kernel/coinstats.cpp
index 9bd755ed27..302638cdbe 100644
--- a/src/kernel/coinstats.cpp
+++ b/src/kernel/coinstats.cpp
@@ -21,7 +21,6 @@
 #include <util/check.h>
 #include <util/overflow.h>
 #include <validation.h>
-#include <version.h>
 
 #include <cassert>
 #include <iosfwd>
diff --git a/src/net.h b/src/net.h
index 16312cf72d..aa75df075d 100644
--- a/src/net.h
+++ b/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>
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 6650277c2b..82fb59d349 100644
--- a/src/primitives/transaction.cpp
+++ b/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>
diff --git a/src/psbt.cpp b/src/psbt.cpp
index 76a2fd8241..e46032f5d5 100644
--- a/src/psbt.cpp
+++ b/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)
diff --git a/src/rest.cpp b/src/rest.cpp
index f86c47ee6b..3894b5141d 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -28,7 +28,6 @@
 #include <util/check.h>
 #include <util/strencodings.h>
 #include <validation.h>
-#include <version.h>
 
 #include <any>
 #include <string>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 397ece08c0..e8bcbd8a2b 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/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>
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 2ca8dac48c..c4eccacf41 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -8,7 +8,6 @@
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
-#include <version.h>
 
 namespace {
 
diff --git a/src/signet.cpp b/src/signet.cpp
index ef0faaa5f8..d6a3a44d91 100644
--- a/src/signet.cpp
+++ b/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};
 
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index 4e1a26f303..b60cf7e4fd 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -17,6 +17,7 @@
 #include <util/fs.h>
 #include <util/string.h>
 #include <util/vector.h>
+#include <version.h>
 
 #include <functional>
 #include <type_traits>
diff --git a/src/undo.h b/src/undo.h
index a98f046735..1fb9ac0688 100644
--- a/src/undo.h
+++ b/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
  *
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index 0f7a882034..6519504618 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -19,6 +19,7 @@
 #include <wallet/rpc/util.h>
 #include <wallet/spend.h>
 #include <wallet/wallet.h>
+#include <version.h>
 
 #include <univalue.h>
 
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index a4fb915d71..54d125e47b 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -19,7 +19,6 @@
 #include <streams.h>
 #include <sync.h>
 #include <uint256.h>
-#include <version.h>
 #include <zmq/zmqutil.h>
 
 #include <zmq.h>
-- 
cgit v1.2.3