From 37de7d19107c350e5ff0b8fc0cb5551830bdb6cb Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 30 Jan 2026 11:39:20 +0000
Subject: [PATCH 1/3] iwyu: Drop backported mapping

See https://github.com/include-what-you-use/include-what-you-use/pull/1706.
---
 contrib/devtools/iwyu/bitcoin.core.imp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 9067bc327d0..03bafc3d74b 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -9,11 +9,6 @@
   { "symbol": ["AT_HWCAP", "private", "<sys/auxv.h>", "public"] },
   { "symbol": ["AT_HWCAP2", "private", "<sys/auxv.h>", "public"] },
 
-  # Fixed in https://github.com/include-what-you-use/include-what-you-use/pull/1706.
-  { "symbol": ["SEEK_CUR", "private", "<cstdio>", "public"] },
-  { "symbol": ["SEEK_END", "private", "<cstdio>", "public"] },
-  { "symbol": ["SEEK_SET", "private", "<cstdio>", "public"] },
-
   # IWYU bug.
   # See: https://github.com/include-what-you-use/include-what-you-use/issues/1863.
   { "symbol": ["std::vector", "private", "<vector>", "public"] },

From 91824646c58afade176d6c0003c892ceca855ba9 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 30 Jan 2026 11:50:17 +0000
Subject: [PATCH 2/3] iwyu: Add temporary mapping to work around upstream bug

---
 contrib/devtools/iwyu/bitcoin.core.imp | 4 +++-
 src/crypto/chacha20.h                  | 1 -
 src/index/txindex.cpp                  | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 03bafc3d74b..90d65bea6a2 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -9,7 +9,9 @@
   { "symbol": ["AT_HWCAP", "private", "<sys/auxv.h>", "public"] },
   { "symbol": ["AT_HWCAP2", "private", "<sys/auxv.h>", "public"] },
 
-  # IWYU bug.
+  # Workarounds for IWYU issues.
+  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1616.
+  { "symbol": ["std::pair", "private", "<utility>", "public"] },
   # See: https://github.com/include-what-you-use/include-what-you-use/issues/1863.
   { "symbol": ["std::vector", "private", "<vector>", "public"] },
 ]
diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h
index 150356213d6..3feef196c7d 100644
--- a/src/crypto/chacha20.h
+++ b/src/crypto/chacha20.h
@@ -8,7 +8,6 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include <iterator>
 #include <span>
 #include <utility>
 
diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
index 7d8450212e6..d7d8cb56652 100644
--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@@ -24,7 +24,6 @@
 #include <cstdint>
 #include <cstdio>
 #include <exception>
-#include <iterator>
 #include <span>
 #include <string>
 #include <utility>

From 9c839aa9e3db30e2fa7d45b087a13bdd86b2a085 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 30 Jan 2026 11:52:49 +0000
Subject: [PATCH 3/3] iwyu: Document mappings for libc symbols

---
 contrib/devtools/iwyu/bitcoin.core.imp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 90d65bea6a2..960cb05d85a 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -6,6 +6,7 @@
   { "include": [ "<tmmintrin.h>", "private", "<immintrin.h>", "public" ] },
 
   # libc symbols.
+  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1809.
   { "symbol": ["AT_HWCAP", "private", "<sys/auxv.h>", "public"] },
   { "symbol": ["AT_HWCAP2", "private", "<sys/auxv.h>", "public"] },