code cosmetics

- remove unused header includes
- add missing header includes
- change initialization order