--- pixmap/pixmapUnix.c.orig 2014-12-27 15:05:29.000000000 -0600 +++ pixmap/pixmapUnix.c 2019-03-09 15:40:56.000000000 -0600 @@ -13,11 +13,15 @@ #include "pixmapInt.h" #include -#include "X11/Xlib.h" -#include "X11/Xutil.h" + #ifdef MAC_OSX_TK +#include +#include #define XPutImage +#else +#include +#include #endif typedef struct PixmapData { --- window/window.c.orig 2018-09-14 08:53:49.000000000 -0500 +++ window/window.c 2019-03-09 15:32:57.000000000 -0600 @@ -13,13 +13,14 @@ #include "init.c" -#include "X11/Xutil.h" #ifndef __WIN32__ # ifndef MAC_OSX_TK -# include "X11/Xproto.h" +# include +# include # else -# include "X11/Xlib.h" -# include "X11/Xfuncproto.h" +# include +# include +# include # endif #else # include "X11/Xlib.h"