Revert includes that were accidentally changed with another pull request
Merge pull request #231 from timwindsor/master

Revert includes that were accidentally changed with another pull request