[includes] Fix up included files
Summary:
Partial backport of core#22950:
https://github.com/bitcoin/bitcoin/pull/22950/commits/3c263d3f63c3598954ee2b65a0e721e3c22e52f8
Depends on D12335.
Test Plan:
ninja all check
Reviewers: #bitcoin_abc, PiRK
Reviewed By: #bitcoin_abc, PiRK
Differential Revision: https://reviews.bitcoinabc.org/D12336