minor code style cleanup after recent merges

- add a missing license header
- correct some header orderings etc.
Merge pull request #5205

b4347f6 minor code style cleanup after recent merges (Philip Kaufmann)