I would actually add a deprecated pragma yet. It will give users warnings they cannot generally do something about without using CPP. Perhaps after some time we can add them back.