Tidy up some headers
Merge pull request #260 from dmcdougall/remove-unneeded-includes

Tidy up some headers