[TASK] Duplicate defines

Those were moved to boostrap in mainline.