Remove unused includes
Merge pull request #69 from blackwarthog/master

Fix bug with includes