Changed the way in which the CBFS key is added as a preprocessor definition.