> Commit: 62c2759aca0918326563bd8132afd8d531b896a5 > Author: looncraz <looncraz@xxxxxxxxxxxx> > Date: Mon Mar 30 01:01:04 2015 UTC > > diff --git a/src/kits/interface/ScreenStream.cpp b/src/kits/interface/ScreenStream.cpp > index 7a7dc5e..dd1cffd 100644 > --- a/src/kits/interface/ScreenStream.cpp > +++ b/src/kits/interface/ScreenStream.cpp > @@ -1,15 +1,23 @@ > #include <stdio.h> > > +#include <Application.h> > #include <Autolock.h> > -#include <Bitmap.h> > +// Is there a way to get rid of this? > +# undef private > +# define private public > +# include <Bitmap.h> > +# undef private > +# define private private Can't you make BScreenStream a friend to BBitmap instead? However, I have no idea whether that causes issues with ABI compliance.