Merge pull request #117480 from akien-mga/clangd-misc-fixes

Misc includes or modernize fixes found via clangd-tidy