Whitespace changes by clang-format.

These files are the ones with the least number of changes when running
clang-format over them and only the less controversial changes are
included, with a preference for having stay the same where things are
likely to be more controversial.
Is there an option to retain/direct nesting of conditional includes for clarity of level of nesting or is this not considered wise?