Removed superfluous includes (closes #3499)
Merge pull request #607 from eguaj/3.2-A3499

Removed superfluous includes (closes #3499)