#ifdef on new ID definitions