header include cleanup

- ensures alphabetical ordering for includes etc. in source file headers
Merge pull request #4911

611116d header include cleanup (Philip Kaufmann)