minor cleanup: include orders, end comments etc.

- no code changes

@laanwj This should be really uncontroversial this time, so perhaps you can just merge it.
What do you mean? Qt classes should be inside such a block, that's what I added.