I don't think this is acceptable. It should be done in a way that
doesn't introduce mess like this.
I split the patches but I didn't know how to do it . For not breaking
compilation, I added these temporary defines. The later patch removes those
again.
