Simon Marchi authored Apr 29, 2024 and Simon Marchi committed May 30, 2024

Remove some includes reported as unused by clangd.  Add some includes in
other files that were previously relying on the transitive include.

Change-Id: Ibdd0a998b04d21362a20d0ca8e5267e21e2e133e