Add core headers