Tidy up includes

- removed unnecessary includes
- moved includes to where they are actually used.
Merge pull request #587 from cfailde/includes2

Tidy up includes