Removed redundant includes
Merge pull request #4002 from adrian17/master

Removed redundant includes