Removing obsolete includes
Merge pull request #20 from gfscott/master

Removing obsolete includes