Do not remove. It doesn't look like there's a good reason to, anyway, since the headers are still included.

This should be done somewhere else.. but that's a separate change for later.