Merge "Use a separate config.h for config like defines."