I think these can come in either order and break each other regardless? If so might be tempted to revert first.

In D38216#868503, @jrtc27 wrote:

I think these can come in either order and break each other regardless? If so might be tempted to revert first.

Oh right, I guess it does break both ways. I had reverted first locally actually to make sure I could reproduce the breakage before testing the cdefs.h change. I can commit them in that order (revert first).