Remove unneeded header inclusions
Merge pull request #15 from baskerville/master

Remove unneeded header inclusions