Tidy up includes

- removed unnecessary includes
- moved includes to where they are actually used.