minor cleanup: include orders, end comments etc.

- no code changes
Merge pull request #5186

771d500 minor cleanup: include orders, end comments etc. (Philip Kaufmann)