This should hopefully be fixed in my new commit.  Note that I have followed the format of some of the other .cpp files where they include their own .h first on a separate line, then group the others alphabetically.