Remove unnecessary includes
Merge pull request #3 from nicka/remove_includes

Remove unnecessary includes