Remove headers that have been moved into core.