From 462ff18d79bd69a4b204e8bd28ce4903eb296060 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 9 Sep 2026 12:48:38 +0100
Subject: [PATCH] iwyu, refactor: Fix includes in some source files

This change is required for the subsequent commit to compile.
---
 ci/test/03_test_script.sh        |  2 +-
 src/rest.cpp                     | 24 ++++++++++++++++++++----
 src/test/fuzz/kitchen_sink.cpp   |  4 +++-
 src/test/fuzz/parse_univalue.cpp |  5 ++++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index 545dd21eab7..957dba0b937 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -234,7 +234,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU='/src/((bench|common|consensus|crypto|index|init|kernel|primitives|script|univalue/(lib|test)|util|zmq)/.*|node/(blockstorage|interfaces|miner|mining_args|utxo_snapshot)|test/fuzz/minisketch|rpc/mining|clientversion|core_io|signet|init)\.cpp'
+  FILES_WITH_ENFORCED_IWYU='/src/((bench|common|consensus|crypto|index|init|kernel|primitives|script|univalue/(lib|test)|util|zmq)/.*|node/(blockstorage|interfaces|miner|mining_args|utxo_snapshot)|test/fuzz/(kitchen_sink|minisketch|parse_univalue)|rpc/mining|clientversion|core_io|rest|signet|init)\.cpp'
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json"
 
diff --git a/src/rest.cpp b/src/rest.cpp
index 8004b44d062..207ca33380d 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -7,36 +7,52 @@
 
 #include <blockfilter.h>
 #include <chain.h>
-#include <chainparams.h>
+#include <coins.h>
+#include <consensus/params.h>
 #include <core_io.h>
+#include <crypto/hex_base.h>
 #include <flatfile.h>
 #include <httpserver.h>
 #include <index/blockfilterindex.h>
 #include <index/txindex.h>
 #include <node/blockstorage.h>
 #include <node/context.h>
+#include <node/transaction.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <rpc/blockchain.h>
 #include <rpc/mempool.h>
 #include <rpc/protocol.h>
+#include <rpc/request.h>
 #include <rpc/server.h>
-#include <rpc/server_util.h>
+#include <rpc/util.h>
+#include <serialize.h>
 #include <streams.h>
 #include <sync.h>
+#include <tinyformat.h>
 #include <txmempool.h>
+#include <uint256.h>
 #include <undo.h>
+#include <univalue.h>
 #include <util/any.h>
 #include <util/check.h>
 #include <util/overflow.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <validation.h>
 
 #include <any>
+#include <cstdint>
+#include <cstring>
+#include <ios>
+#include <memory>
+#include <optional>
+#include <span>
+#include <stdexcept>
+#include <string_view>
+#include <utility>
 #include <vector>
 
-#include <univalue.h>
-
 using node::GetTransaction;
 using node::NodeContext;
 using util::SplitString;
diff --git a/src/test/fuzz/kitchen_sink.cpp b/src/test/fuzz/kitchen_sink.cpp
index ec60786ff88..0a124f7f5fe 100644
--- a/src/test/fuzz/kitchen_sink.cpp
+++ b/src/test/fuzz/kitchen_sink.cpp
@@ -5,16 +5,18 @@
 #include <common/messages.h>
 #include <merkleblock.h>
 #include <node/types.h>
+#include <outputtype.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <rpc/util.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
+#include <util/check.h>
 #include <util/translation.h>
 
-#include <array>
 #include <cstdint>
 #include <optional>
+#include <string>
 #include <vector>
 
 using common::TransactionErrorString;
diff --git a/src/test/fuzz/parse_univalue.cpp b/src/test/fuzz/parse_univalue.cpp
index cb39b3be839..1f26f903a8f 100644
--- a/src/test/fuzz/parse_univalue.cpp
+++ b/src/test/fuzz/parse_univalue.cpp
@@ -3,12 +3,15 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
-#include <rpc/client.h>
 #include <rpc/util.h>
+#include <script/signingprovider.h>
 #include <test/fuzz/fuzz.h>
+#include <univalue.h>
 #include <util/chaintype.h>
 
+#include <functional>
 #include <limits>
+#include <stdexcept>
 #include <string>
 
 void initialize_parse_univalue()