Remove unnecessary includes.

Fixes #6189