From 1bf384222323885ffafb669042d97a4fc5327586 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 31 Jan 2026 10:41:50 +0000
Subject: [PATCH] ci, iwyu: Fix warnings in `src/univalue` and treat them as
 errors

---
 ci/test/03_test_script.sh           | 2 +-
 src/univalue/lib/univalue.cpp       | 1 -
 src/univalue/lib/univalue_get.cpp   | 4 ----
 src/univalue/lib/univalue_read.cpp  | 1 -
 src/univalue/lib/univalue_write.cpp | 1 -
 src/univalue/test/object.cpp        | 1 -
 src/univalue/test/unitester.cpp     | 3 ++-
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index 454eadd9a07..3908b2746f5 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -213,7 +213,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel|primitives|zmq)/.*\\.cpp|node/blockstorage.cpp|node/utxo_snapshot.cpp|core_io.cpp|signet.cpp)"
+  FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel|primitives|univalue/(lib|test)|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/univalue/lib/univalue.cpp b/src/univalue/lib/univalue.cpp
index 4d37c81fe87..6aeff001e76 100644
--- a/src/univalue/lib/univalue.cpp
+++ b/src/univalue/lib/univalue.cpp
@@ -7,7 +7,6 @@
 
 #include <iomanip>
 #include <map>
-#include <memory>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/src/univalue/lib/univalue_get.cpp b/src/univalue/lib/univalue_get.cpp
index 037449ca08c..146cc421ef6 100644
--- a/src/univalue/lib/univalue_get.cpp
+++ b/src/univalue/lib/univalue_get.cpp
@@ -5,11 +5,7 @@
 
 #include <univalue.h>
 
-#include <cerrno>
-#include <cstdint>
-#include <cstdlib>
 #include <cstring>
-#include <limits>
 #include <locale>
 #include <sstream>
 #include <stdexcept>
diff --git a/src/univalue/lib/univalue_read.cpp b/src/univalue/lib/univalue_read.cpp
index 40d465f4382..89d8b900875 100644
--- a/src/univalue/lib/univalue_read.cpp
+++ b/src/univalue/lib/univalue_read.cpp
@@ -6,7 +6,6 @@
 #include <univalue_utffilter.h>
 
 #include <cstdint>
-#include <cstdio>
 #include <cstring>
 #include <string>
 #include <string_view>
diff --git a/src/univalue/lib/univalue_write.cpp b/src/univalue/lib/univalue_write.cpp
index 4a2219061a7..0161967a266 100644
--- a/src/univalue/lib/univalue_write.cpp
+++ b/src/univalue/lib/univalue_write.cpp
@@ -5,7 +5,6 @@
 #include <univalue.h>
 #include <univalue_escapes.h>
 
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/univalue/test/object.cpp b/src/univalue/test/object.cpp
index 1d072c34143..be98ae41207 100644
--- a/src/univalue/test/object.cpp
+++ b/src/univalue/test/object.cpp
@@ -8,7 +8,6 @@
 #include <cassert>
 #include <cstdint>
 #include <map>
-#include <memory>
 #include <stdexcept>
 #include <string>
 #include <string_view>
diff --git a/src/univalue/test/unitester.cpp b/src/univalue/test/unitester.cpp
index e517e641889..e82ea74dec4 100644
--- a/src/univalue/test/unitester.cpp
+++ b/src/univalue/test/unitester.cpp
@@ -63,8 +63,9 @@
 
 #include <array>
 #include <cassert>
-#include <cstdio>
 #include <string>
+#include <string_view>
+#include <tuple>
 
 static std::string rtrim(std::string s)
 {