small headers ordering cleanup

- keep headers in alphabetical order
- fix Makefile.am (2 files in 1 line - leftover)
- remove some spaces etc.
Merge pull request #3510

c037531 small headers ordering cleanup (Philip Kaufmann)