Use more config.h defines for more campatibility