Refactor core headers