minor code style cleanup after recent merges

- add a missing license header
- correct some header orderings etc.