From fae71d30f7227594e2f59499cf7f7f9420284e04 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 3 Jun 2025 13:45:37 +0200
Subject: [PATCH 1/3] clang-tidy: Apply modernize-deprecated-headers

This can be reproduced according to the developer notes with something
like

( cd ./src/ && ../contrib/devtools/run-clang-tidy.py -p ../bld-cmake -fix -j $(nproc) )

Also, the header related changes were done manually.
---
 src/.clang-tidy                          | 3 +++
 src/base58.cpp                           | 4 ++--
 src/bech32.cpp                           | 2 +-
 src/bech32.h                             | 2 +-
 src/bench/examples.cpp                   | 2 +-
 src/bench/parse_hex.cpp                  | 2 +-
 src/bip324.cpp                           | 2 +-
 src/chainparamsbase.cpp                  | 2 +-
 src/cluster_linearize.h                  | 2 +-
 src/coins.h                              | 4 ++--
 src/common/args.h                        | 2 +-
 src/consensus/consensus.h                | 2 +-
 src/consensus/tx_verify.h                | 2 +-
 src/crypto/aes.cpp                       | 2 +-
 src/crypto/chacha20.cpp                  | 2 +-
 src/crypto/chacha20.h                    | 2 +-
 src/crypto/chacha20poly1305.cpp          | 2 +-
 src/crypto/chacha20poly1305.h            | 2 +-
 src/crypto/hkdf_sha256_32.cpp            | 4 ++--
 src/crypto/hkdf_sha256_32.h              | 2 +-
 src/crypto/hmac_sha256.cpp               | 2 +-
 src/crypto/hmac_sha256.h                 | 2 +-
 src/crypto/hmac_sha512.cpp               | 2 +-
 src/crypto/hmac_sha512.h                 | 2 +-
 src/crypto/muhash.h                      | 2 +-
 src/crypto/poly1305.cpp                  | 2 +-
 src/crypto/poly1305.h                    | 2 +-
 src/crypto/ripemd160.cpp                 | 2 +-
 src/crypto/ripemd160.h                   | 2 +-
 src/crypto/sha1.cpp                      | 2 +-
 src/crypto/sha1.h                        | 2 +-
 src/crypto/sha256.h                      | 2 +-
 src/crypto/sha256_avx2.cpp               | 2 +-
 src/crypto/sha256_sse4.cpp               | 2 +-
 src/crypto/sha256_sse41.cpp              | 2 +-
 src/crypto/sha256_x86_shani.cpp          | 2 +-
 src/crypto/sha3.h                        | 2 +-
 src/crypto/sha512.cpp                    | 2 +-
 src/crypto/sha512.h                      | 2 +-
 src/crypto/siphash.h                     | 2 +-
 src/init.cpp                             | 2 +-
 src/interfaces/node.h                    | 4 ++--
 src/kernel/disconnected_transactions.cpp | 2 +-
 src/kernel/mempool_entry.h               | 4 ++--
 src/key_io.cpp                           | 4 ++--
 src/netbase.h                            | 2 +-
 src/node/connection_types.h              | 2 +-
 src/node/miner.h                         | 2 +-
 src/node/mini_miner.h                    | 2 +-
 src/pow.h                                | 2 +-
 src/qt/bitcoin.h                         | 2 +-
 src/qt/clientmodel.cpp                   | 2 +-
 src/qt/notificator.cpp                   | 2 +-
 src/qt/optionsmodel.h                    | 2 +-
 src/qt/transactiondesc.cpp               | 2 +-
 src/qt/transactionrecord.cpp             | 2 +-
 src/rpc/blockchain.cpp                   | 2 +-
 src/rpc/blockchain.h                     | 2 +-
 src/rpc/client.cpp                       | 2 +-
 src/rpc/mining.cpp                       | 2 +-
 src/rpc/node.cpp                         | 2 +-
 src/rpc/rawtransaction.cpp               | 2 +-
 src/rpc/server.h                         | 2 +-
 src/streams.h                            | 6 +++---
 src/test/compress_tests.cpp              | 2 +-
 src/test/denialofservice_tests.cpp       | 2 +-
 src/test/fuzz/addrman.cpp                | 2 +-
 src/test/fuzz/asmap_direct.cpp           | 2 +-
 src/test/fuzz/cluster_linearize.cpp      | 2 +-
 src/test/fuzz/coinscache_sim.cpp         | 4 ++--
 src/test/fuzz/deserialize.cpp            | 2 +-
 src/test/fuzz/feeratediagram.cpp         | 4 ++--
 src/test/fuzz/txgraph.cpp                | 2 +-
 src/test/fuzz/vecdeque.cpp               | 2 +-
 src/test/scriptnum10.h                   | 4 ++--
 src/test/scriptnum_tests.cpp             | 4 ++--
 src/test/serialize_tests.cpp             | 2 +-
 src/test/util/cluster_linearize.h        | 2 +-
 src/test/util/coins.cpp                  | 2 +-
 src/txgraph.h                            | 2 +-
 src/txrequest.cpp                        | 2 +-
 src/util/feefrac.h                       | 2 +-
 src/util/tokenpipe.cpp                   | 2 +-
 src/validation.h                         | 2 +-
 src/wallet/sqlite.cpp                    | 2 +-
 src/wallet/test/wallet_tests.cpp         | 2 +-
 src/wallet/walletdb.h                    | 2 +-
 87 files changed, 101 insertions(+), 98 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 1cf270833a2..544bd5ac0c1 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -9,6 +9,7 @@ bugprone-lambda-function-name,
 bugprone-unhandled-self-assignment,
 misc-unused-using-decls,
 misc-no-recursion,
+modernize-deprecated-headers,
 modernize-use-default-member-init,
 modernize-use-emplace,
 modernize-use-equals-default,
@@ -29,6 +30,8 @@ readability-redundant-string-init,
 HeaderFilterRegex: '.'
 WarningsAsErrors: '*'
 CheckOptions:
+ - key: modernize-deprecated-headers.CheckHeaderFile
+   value: false
  - key: performance-move-const-arg.CheckTriviallyCopyableMove
    value: false
  - key: bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField
diff --git a/src/base58.cpp b/src/base58.cpp
index d0e1ab465e4..19a5bd3e550 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -9,8 +9,8 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 #include <limits>
 
diff --git a/src/bech32.cpp b/src/bech32.cpp
index 81695acebaa..08bdce6dd58 100644
--- a/src/bech32.cpp
+++ b/src/bech32.cpp
@@ -7,7 +7,7 @@
 #include <util/vector.h>
 
 #include <array>
-#include <assert.h>
+#include <cassert>
 #include <numeric>
 #include <optional>
 
diff --git a/src/bech32.h b/src/bech32.h
index 6d5a68ec5a1..bc50ba54213 100644
--- a/src/bech32.h
+++ b/src/bech32.h
@@ -14,7 +14,7 @@
 #ifndef BITCOIN_BECH32_H
 #define BITCOIN_BECH32_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
index 671902ef2fb..6f5d1052ba6 100644
--- a/src/bench/examples.cpp
+++ b/src/bench/examples.cpp
@@ -5,7 +5,7 @@
 #include <bench/bench.h>
 
 // Extremely fast-running benchmark:
-#include <math.h>
+#include <cmath>
 
 volatile double sum = 0.0; // volatile, global so not optimized away
 
diff --git a/src/bench/parse_hex.cpp b/src/bench/parse_hex.cpp
index db3ead043c8..c20e9546c34 100644
--- a/src/bench/parse_hex.cpp
+++ b/src/bench/parse_hex.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <random.h>
-#include <stddef.h>
+#include <cstddef>
 #include <util/strencodings.h>
 #include <cassert>
 #include <optional>
diff --git a/src/bip324.cpp b/src/bip324.cpp
index 73f51a195ee..bb1fae5dee4 100644
--- a/src/bip324.cpp
+++ b/src/bip324.cpp
@@ -16,7 +16,7 @@
 #include <uint256.h>
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <cstdint>
 #include <cstddef>
 #include <iterator>
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 060d519d920..24860088dd6 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -9,7 +9,7 @@
 #include <tinyformat.h>
 #include <util/chaintype.h>
 
-#include <assert.h>
+#include <cassert>
 
 void SetupChainParamsBaseOptions(ArgsManager& argsman)
 {
diff --git a/src/cluster_linearize.h b/src/cluster_linearize.h
index 217c4700afe..2a3c649576f 100644
--- a/src/cluster_linearize.h
+++ b/src/cluster_linearize.h
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <numeric>
 #include <optional>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <utility>
 
diff --git a/src/coins.h b/src/coins.h
index 61fb4af6420..7676f7d8702 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -16,8 +16,8 @@
 #include <util/check.h>
 #include <util/hasher.h>
 
-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
 
 #include <functional>
 #include <unordered_map>
diff --git a/src/common/args.h b/src/common/args.h
index 8d9daf5f65d..f5dce850846 100644
--- a/src/common/args.h
+++ b/src/common/args.h
@@ -16,7 +16,7 @@
 #include <map>
 #include <optional>
 #include <set>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <variant>
 #include <vector>
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index cffe9cdafd7..b4e1f027768 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -7,7 +7,7 @@
 #define BITCOIN_CONSENSUS_CONSENSUS_H
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
 static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h
index d2cf792cf3f..845dcbf1c26 100644
--- a/src/consensus/tx_verify.h
+++ b/src/consensus/tx_verify.h
@@ -7,7 +7,7 @@
 
 #include <consensus/amount.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 class CBlockIndex;
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 2afcbd16292..b9537c7a3e7 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -4,7 +4,7 @@
 
 #include <crypto/aes.h>
 
-#include <string.h>
+#include <cstring>
 
 extern "C" {
 #include <crypto/ctaes/ctaes.c>
diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp
index acb860e9b46..91064050f48 100644
--- a/src/crypto/chacha20.cpp
+++ b/src/crypto/chacha20.cpp
@@ -12,7 +12,7 @@
 
 #include <algorithm>
 #include <bit>
-#include <string.h>
+#include <cstring>
 
 #define QUARTERROUND(a,b,c,d) \
   a += b; d = std::rotl(d ^ a, 16); \
diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h
index 06eb10781c5..223b317f355 100644
--- a/src/crypto/chacha20.h
+++ b/src/crypto/chacha20.h
@@ -10,7 +10,7 @@
 #include <array>
 #include <cstddef>
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 // classes for ChaCha20 256-bit stream cipher developed by Daniel J. Bernstein
diff --git a/src/crypto/chacha20poly1305.cpp b/src/crypto/chacha20poly1305.cpp
index 4c7da07d7ec..06dbf6037b9 100644
--- a/src/crypto/chacha20poly1305.cpp
+++ b/src/crypto/chacha20poly1305.cpp
@@ -10,7 +10,7 @@
 #include <span.h>
 #include <support/cleanse.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cstddef>
 
 AEADChaCha20Poly1305::AEADChaCha20Poly1305(std::span<const std::byte> key) noexcept : m_chacha20(key)
diff --git a/src/crypto/chacha20poly1305.h b/src/crypto/chacha20poly1305.h
index 75404ca5ffd..a6c3a668cfd 100644
--- a/src/crypto/chacha20poly1305.h
+++ b/src/crypto/chacha20poly1305.h
@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_CHACHA20POLY1305_H
 
 #include <cstddef>
-#include <stdint.h>
+#include <cstdint>
 
 #include <crypto/chacha20.h>
 #include <crypto/poly1305.h>
diff --git a/src/crypto/hkdf_sha256_32.cpp b/src/crypto/hkdf_sha256_32.cpp
index 81f3c1349a7..4d2762b9b4d 100644
--- a/src/crypto/hkdf_sha256_32.cpp
+++ b/src/crypto/hkdf_sha256_32.cpp
@@ -4,8 +4,8 @@
 
 #include <crypto/hkdf_sha256_32.h>
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 CHKDF_HMAC_SHA256_L32::CHKDF_HMAC_SHA256_L32(const unsigned char* ikm, size_t ikmlen, const std::string& salt)
 {
diff --git a/src/crypto/hkdf_sha256_32.h b/src/crypto/hkdf_sha256_32.h
index d3735203005..3e71b0a29c6 100644
--- a/src/crypto/hkdf_sha256_32.h
+++ b/src/crypto/hkdf_sha256_32.h
@@ -8,7 +8,7 @@
 #include <crypto/hmac_sha256.h>
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A rfc5869 HKDF implementation with HMAC_SHA256 and fixed key output length of 32 bytes (L=32) */
 class CHKDF_HMAC_SHA256_L32
diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp
index 0ba99ae274f..2ac8d0e18b3 100644
--- a/src/crypto/hmac_sha256.cpp
+++ b/src/crypto/hmac_sha256.cpp
@@ -4,7 +4,7 @@
 
 #include <crypto/hmac_sha256.h>
 
-#include <string.h>
+#include <cstring>
 
 CHMAC_SHA256::CHMAC_SHA256(const unsigned char* key, size_t keylen)
 {
diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h
index abd731d1fe5..4bcd0163abd 100644
--- a/src/crypto/hmac_sha256.h
+++ b/src/crypto/hmac_sha256.h
@@ -8,7 +8,7 @@
 #include <crypto/sha256.h>
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A hasher class for HMAC-SHA-256. */
 class CHMAC_SHA256
diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp
index d70aee843bd..26a988b6a6a 100644
--- a/src/crypto/hmac_sha512.cpp
+++ b/src/crypto/hmac_sha512.cpp
@@ -4,7 +4,7 @@
 
 #include <crypto/hmac_sha512.h>
 
-#include <string.h>
+#include <cstring>
 
 CHMAC_SHA512::CHMAC_SHA512(const unsigned char* key, size_t keylen)
 {
diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h
index 8fa55d28444..6ea815aecf0 100644
--- a/src/crypto/hmac_sha512.h
+++ b/src/crypto/hmac_sha512.h
@@ -8,7 +8,7 @@
 #include <crypto/sha512.h>
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A hasher class for HMAC-SHA-512. */
 class CHMAC_SHA512
diff --git a/src/crypto/muhash.h b/src/crypto/muhash.h
index 5137c8e2400..f3409373236 100644
--- a/src/crypto/muhash.h
+++ b/src/crypto/muhash.h
@@ -8,7 +8,7 @@
 #include <serialize.h>
 #include <uint256.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 class Num3072
 {
diff --git a/src/crypto/poly1305.cpp b/src/crypto/poly1305.cpp
index 7fcbab4108d..2640e320bf9 100644
--- a/src/crypto/poly1305.cpp
+++ b/src/crypto/poly1305.cpp
@@ -5,7 +5,7 @@
 #include <crypto/common.h>
 #include <crypto/poly1305.h>
 
-#include <string.h>
+#include <cstring>
 
 namespace poly1305_donna {
 
diff --git a/src/crypto/poly1305.h b/src/crypto/poly1305.h
index 94ea69be87e..1b7e355fee1 100644
--- a/src/crypto/poly1305.h
+++ b/src/crypto/poly1305.h
@@ -9,7 +9,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 #define POLY1305_BLOCK_SIZE 16
 
diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp
index a2f7c6e1563..4dad37d533e 100644
--- a/src/crypto/ripemd160.cpp
+++ b/src/crypto/ripemd160.cpp
@@ -6,7 +6,7 @@
 
 #include <crypto/common.h>
 
-#include <string.h>
+#include <cstring>
 
 // Internal implementation code.
 namespace
diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h
index fb631a66d2d..888ffb51895 100644
--- a/src/crypto/ripemd160.h
+++ b/src/crypto/ripemd160.h
@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_RIPEMD160_H
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A hasher class for RIPEMD-160. */
 class CRIPEMD160
diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp
index 2610108f607..69c0bba1307 100644
--- a/src/crypto/sha1.cpp
+++ b/src/crypto/sha1.cpp
@@ -6,7 +6,7 @@
 
 #include <crypto/common.h>
 
-#include <string.h>
+#include <cstring>
 
 // Internal implementation code.
 namespace
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index 741cdaad58b..62ffa5d7d4a 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_SHA1_H
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A hasher class for SHA1. */
 class CSHA1
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index b1348631d32..aef61328013 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_SHA256_H
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 /** A hasher class for SHA-256. */
diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp
index df8cb7a6c98..6757a22f0aa 100644
--- a/src/crypto/sha256_avx2.cpp
+++ b/src/crypto/sha256_avx2.cpp
@@ -4,7 +4,7 @@
 
 #ifdef ENABLE_AVX2
 
-#include <stdint.h>
+#include <cstdint>
 #include <immintrin.h>
 
 #include <attributes.h>
diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp
index f68e226138e..aa8bf246663 100644
--- a/src/crypto/sha256_sse4.cpp
+++ b/src/crypto/sha256_sse4.cpp
@@ -6,7 +6,7 @@
 // (available at the bottom of this file).
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 #if defined(__x86_64__) || defined(__amd64__)
 
diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp
index d041fdfefc2..308de456b4b 100644
--- a/src/crypto/sha256_sse41.cpp
+++ b/src/crypto/sha256_sse41.cpp
@@ -4,7 +4,7 @@
 
 #ifdef ENABLE_SSE41
 
-#include <stdint.h>
+#include <cstdint>
 #include <immintrin.h>
 
 #include <attributes.h>
diff --git a/src/crypto/sha256_x86_shani.cpp b/src/crypto/sha256_x86_shani.cpp
index 74718281939..316cfdf5182 100644
--- a/src/crypto/sha256_x86_shani.cpp
+++ b/src/crypto/sha256_x86_shani.cpp
@@ -8,7 +8,7 @@
 
 #if defined(ENABLE_SSE41) && defined(ENABLE_X86_SHANI)
 
-#include <stdint.h>
+#include <cstdint>
 #include <immintrin.h>
 
 #include <attributes.h>
diff --git a/src/crypto/sha3.h b/src/crypto/sha3.h
index 685586af63b..6d114379f36 100644
--- a/src/crypto/sha3.h
+++ b/src/crypto/sha3.h
@@ -8,7 +8,7 @@
 #include <span.h>
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 //! The Keccak-f[1600] transform.
 void KeccakF(uint64_t (&st)[25]);
diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp
index 2713f06210e..d1a5eec257e 100644
--- a/src/crypto/sha512.cpp
+++ b/src/crypto/sha512.cpp
@@ -6,7 +6,7 @@
 
 #include <crypto/common.h>
 
-#include <string.h>
+#include <cstring>
 
 // Internal implementation code.
 namespace
diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
index d2f7d6a05e4..33240229090 100644
--- a/src/crypto/sha512.h
+++ b/src/crypto/sha512.h
@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_SHA512_H
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 
 /** A hasher class for SHA-512. */
 class CSHA512
diff --git a/src/crypto/siphash.h b/src/crypto/siphash.h
index c388c94951b..4c6a39e0b68 100644
--- a/src/crypto/siphash.h
+++ b/src/crypto/siphash.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CRYPTO_SIPHASH_H
 #define BITCOIN_CRYPTO_SIPHASH_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <span.h>
 #include <uint256.h>
diff --git a/src/init.cpp b/src/init.cpp
index bfb42aaa3b6..588f68bf482 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -105,7 +105,7 @@
 #include <vector>
 
 #ifndef WIN32
-#include <signal.h>
+#include <csignal>
 #include <sys/stat.h>
 #endif
 
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index a17aa4afefc..2ab9f84e734 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -17,8 +17,8 @@
 
 #include <functional>
 #include <memory>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <tuple>
 #include <vector>
diff --git a/src/kernel/disconnected_transactions.cpp b/src/kernel/disconnected_transactions.cpp
index f865fed688c..f9431cef640 100644
--- a/src/kernel/disconnected_transactions.cpp
+++ b/src/kernel/disconnected_transactions.cpp
@@ -4,7 +4,7 @@
 
 #include <kernel/disconnected_transactions.h>
 
-#include <assert.h>
+#include <cassert>
 #include <core_memusage.h>
 #include <memusage.h>
 #include <primitives/transaction.h>
diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h
index 2adeaea652d..0c3f08ba9ea 100644
--- a/src/kernel/mempool_entry.h
+++ b/src/kernel/mempool_entry.h
@@ -18,8 +18,8 @@
 #include <functional>
 #include <memory>
 #include <set>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 class CBlockIndex;
 
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 6cece47e410..3e8633af36c 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -12,8 +12,8 @@
 #include <util/strencodings.h>
 
 #include <algorithm>
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 /// Maximum witness length for Bech32 addresses.
 static constexpr std::size_t BECH32_WITNESS_PROG_MAX_LEN = 40;
diff --git a/src/netbase.h b/src/netbase.h
index 3ac23050115..0ecd209a6f0 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -13,7 +13,7 @@
 
 #include <functional>
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
diff --git a/src/node/connection_types.h b/src/node/connection_types.h
index a911b95f7e9..037e15d866f 100644
--- a/src/node/connection_types.h
+++ b/src/node/connection_types.h
@@ -6,7 +6,7 @@
 #define BITCOIN_NODE_CONNECTION_TYPES_H
 
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 
 /** Different types of connections to a peer. This enum encapsulates the
  * information we have available at the time of opening or accepting the
diff --git a/src/node/miner.h b/src/node/miner.h
index 5073d69bb1b..24651edc524 100644
--- a/src/node/miner.h
+++ b/src/node/miner.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 #include <optional>
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/multi_index/identity.hpp>
 #include <boost/multi_index/indexed_by.hpp>
diff --git a/src/node/mini_miner.h b/src/node/mini_miner.h
index aec2aaf6b6b..60eb5c81ff5 100644
--- a/src/node/mini_miner.h
+++ b/src/node/mini_miner.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <optional>
 #include <set>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 class CFeeRate;
diff --git a/src/pow.h b/src/pow.h
index ceba55d36a2..dbf9a673293 100644
--- a/src/pow.h
+++ b/src/pow.h
@@ -8,7 +8,7 @@
 
 #include <consensus/params.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 class CBlockHeader;
 class CBlockIndex;
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
index 52b117eed7c..142a7e2da56 100644
--- a/src/qt/bitcoin.h
+++ b/src/qt/bitcoin.h
@@ -10,7 +10,7 @@
 #include <interfaces/node.h>
 #include <qt/initexecutor.h>
 
-#include <assert.h>
+#include <cassert>
 #include <memory>
 #include <optional>
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index fb81dee8daa..b923ffe8dad 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -23,7 +23,7 @@
 #include <util/time.h>
 #include <validation.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QDebug>
 #include <QMetaObject>
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index af97bb21437..47a21cf898e 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -18,7 +18,7 @@
 #ifdef USE_DBUS
 #include <QDBusMetaType>
 #include <QtDBus>
-#include <stdint.h>
+#include <cstdint>
 #endif
 #ifdef Q_OS_MACOS
 #include <qt/macnotificationhandler.h>
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index c24b35ed793..efe9b3bd4df 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -12,7 +12,7 @@
 #include <QAbstractListModel>
 #include <QFont>
 
-#include <assert.h>
+#include <cassert>
 #include <variant>
 
 struct bilingual_str;
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 4d902f2cd28..74ddb35c191 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -19,7 +19,7 @@
 #include <validation.h>
 #include <wallet/types.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include <QLatin1String>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 5f9e37aac8e..cce453acf3e 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -9,7 +9,7 @@
 #include <key_io.h>
 #include <wallet/types.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QDateTime>
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a237a24c84e..d5ce1bd4696 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -52,7 +52,7 @@
 #include <validationinterface.h>
 #include <versionbits.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <condition_variable>
 #include <iterator>
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 954ede6519b..649c1dddec8 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -13,7 +13,7 @@
 #include <validation.h>
 
 #include <any>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 class CBlock;
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 08bd1142fce..74e091224bd 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -8,7 +8,7 @@
 #include <tinyformat.h>
 
 #include <set>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <string_view>
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index aa68ae324dd..ef234c6283e 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -44,7 +44,7 @@
 #include <validationinterface.h>
 
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;
diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 232a1d16f4e..60f7c398582 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -26,7 +26,7 @@
 #include <util/check.h>
 #include <util/time.h>
 
-#include <stdint.h>
+#include <cstdint>
 #ifdef HAVE_MALLOC_INFO
 #include <malloc.h>
 #endif
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 8f7b9769a8e..93541a93300 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -43,7 +43,7 @@
 #include <validationinterface.h>
 
 #include <numeric>
-#include <stdint.h>
+#include <cstdint>
 
 #include <univalue.h>
 
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 5a22279a58e..a14897f390c 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -11,7 +11,7 @@
 
 #include <functional>
 #include <map>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include <univalue.h>
diff --git a/src/streams.h b/src/streams.h
index 1ebcff3671f..0b3b939fabd 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -12,14 +12,14 @@
 #include <util/overflow.h>
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <cstddef>
 #include <cstdio>
 #include <ios>
 #include <limits>
 #include <optional>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index 7e17e6ef939..c8289a281f9 100644
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -7,7 +7,7 @@
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 9ee7e9c9fe2..800a9eac247 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -21,7 +21,7 @@
 #include <validation.h>
 
 #include <array>
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
index dedea850803..bce7e64ac7b 100644
--- a/src/test/fuzz/addrman.cpp
+++ b/src/test/fuzz/addrman.cpp
@@ -14,7 +14,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
-#include <time.h>
+#include <ctime>
 #include <util/asmap.h>
 #include <util/chaintype.h>
 
diff --git a/src/test/fuzz/asmap_direct.cpp b/src/test/fuzz/asmap_direct.cpp
index 8a355fd3f60..16c70a582b3 100644
--- a/src/test/fuzz/asmap_direct.cpp
+++ b/src/test/fuzz/asmap_direct.cpp
@@ -10,7 +10,7 @@
 #include <optional>
 #include <vector>
 
-#include <assert.h>
+#include <cassert>
 
 FUZZ_TARGET(asmap_direct)
 {
diff --git a/src/test/fuzz/cluster_linearize.cpp b/src/test/fuzz/cluster_linearize.cpp
index fb4bf3a719f..5ac9edfc69e 100644
--- a/src/test/fuzz/cluster_linearize.cpp
+++ b/src/test/fuzz/cluster_linearize.cpp
@@ -13,7 +13,7 @@
 #include <util/feefrac.h>
 
 #include <algorithm>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <utility>
 
diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp
index 6000d52fc97..dac6f4ab4b6 100644
--- a/src/test/fuzz/coinscache_sim.cpp
+++ b/src/test/fuzz/coinscache_sim.cpp
@@ -9,10 +9,10 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 
-#include <assert.h>
+#include <cassert>
 #include <optional>
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 namespace {
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index 270d546c394..46ac0785136 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -32,7 +32,7 @@
 #include <exception>
 #include <optional>
 #include <stdexcept>
-#include <stdint.h>
+#include <cstdint>
 
 using node::SnapshotMetadata;
 
diff --git a/src/test/fuzz/feeratediagram.cpp b/src/test/fuzz/feeratediagram.cpp
index 1a700987d67..6dcc63e91e2 100644
--- a/src/test/fuzz/feeratediagram.cpp
+++ b/src/test/fuzz/feeratediagram.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <vector>
 
@@ -12,7 +12,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 
-#include <assert.h>
+#include <cassert>
 
 namespace {
 
diff --git a/src/test/fuzz/txgraph.cpp b/src/test/fuzz/txgraph.cpp
index 2c9fda9cd93..7f7a3181b16 100644
--- a/src/test/fuzz/txgraph.cpp
+++ b/src/test/fuzz/txgraph.cpp
@@ -15,7 +15,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 using namespace cluster_linearize;
diff --git a/src/test/fuzz/vecdeque.cpp b/src/test/fuzz/vecdeque.cpp
index 9a71c43b987..13843b2c4b0 100644
--- a/src/test/fuzz/vecdeque.cpp
+++ b/src/test/fuzz/vecdeque.cpp
@@ -8,7 +8,7 @@
 #include <util/vecdeque.h>
 
 #include <deque>
-#include <stdint.h>
+#include <cstdint>
 
 namespace {
 
diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h
index 1381d5d431d..42ab8e94053 100644
--- a/src/test/scriptnum10.h
+++ b/src/test/scriptnum10.h
@@ -6,10 +6,10 @@
 #ifndef BITCOIN_TEST_SCRIPTNUM10_H
 #define BITCOIN_TEST_SCRIPTNUM10_H
 
-#include <assert.h>
+#include <cassert>
 #include <limits>
 #include <stdexcept>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index 746d4d3c6b8..caaacc71354 100644
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -7,8 +7,8 @@
 #include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
-#include <limits.h>
-#include <stdint.h>
+#include <climits>
+#include <cstdint>
 
 BOOST_FIXTURE_TEST_SUITE(scriptnum_tests, BasicTestingSetup)
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 9c68c8bb964..33a9133d2e2 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -8,7 +8,7 @@
 #include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/util/cluster_linearize.h b/src/test/util/cluster_linearize.h
index fa7945aac65..b69edb496b3 100644
--- a/src/test/util/cluster_linearize.h
+++ b/src/test/util/cluster_linearize.h
@@ -12,7 +12,7 @@
 #include <util/bitset.h>
 #include <util/feefrac.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <numeric>
 #include <vector>
 #include <utility>
diff --git a/src/test/util/coins.cpp b/src/test/util/coins.cpp
index 7e10c7c58d3..aea01d12fd8 100644
--- a/src/test/util/coins.cpp
+++ b/src/test/util/coins.cpp
@@ -10,7 +10,7 @@
 #include <test/util/random.h>
 #include <uint256.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 COutPoint AddTestCoin(FastRandomContext& rng, CCoinsViewCache& coins_view)
diff --git a/src/txgraph.h b/src/txgraph.h
index 9cfbe70acdc..6fa035fb5b8 100644
--- a/src/txgraph.h
+++ b/src/txgraph.h
@@ -5,7 +5,7 @@
 #include <compare>
 #include <memory>
 #include <optional>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <utility>
 
diff --git a/src/txrequest.cpp b/src/txrequest.cpp
index 5909146427b..1e40bb75bc0 100644
--- a/src/txrequest.cpp
+++ b/src/txrequest.cpp
@@ -21,7 +21,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include <assert.h>
+#include <cassert>
 
 namespace {
 
diff --git a/src/util/feefrac.h b/src/util/feefrac.h
index c29dabc43b4..7b3e6010d64 100644
--- a/src/util/feefrac.h
+++ b/src/util/feefrac.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_UTIL_FEEFRAC_H
 #define BITCOIN_UTIL_FEEFRAC_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <compare>
 #include <vector>
 #include <span.h>
diff --git a/src/util/tokenpipe.cpp b/src/util/tokenpipe.cpp
index 9425c62ebfc..1948beb7c2d 100644
--- a/src/util/tokenpipe.cpp
+++ b/src/util/tokenpipe.cpp
@@ -7,7 +7,7 @@
 
 #ifndef WIN32
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <optional>
 #include <unistd.h>
diff --git a/src/validation.h b/src/validation.h
index 0a8a94db120..05a2a2df8c0 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -41,7 +41,7 @@
 #include <optional>
 #include <set>
 #include <span>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index 9b6215f9371..c53b6935b1b 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -17,7 +17,7 @@
 #include <wallet/db.h>
 
 #include <sqlite3.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include <optional>
 #include <utility>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 966c6d2c4ba..eda4b4d4992 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <future>
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include <addresstype.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 507b79e7a35..e576739bbe4 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -12,7 +12,7 @@
 #include <wallet/walletutil.h>
 #include <key.h>
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 

From facb152697b8d7b75a9e6108f8896f774b06b35f Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 3 Jun 2025 14:58:30 +0200
Subject: [PATCH 2/3] scripted-diff: Bump copyright headers after include
 changes

Historically, the headers have been bumped some time after a file has
been touched. Do it now to avoid having to touch them again in the
future for that reason.

-BEGIN VERIFY SCRIPT-
 sed -i --regexp-extended 's;( 20[0-2][0-9])(-20[0-2][0-9])? The Bitcoin Core developers;\1-present The Bitcoin Core developers;g' $( git show --pretty="" --name-only HEAD~0 )
-END VERIFY SCRIPT-
---
 src/bech32.cpp                           | 2 +-
 src/bech32.h                             | 2 +-
 src/bench/examples.cpp                   | 2 +-
 src/chainparamsbase.cpp                  | 2 +-
 src/coins.h                              | 2 +-
 src/common/args.h                        | 2 +-
 src/consensus/consensus.h                | 2 +-
 src/consensus/tx_verify.h                | 2 +-
 src/crypto/aes.cpp                       | 2 +-
 src/crypto/hkdf_sha256_32.cpp            | 2 +-
 src/crypto/hkdf_sha256_32.h              | 2 +-
 src/crypto/hmac_sha256.cpp               | 2 +-
 src/crypto/hmac_sha256.h                 | 2 +-
 src/crypto/hmac_sha512.cpp               | 2 +-
 src/crypto/hmac_sha512.h                 | 2 +-
 src/crypto/poly1305.cpp                  | 2 +-
 src/crypto/ripemd160.cpp                 | 2 +-
 src/crypto/ripemd160.h                   | 2 +-
 src/crypto/sha1.cpp                      | 2 +-
 src/crypto/sha1.h                        | 2 +-
 src/crypto/sha256.h                      | 2 +-
 src/crypto/sha256_avx2.cpp               | 2 +-
 src/crypto/sha256_sse4.cpp               | 2 +-
 src/crypto/sha256_sse41.cpp              | 2 +-
 src/crypto/sha256_x86_shani.cpp          | 2 +-
 src/crypto/sha512.cpp                    | 2 +-
 src/crypto/sha512.h                      | 2 +-
 src/kernel/disconnected_transactions.cpp | 2 +-
 src/kernel/mempool_entry.h               | 2 +-
 src/key_io.cpp                           | 2 +-
 src/netbase.h                            | 2 +-
 src/node/connection_types.h              | 2 +-
 src/node/miner.h                         | 2 +-
 src/node/mini_miner.h                    | 2 +-
 src/pow.h                                | 2 +-
 src/qt/bitcoin.h                         | 2 +-
 src/qt/clientmodel.cpp                   | 2 +-
 src/qt/notificator.cpp                   | 2 +-
 src/qt/optionsmodel.h                    | 2 +-
 src/qt/transactiondesc.cpp               | 2 +-
 src/qt/transactionrecord.cpp             | 2 +-
 src/rpc/blockchain.cpp                   | 2 +-
 src/rpc/blockchain.h                     | 2 +-
 src/rpc/client.cpp                       | 2 +-
 src/rpc/node.cpp                         | 2 +-
 src/rpc/server.h                         | 2 +-
 src/test/compress_tests.cpp              | 2 +-
 src/test/denialofservice_tests.cpp       | 2 +-
 src/test/fuzz/addrman.cpp                | 2 +-
 src/test/fuzz/asmap_direct.cpp           | 2 +-
 src/test/fuzz/coinscache_sim.cpp         | 2 +-
 src/test/fuzz/deserialize.cpp            | 2 +-
 src/test/scriptnum10.h                   | 2 +-
 src/test/scriptnum_tests.cpp             | 2 +-
 src/test/util/coins.cpp                  | 2 +-
 src/txrequest.cpp                        | 2 +-
 src/util/tokenpipe.cpp                   | 2 +-
 src/wallet/test/wallet_tests.cpp         | 2 +-
 src/wallet/walletdb.h                    | 2 +-
 59 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/bech32.cpp b/src/bech32.cpp
index 08bdce6dd58..ed918622176 100644
--- a/src/bech32.cpp
+++ b/src/bech32.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2017, 2021 Pieter Wuille
-// Copyright (c) 2021-2022 The Bitcoin Core developers
+// Copyright (c) 2021-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bech32.h b/src/bech32.h
index bc50ba54213..ba4c79bb869 100644
--- a/src/bech32.h
+++ b/src/bech32.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2017, 2021 Pieter Wuille
-// Copyright (c) 2021 The Bitcoin Core developers
+// Copyright (c) 2021-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
index 6f5d1052ba6..0769b80da0a 100644
--- a/src/bench/examples.cpp
+++ b/src/bench/examples.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2022 The Bitcoin Core developers
+// Copyright (c) 2015-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 24860088dd6..d816d1af91c 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/coins.h b/src/coins.h
index 7676f7d8702..6725d5a51f6 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/common/args.h b/src/common/args.h
index f5dce850846..c35e2cb88a7 100644
--- a/src/common/args.h
+++ b/src/common/args.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 The Bitcoin Core developers
+// Copyright (c) 2023-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index b4e1f027768..1e5a6bc4c3c 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h
index 845dcbf1c26..8b7e6d6b385 100644
--- a/src/consensus/tx_verify.h
+++ b/src/consensus/tx_verify.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 The Bitcoin Core developers
+// Copyright (c) 2017-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index b9537c7a3e7..40df5690e0f 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2019 The Bitcoin Core developers
+// Copyright (c) 2016-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hkdf_sha256_32.cpp b/src/crypto/hkdf_sha256_32.cpp
index 4d2762b9b4d..e62249446a4 100644
--- a/src/crypto/hkdf_sha256_32.cpp
+++ b/src/crypto/hkdf_sha256_32.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2019 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hkdf_sha256_32.h b/src/crypto/hkdf_sha256_32.h
index 3e71b0a29c6..3010e678a46 100644
--- a/src/crypto/hkdf_sha256_32.h
+++ b/src/crypto/hkdf_sha256_32.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp
index 2ac8d0e18b3..034652064e5 100644
--- a/src/crypto/hmac_sha256.cpp
+++ b/src/crypto/hmac_sha256.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h
index 4bcd0163abd..2f729700149 100644
--- a/src/crypto/hmac_sha256.h
+++ b/src/crypto/hmac_sha256.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp
index 26a988b6a6a..245ed29ec19 100644
--- a/src/crypto/hmac_sha512.cpp
+++ b/src/crypto/hmac_sha512.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h
index 6ea815aecf0..a25da385f48 100644
--- a/src/crypto/hmac_sha512.h
+++ b/src/crypto/hmac_sha512.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/poly1305.cpp b/src/crypto/poly1305.cpp
index 2640e320bf9..c9c066b3097 100644
--- a/src/crypto/poly1305.cpp
+++ b/src/crypto/poly1305.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 The Bitcoin Core developers
+// Copyright (c) 2019-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp
index 4dad37d533e..1347bbb12d8 100644
--- a/src/crypto/ripemd160.cpp
+++ b/src/crypto/ripemd160.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h
index 888ffb51895..6ade63bf34d 100644
--- a/src/crypto/ripemd160.h
+++ b/src/crypto/ripemd160.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp
index 69c0bba1307..6dce204c894 100644
--- a/src/crypto/sha1.cpp
+++ b/src/crypto/sha1.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index 62ffa5d7d4a..a22b65344e1 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index aef61328013..460557686cf 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp
index 6757a22f0aa..bfa54afa8ef 100644
--- a/src/crypto/sha256_avx2.cpp
+++ b/src/crypto/sha256_avx2.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2019 The Bitcoin Core developers
+// Copyright (c) 2017-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp
index aa8bf246663..683d44b6b0b 100644
--- a/src/crypto/sha256_sse4.cpp
+++ b/src/crypto/sha256_sse4.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022 The Bitcoin Core developers
+// Copyright (c) 2017-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp
index 308de456b4b..8a561d75e85 100644
--- a/src/crypto/sha256_sse41.cpp
+++ b/src/crypto/sha256_sse41.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2019 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha256_x86_shani.cpp b/src/crypto/sha256_x86_shani.cpp
index 316cfdf5182..5ee957aaa78 100644
--- a/src/crypto/sha256_x86_shani.cpp
+++ b/src/crypto/sha256_x86_shani.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The Bitcoin Core developers
+// Copyright (c) 2018-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp
index d1a5eec257e..338627fc5f7 100644
--- a/src/crypto/sha512.cpp
+++ b/src/crypto/sha512.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
index 33240229090..665c8b886ed 100644
--- a/src/crypto/sha512.h
+++ b/src/crypto/sha512.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/kernel/disconnected_transactions.cpp b/src/kernel/disconnected_transactions.cpp
index f9431cef640..9667642a03d 100644
--- a/src/kernel/disconnected_transactions.cpp
+++ b/src/kernel/disconnected_transactions.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 The Bitcoin Core developers
+// Copyright (c) 2023-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h
index 0c3f08ba9ea..531ccb76b67 100644
--- a/src/kernel/mempool_entry.h
+++ b/src/kernel/mempool_entry.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 3e8633af36c..3726d22233f 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2021 The Bitcoin Core developers
+// Copyright (c) 2014-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/netbase.h b/src/netbase.h
index 0ecd209a6f0..8802be6638a 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/node/connection_types.h b/src/node/connection_types.h
index 037e15d866f..08f08824996 100644
--- a/src/node/connection_types.h
+++ b/src/node/connection_types.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 The Bitcoin Core developers
+// Copyright (c) 2022-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/node/miner.h b/src/node/miner.h
index 24651edc524..047413534b6 100644
--- a/src/node/miner.h
+++ b/src/node/miner.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/node/mini_miner.h b/src/node/mini_miner.h
index 60eb5c81ff5..07e6239c376 100644
--- a/src/node/mini_miner.h
+++ b/src/node/mini_miner.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 The Bitcoin Core developers
+// Copyright (c) 2022-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/pow.h b/src/pow.h
index dbf9a673293..7ee1bddd3c3 100644
--- a/src/pow.h
+++ b/src/pow.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
index 142a7e2da56..abc478bd456 100644
--- a/src/qt/bitcoin.h
+++ b/src/qt/bitcoin.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index b923ffe8dad..dda26fa059b 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 47a21cf898e..f473ac1ff19 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index efe9b3bd4df..4cbd5319229 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 74ddb35c191..db3c7f74176 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index cce453acf3e..4325c7f1582 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d5ce1bd4696..dd70c499fd7 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 649c1dddec8..b42fe96fd30 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022 The Bitcoin Core developers
+// Copyright (c) 2017-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 74e091224bd..4c2b03bad08 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 60f7c398582..a5da8785df4 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/server.h b/src/rpc/server.h
index a14897f390c..ba9e4d7d7cd 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index c8289a281f9..7fefa467448 100644
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2021 The Bitcoin Core developers
+// Copyright (c) 2012-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 800a9eac247..16fdd4b7b65 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2022 The Bitcoin Core developers
+// Copyright (c) 2011-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
index bce7e64ac7b..962192cefd3 100644
--- a/src/test/fuzz/addrman.cpp
+++ b/src/test/fuzz/addrman.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The Bitcoin Core developers
+// Copyright (c) 2020-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/fuzz/asmap_direct.cpp b/src/test/fuzz/asmap_direct.cpp
index 16c70a582b3..1d693e5ecf5 100644
--- a/src/test/fuzz/asmap_direct.cpp
+++ b/src/test/fuzz/asmap_direct.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 The Bitcoin Core developers
+// Copyright (c) 2020-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp
index dac6f4ab4b6..91b98292fe8 100644
--- a/src/test/fuzz/coinscache_sim.cpp
+++ b/src/test/fuzz/coinscache_sim.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 The Bitcoin Core developers
+// Copyright (c) 2023-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index 46ac0785136..5a09963e2c2 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h
index 42ab8e94053..38a6fee1dc8 100644
--- a/src/test/scriptnum10.h
+++ b/src/test/scriptnum10.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index caaacc71354..289a31da80a 100644
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 The Bitcoin Core developers
+// Copyright (c) 2012-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/util/coins.cpp b/src/test/util/coins.cpp
index aea01d12fd8..2dd98ae770f 100644
--- a/src/test/util/coins.cpp
+++ b/src/test/util/coins.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 The Bitcoin Core developers
+// Copyright (c) 2023-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/txrequest.cpp b/src/txrequest.cpp
index 1e40bb75bc0..03b4cd6b161 100644
--- a/src/txrequest.cpp
+++ b/src/txrequest.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 The Bitcoin Core developers
+// Copyright (c) 2020-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/util/tokenpipe.cpp b/src/util/tokenpipe.cpp
index 1948beb7c2d..c982fa6fc47 100644
--- a/src/util/tokenpipe.cpp
+++ b/src/util/tokenpipe.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 The Bitcoin Core developers
+// Copyright (c) 2021-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <util/tokenpipe.h>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index eda4b4d4992..8998fdb0780 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 The Bitcoin Core developers
+// Copyright (c) 2012-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index e576739bbe4..a126da394d4 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

From fa9ca13f35be0a023aeed78775ad66f95717b28b Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 3 Jun 2025 19:51:23 +0200
Subject: [PATCH 3/3] refactor: Sort includes of touched source files

---
 src/bench/parse_hex.cpp             | 5 +++--
 src/bip324.cpp                      | 2 +-
 src/cluster_linearize.h             | 4 ++--
 src/common/args.h                   | 2 +-
 src/consensus/consensus.h           | 2 +-
 src/crypto/chacha20.h               | 2 +-
 src/crypto/chacha20poly1305.cpp     | 2 +-
 src/crypto/hkdf_sha256_32.h         | 2 +-
 src/crypto/hmac_sha256.h            | 2 +-
 src/crypto/hmac_sha512.h            | 2 +-
 src/crypto/poly1305.h               | 2 +-
 src/crypto/ripemd160.h              | 2 +-
 src/crypto/sha1.h                   | 2 +-
 src/crypto/sha256.h                 | 2 +-
 src/crypto/sha256_sse4.cpp          | 2 +-
 src/crypto/sha3.h                   | 2 +-
 src/crypto/sha512.h                 | 2 +-
 src/interfaces/node.h               | 4 ++--
 src/kernel/mempool_entry.h          | 4 ++--
 src/netbase.h                       | 2 +-
 src/node/connection_types.h         | 2 +-
 src/node/miner.h                    | 2 +-
 src/node/mini_miner.h               | 2 +-
 src/rpc/client.cpp                  | 2 +-
 src/rpc/mining.cpp                  | 2 +-
 src/rpc/rawtransaction.cpp          | 2 +-
 src/rpc/server.h                    | 2 +-
 src/streams.h                       | 4 ++--
 src/test/fuzz/addrman.cpp           | 2 +-
 src/test/fuzz/cluster_linearize.cpp | 4 ++--
 src/test/fuzz/coinscache_sim.cpp    | 6 +++---
 src/test/fuzz/deserialize.cpp       | 2 +-
 src/test/fuzz/txgraph.cpp           | 6 +++---
 src/test/fuzz/vecdeque.cpp          | 2 +-
 src/test/scriptnum10.h              | 2 +-
 src/test/util/cluster_linearize.h   | 2 +-
 src/txgraph.h                       | 4 ++--
 src/util/feefrac.h                  | 7 ++++---
 src/validation.h                    | 2 +-
 src/wallet/sqlite.cpp               | 4 ++--
 src/wallet/test/wallet_tests.cpp    | 2 +-
 src/wallet/walletdb.h               | 2 +-
 42 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/src/bench/parse_hex.cpp b/src/bench/parse_hex.cpp
index c20e9546c34..fa08f5d84a1 100644
--- a/src/bench/parse_hex.cpp
+++ b/src/bench/parse_hex.cpp
@@ -1,12 +1,13 @@
-// Copyright (c) 2024- The Bitcoin Core developers
+// Copyright (c) 2024-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
 #include <random.h>
-#include <cstddef>
 #include <util/strencodings.h>
+
 #include <cassert>
+#include <cstddef>
 #include <optional>
 #include <vector>
 
diff --git a/src/bip324.cpp b/src/bip324.cpp
index bb1fae5dee4..9c5a1572bb7 100644
--- a/src/bip324.cpp
+++ b/src/bip324.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
 #include <string>
 
diff --git a/src/cluster_linearize.h b/src/cluster_linearize.h
index 2a3c649576f..17b7e6b27a0 100644
--- a/src/cluster_linearize.h
+++ b/src/cluster_linearize.h
@@ -6,11 +6,11 @@
 #define BITCOIN_CLUSTER_LINEARIZE_H
 
 #include <algorithm>
+#include <cstdint>
 #include <numeric>
 #include <optional>
-#include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include <random.h>
 #include <span.h>
diff --git a/src/common/args.h b/src/common/args.h
index c35e2cb88a7..6c5ac48ae3e 100644
--- a/src/common/args.h
+++ b/src/common/args.h
@@ -11,12 +11,12 @@
 #include <util/chaintype.h>
 #include <util/fs.h>
 
+#include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
 #include <optional>
 #include <set>
-#include <cstdint>
 #include <string>
 #include <variant>
 #include <vector>
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 1e5a6bc4c3c..71b5fe2468d 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -6,8 +6,8 @@
 #ifndef BITCOIN_CONSENSUS_CONSENSUS_H
 #define BITCOIN_CONSENSUS_CONSENSUS_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
 static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h
index 223b317f355..6653c2c9733 100644
--- a/src/crypto/chacha20.h
+++ b/src/crypto/chacha20.h
@@ -9,8 +9,8 @@
 
 #include <array>
 #include <cstddef>
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 #include <utility>
 
 // classes for ChaCha20 256-bit stream cipher developed by Daniel J. Bernstein
diff --git a/src/crypto/chacha20poly1305.cpp b/src/crypto/chacha20poly1305.cpp
index 06dbf6037b9..5b918d9b910 100644
--- a/src/crypto/chacha20poly1305.cpp
+++ b/src/crypto/chacha20poly1305.cpp
@@ -4,8 +4,8 @@
 
 #include <crypto/chacha20poly1305.h>
 
-#include <crypto/common.h>
 #include <crypto/chacha20.h>
+#include <crypto/common.h>
 #include <crypto/poly1305.h>
 #include <span.h>
 #include <support/cleanse.h>
diff --git a/src/crypto/hkdf_sha256_32.h b/src/crypto/hkdf_sha256_32.h
index 3010e678a46..f9f343b4b76 100644
--- a/src/crypto/hkdf_sha256_32.h
+++ b/src/crypto/hkdf_sha256_32.h
@@ -7,8 +7,8 @@
 
 #include <crypto/hmac_sha256.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A rfc5869 HKDF implementation with HMAC_SHA256 and fixed key output length of 32 bytes (L=32) */
 class CHKDF_HMAC_SHA256_L32
diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h
index 2f729700149..ea8cee88085 100644
--- a/src/crypto/hmac_sha256.h
+++ b/src/crypto/hmac_sha256.h
@@ -7,8 +7,8 @@
 
 #include <crypto/sha256.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for HMAC-SHA-256. */
 class CHMAC_SHA256
diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h
index a25da385f48..d6bebc093c6 100644
--- a/src/crypto/hmac_sha512.h
+++ b/src/crypto/hmac_sha512.h
@@ -7,8 +7,8 @@
 
 #include <crypto/sha512.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for HMAC-SHA-512. */
 class CHMAC_SHA512
diff --git a/src/crypto/poly1305.h b/src/crypto/poly1305.h
index 1b7e355fee1..494f7cdd4d8 100644
--- a/src/crypto/poly1305.h
+++ b/src/crypto/poly1305.h
@@ -8,8 +8,8 @@
 #include <span.h>
 
 #include <cassert>
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 #define POLY1305_BLOCK_SIZE 16
 
diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h
index 6ade63bf34d..a06a3255e21 100644
--- a/src/crypto/ripemd160.h
+++ b/src/crypto/ripemd160.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_RIPEMD160_H
 #define BITCOIN_CRYPTO_RIPEMD160_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for RIPEMD-160. */
 class CRIPEMD160
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index a22b65344e1..fcb96ee6a72 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA1_H
 #define BITCOIN_CRYPTO_SHA1_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for SHA1. */
 class CSHA1
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index 460557686cf..3ac771c5d0d 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA256_H
 #define BITCOIN_CRYPTO_SHA256_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 #include <string>
 
 /** A hasher class for SHA-256. */
diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp
index 683d44b6b0b..d0a34934d80 100644
--- a/src/crypto/sha256_sse4.cpp
+++ b/src/crypto/sha256_sse4.cpp
@@ -5,8 +5,8 @@
 // This is a translation to GCC extended asm syntax from YASM code by Intel
 // (available at the bottom of this file).
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 #if defined(__x86_64__) || defined(__amd64__)
 
diff --git a/src/crypto/sha3.h b/src/crypto/sha3.h
index 6d114379f36..7a538e4a275 100644
--- a/src/crypto/sha3.h
+++ b/src/crypto/sha3.h
@@ -7,8 +7,8 @@
 
 #include <span.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 //! The Keccak-f[1600] transform.
 void KeccakF(uint64_t (&st)[25]);
diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
index 665c8b886ed..102fa02a8cb 100644
--- a/src/crypto/sha512.h
+++ b/src/crypto/sha512.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA512_H
 #define BITCOIN_CRYPTO_SHA512_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for SHA-512. */
 class CSHA512
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 2ab9f84e734..a74695be85e 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -15,10 +15,10 @@
 #include <support/allocators/secure.h>
 #include <util/translation.h>
 
-#include <functional>
-#include <memory>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <vector>
diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h
index 531ccb76b67..51a1f26642f 100644
--- a/src/kernel/mempool_entry.h
+++ b/src/kernel/mempool_entry.h
@@ -15,11 +15,11 @@
 #include <util/overflow.h>
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <set>
-#include <cstddef>
-#include <cstdint>
 
 class CBlockIndex;
 
diff --git a/src/netbase.h b/src/netbase.h
index 8802be6638a..b2cc172e536 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -11,9 +11,9 @@
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
 
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
diff --git a/src/node/connection_types.h b/src/node/connection_types.h
index 08f08824996..a00895e2a8a 100644
--- a/src/node/connection_types.h
+++ b/src/node/connection_types.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_NODE_CONNECTION_TYPES_H
 #define BITCOIN_NODE_CONNECTION_TYPES_H
 
-#include <string>
 #include <cstdint>
+#include <string>
 
 /** Different types of connections to a peer. This enum encapsulates the
  * information we have available at the time of opening or accepting the
diff --git a/src/node/miner.h b/src/node/miner.h
index 047413534b6..a9a88b39cf2 100644
--- a/src/node/miner.h
+++ b/src/node/miner.h
@@ -13,9 +13,9 @@
 #include <txmempool.h>
 #include <util/feefrac.h>
 
+#include <cstdint>
 #include <memory>
 #include <optional>
-#include <cstdint>
 
 #include <boost/multi_index/identity.hpp>
 #include <boost/multi_index/indexed_by.hpp>
diff --git a/src/node/mini_miner.h b/src/node/mini_miner.h
index 07e6239c376..73143e829e7 100644
--- a/src/node/mini_miner.h
+++ b/src/node/mini_miner.h
@@ -9,11 +9,11 @@
 #include <primitives/transaction.h>
 #include <uint256.h>
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
 #include <set>
-#include <cstdint>
 #include <vector>
 
 class CFeeRate;
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 4c2b03bad08..0916c631c2f 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -7,8 +7,8 @@
 #include <rpc/client.h>
 #include <tinyformat.h>
 
-#include <set>
 #include <cstdint>
+#include <set>
 #include <string>
 #include <string_view>
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index ef234c6283e..4fa62447af6 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -43,8 +43,8 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <memory>
 #include <cstdint>
+#include <memory>
 
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 93541a93300..9c26e5c733c 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -42,8 +42,8 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <numeric>
 #include <cstdint>
+#include <numeric>
 
 #include <univalue.h>
 
diff --git a/src/rpc/server.h b/src/rpc/server.h
index ba9e4d7d7cd..d4b48f2418f 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -9,9 +9,9 @@
 #include <rpc/request.h>
 #include <rpc/util.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
-#include <cstdint>
 #include <string>
 
 #include <univalue.h>
diff --git a/src/streams.h b/src/streams.h
index 0b3b939fabd..5a596047121 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -14,12 +14,12 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <cstdio>
+#include <cstring>
 #include <ios>
 #include <limits>
 #include <optional>
-#include <cstdint>
-#include <cstring>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
index 962192cefd3..a13945a5206 100644
--- a/src/test/fuzz/addrman.cpp
+++ b/src/test/fuzz/addrman.cpp
@@ -14,12 +14,12 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
-#include <ctime>
 #include <util/asmap.h>
 #include <util/chaintype.h>
 
 #include <cassert>
 #include <cstdint>
+#include <ctime>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/src/test/fuzz/cluster_linearize.cpp b/src/test/fuzz/cluster_linearize.cpp
index 5ac9edfc69e..6a1ea40aef3 100644
--- a/src/test/fuzz/cluster_linearize.cpp
+++ b/src/test/fuzz/cluster_linearize.cpp
@@ -6,16 +6,16 @@
 #include <random.h>
 #include <serialize.h>
 #include <streams.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/util/cluster_linearize.h>
 #include <util/bitset.h>
 #include <util/feefrac.h>
 
 #include <algorithm>
 #include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 using namespace cluster_linearize;
 
diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp
index 91b98292fe8..30845c2ef9c 100644
--- a/src/test/fuzz/coinscache_sim.cpp
+++ b/src/test/fuzz/coinscache_sim.cpp
@@ -5,14 +5,14 @@
 #include <coins.h>
 #include <crypto/sha256.h>
 #include <primitives/transaction.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 
 #include <cassert>
-#include <optional>
-#include <memory>
 #include <cstdint>
+#include <memory>
+#include <optional>
 #include <vector>
 
 namespace {
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index 5a09963e2c2..05ca62b6fd0 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -29,10 +29,10 @@
 #include <test/util/setup_common.h>
 #include <undo.h>
 
+#include <cstdint>
 #include <exception>
 #include <optional>
 #include <stdexcept>
-#include <cstdint>
 
 using node::SnapshotMetadata;
 
diff --git a/src/test/fuzz/txgraph.cpp b/src/test/fuzz/txgraph.cpp
index 7f7a3181b16..e4649970384 100644
--- a/src/test/fuzz/txgraph.cpp
+++ b/src/test/fuzz/txgraph.cpp
@@ -2,20 +2,20 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <txgraph.h>
 #include <cluster_linearize.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/util/random.h>
+#include <txgraph.h>
 #include <util/bitset.h>
 #include <util/feefrac.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <iterator>
 #include <map>
 #include <memory>
 #include <set>
-#include <cstdint>
 #include <utility>
 
 using namespace cluster_linearize;
diff --git a/src/test/fuzz/vecdeque.cpp b/src/test/fuzz/vecdeque.cpp
index 13843b2c4b0..30fc2da03f4 100644
--- a/src/test/fuzz/vecdeque.cpp
+++ b/src/test/fuzz/vecdeque.cpp
@@ -7,8 +7,8 @@
 #include <test/fuzz/util.h>
 #include <util/vecdeque.h>
 
-#include <deque>
 #include <cstdint>
+#include <deque>
 
 namespace {
 
diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h
index 38a6fee1dc8..db66f3a14c9 100644
--- a/src/test/scriptnum10.h
+++ b/src/test/scriptnum10.h
@@ -7,9 +7,9 @@
 #define BITCOIN_TEST_SCRIPTNUM10_H
 
 #include <cassert>
+#include <cstdint>
 #include <limits>
 #include <stdexcept>
-#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/test/util/cluster_linearize.h b/src/test/util/cluster_linearize.h
index b69edb496b3..a89a46552b6 100644
--- a/src/test/util/cluster_linearize.h
+++ b/src/test/util/cluster_linearize.h
@@ -14,8 +14,8 @@
 
 #include <cstdint>
 #include <numeric>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace {
 
diff --git a/src/txgraph.h b/src/txgraph.h
index 6fa035fb5b8..5779397f82f 100644
--- a/src/txgraph.h
+++ b/src/txgraph.h
@@ -3,11 +3,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <compare>
+#include <cstdint>
 #include <memory>
 #include <optional>
-#include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include <util/feefrac.h>
 
diff --git a/src/util/feefrac.h b/src/util/feefrac.h
index 7b3e6010d64..7577107e8c2 100644
--- a/src/util/feefrac.h
+++ b/src/util/feefrac.h
@@ -5,12 +5,13 @@
 #ifndef BITCOIN_UTIL_FEEFRAC_H
 #define BITCOIN_UTIL_FEEFRAC_H
 
-#include <cstdint>
-#include <compare>
-#include <vector>
 #include <span.h>
 #include <util/check.h>
 
+#include <compare>
+#include <cstdint>
+#include <vector>
+
 /** Data structure storing a fee and size, ordered by increasing fee/size.
  *
  * The size of a FeeFrac cannot be zero unless the fee is also zero.
diff --git a/src/validation.h b/src/validation.h
index 05a2a2df8c0..87a1de7cfb8 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -36,12 +36,12 @@
 #include <versionbits.h>
 
 #include <atomic>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
 #include <set>
 #include <span>
-#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index c53b6935b1b..b902dd82c1d 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -10,15 +10,15 @@
 #include <crypto/common.h>
 #include <logging.h>
 #include <sync.h>
-#include <util/fs_helpers.h>
 #include <util/check.h>
+#include <util/fs_helpers.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
 #include <wallet/db.h>
 
 #include <sqlite3.h>
-#include <cstdint>
 
+#include <cstdint>
 #include <optional>
 #include <utility>
 #include <vector>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 8998fdb0780..1b0cfe2c4f5 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -4,9 +4,9 @@
 
 #include <wallet/wallet.h>
 
+#include <cstdint>
 #include <future>
 #include <memory>
-#include <cstdint>
 #include <vector>
 
 #include <addresstype.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index a126da394d4..5327a2cf691 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -6,11 +6,11 @@
 #ifndef BITCOIN_WALLET_WALLETDB_H
 #define BITCOIN_WALLET_WALLETDB_H
 
+#include <key.h>
 #include <script/sign.h>
 #include <util/transaction_identifier.h>
 #include <wallet/db.h>
 #include <wallet/walletutil.h>
-#include <key.h>
 
 #include <cstdint>
 #include <string>