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>