From fa875349e22f2f0f9c2c98ee991372d08ff90318 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 19 Aug 2022 12:19:18 +0200
Subject: [PATCH] Fix iwyu

---
 ci/test/06_script_b.sh     | 1 +
 src/node/mempool_args.cpp  | 1 +
 src/test/fuzz/txorphan.cpp | 1 -
 src/threadinterrupt.h      | 1 +
 src/util/bip32.cpp         | 2 --
 src/util/message.cpp       | 1 -
 src/util/strencodings.cpp  | 1 -
 src/util/string.h          | 1 -
 8 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index f1b0c1ac159..5bdb392ba3f 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -65,6 +65,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
           " src/util/serfloat.cpp"\
           " src/util/spanparsing.cpp"\
           " src/util/strencodings.cpp"\
+          " src/util/string.cpp"\
           " src/util/syserror.cpp"\
           " src/util/url.cpp"\
           " -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"
diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp
index 60993f1d8df..d8b4ce4bf42 100644
--- a/src/node/mempool_args.cpp
+++ b/src/node/mempool_args.cpp
@@ -12,6 +12,7 @@
 #include <logging.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
+#include <script/standard.h>
 #include <tinyformat.h>
 #include <util/error.h>
 #include <util/moneystr.h>
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index 75806513712..943f3f5fdf4 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -19,7 +19,6 @@
 #include <util/check.h>
 #include <util/time.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <set>
diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h
index 363aab39ced..979bc2ee3ec 100644
--- a/src/threadinterrupt.h
+++ b/src/threadinterrupt.h
@@ -6,6 +6,7 @@
 #define BITCOIN_THREADINTERRUPT_H
 
 #include <sync.h>
+#include <threadsafety.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp
index 39e43eeb318..796af4a5442 100644
--- a/src/util/bip32.cpp
+++ b/src/util/bip32.cpp
@@ -6,12 +6,10 @@
 #include <util/bip32.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <sstream>
 
-
 bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath)
 {
     std::stringstream ss(keypath_str);
diff --git a/src/util/message.cpp b/src/util/message.cpp
index 028251a5a80..7d6f3403f44 100644
--- a/src/util/message.cpp
+++ b/src/util/message.cpp
@@ -8,7 +8,6 @@
 #include <key_io.h>
 #include <pubkey.h>
 #include <script/standard.h>
-#include <serialize.h>
 #include <uint256.h>
 #include <util/message.h>
 #include <util/strencodings.h>
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
index 303e19beec9..b5ac1513749 100644
--- a/src/util/strencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -6,7 +6,6 @@
 #include <span.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstring>
diff --git a/src/util/string.h b/src/util/string.h
index dd4de888bbe..6d68677464d 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -7,7 +7,6 @@
 
 #include <util/spanparsing.h>
 
-#include <algorithm>
 #include <array>
 #include <cstdint>
 #include <cstring>