Run clang-format on these header files. Part of a WIP.