Re: gdiplus: C++ fixes for headers