Remove headers moved into core.