diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index f5fa5eed34..7eadc482b8 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -50,10 +50,6 @@ #include #include -#ifdef XQUARTZ_SPARKLE -#include -#endif - #include // pbproxy/pbproxy.h diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index 5b38a1174d..170bccc65a 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -40,7 +40,9 @@ #include "xpr/x-list.h" #ifdef XQUARTZ_SPARKLE +#define BOOL OSX_BOOL #include +#undef BOOL #endif @interface X11Controller : NSObject