From efcbf794484ecc02cae05e520120df9d1aa8c93a Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 29 Jan 2026 14:38:35 +0000
Subject: [PATCH] ci, iwyu: Fix warnings in `src/zmq` and treat them as errors

---
 ci/test/03_test_script.sh            |  2 +-
 src/.clang-format                    |  3 +++
 src/zmq/zmqnotificationinterface.cpp |  3 +--
 src/zmq/zmqnotificationinterface.h   |  3 +--
 src/zmq/zmqpublishnotifier.cpp       | 13 ++-----------
 src/zmq/zmqpublishnotifier.h         |  2 +-
 src/zmq/zmqrpc.cpp                   |  6 ++++--
 src/zmq/zmqutil.cpp                  |  2 ++
 8 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index 7f605fb0319..b85507f4184 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -215,7 +215,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel|primitives)/.*\\.cpp|node/blockstorage.cpp|node/utxo_snapshot.cpp|core_io.cpp|signet.cpp)"
+  FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel|primitives|zmq)/.*\\.cpp|node/blockstorage.cpp|node/utxo_snapshot.cpp|core_io.cpp|signet.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/.clang-format b/src/.clang-format
index 2b74e40b41d..72a20228017 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -108,6 +108,9 @@ IncludeCategories:
   - Regex:           '^<Q'
     Priority:        2
     CaseSensitive:   true
+  - Regex:           '^<zmq.h>$'
+    Priority:        2
+    CaseSensitive:   true
   - Regex:           '^<[^>.]*>'
     Priority:        3
     CaseSensitive:   false
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index a341c47b73f..9efb3eb75ed 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -11,14 +11,13 @@
 #include <netbase.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
-#include <validationinterface.h>
+#include <util/check.h>
 #include <zmq/zmqabstractnotifier.h>
 #include <zmq/zmqpublishnotifier.h>
 #include <zmq/zmqutil.h>
 
 #include <zmq.h>
 
-#include <cassert>
 #include <map>
 #include <string>
 #include <utility>
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 12d805c1094..e2039df2fda 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -8,16 +8,15 @@
 #include <primitives/transaction.h>
 #include <validationinterface.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <list>
 #include <memory>
 #include <vector>
 
-class CBlock;
 class CBlockIndex;
 class CZMQAbstractNotifier;
-struct NewMempoolTransactionInfo;
 
 class CZMQNotificationInterface final : public CValidationInterface
 {
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 44ef34b12f2..56cdea05e3a 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -5,39 +5,30 @@
 #include <zmq/zmqpublishnotifier.h>
 
 #include <chain.h>
-#include <chainparams.h>
 #include <crypto/common.h>
-#include <kernel/cs_main.h>
 #include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
-#include <node/blockstorage.h>
-#include <primitives/block.h>
 #include <primitives/transaction.h>
-#include <rpc/server.h>
 #include <serialize.h>
 #include <streams.h>
-#include <sync.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <zmq/zmqutil.h>
 
 #include <zmq.h>
 
-#include <cassert>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <map>
 #include <optional>
+#include <span>
 #include <string>
 #include <utility>
 #include <vector>
 
-namespace Consensus {
-struct Params;
-}
-
 static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;
 
 static const char *MSG_HASHBLOCK = "hashblock";
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 226797e3e03..842403fa334 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -10,10 +10,10 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <utility>
 #include <vector>
 
 class CBlockIndex;
-class CTransaction;
 
 class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
 {
diff --git a/src/zmq/zmqrpc.cpp b/src/zmq/zmqrpc.cpp
index 948ce2ba30d..9c8154a63a4 100644
--- a/src/zmq/zmqrpc.cpp
+++ b/src/zmq/zmqrpc.cpp
@@ -6,13 +6,15 @@
 
 #include <rpc/server.h>
 #include <rpc/util.h>
+#include <univalue.h>
 #include <zmq/zmqabstractnotifier.h>
 #include <zmq/zmqnotificationinterface.h>
 
-#include <univalue.h>
-
 #include <list>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 class JSONRPCRequest;
 
diff --git a/src/zmq/zmqutil.cpp b/src/zmq/zmqutil.cpp
index d3addaad4b9..7f28f5e523a 100644
--- a/src/zmq/zmqutil.cpp
+++ b/src/zmq/zmqutil.cpp
@@ -5,6 +5,8 @@
 #include <zmq/zmqutil.h>
 
 #include <logging.h>
+#include <util/check.h>
+
 #include <zmq.h>
 
 #include <cerrno>