Build issues with the new central header file.