Come up with a standardized include order, add it to the tester, and fix all the existing files