Removing redundant includes