updates to compile after replacing core headers