Hi Bernhard,
As you probably figured you will need to either wait for the long conversion patch to be applied, or send it before these, and combined in the series.
Also, while you're at it, you probably should merge the first patch here with the second which uses the macro, so that you don't add dead code (even a macro). It's probably okay if it is in a completely separate place, like adding something to the public header, then use it separately, but in a private source we try to avoid it.
Cheers,