Cleanup the config.h file to always use #if rather than #ifdef