On Nov 18, 2016, at 2:45 AM, Rainer Orth <r...@cebitec.uni-bielefeld.de> wrote: > So the current suggestion is to combine my fixincludes patch and Jack's > patch to disable <os/trace.h> use if !__BLOCKS__.
> I guess this is ok for mainline now to restore bootstrap? I think we are down to everyone likes this, Ok. The big question is, does this need a back port? If you fix includes virtual members or data members of C/C++ classes, just be careful disappearing content as that can change the layout of the structure or class.