Fix clang formatting problems

While attempting to format the repo with clang-format, several problems were found with the #include order. these need to be fixed.
There is a branch with some work in progress.