Misc includes or modernize fixes found via clangd-tidy