This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.