Moved more defines out to the config.h