I also ran `git clang-format` to get the headers in the right order for the new location, which has changed the order of other headers in two files.