Fix new defines creation