sorry one more item I missed earlier...

Change the include order to match the style guide.

https://github.com/highfidelity/hifi/wiki/Coding-Standard#wiki-222-include-statements-should-be-sorted-and-grouped-sorted-by-their-hierarchical-position-in-the-system-with-low-level-files-included-first-leave-an-empty-line-between-groups-of-include-statements