Removed superfluous includes (closes #3499)