Tidy up includes
Merge pull request #591 from cfailde/includes

Tidy up includes