Core/Build: Updated the header files to fix the build.