Merge "Remove unused defines from <features.h>."