COMP: Remove redundant includes
Merge pull request #71 from jamiesnape/StripIncludes

COMP: Remove redundant includes