Remove a few useless header inclusions