diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 297d9b9c8..cc909a1a3 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -52,7 +52,7 @@ Pixel xnestWhitePixel;
 Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 Pixmap xnestIconBitmap;
 Pixmap xnestScreenSaverPixmap;
-XlibGC xnestBitmapGC;
+GC xnestBitmapGC;
 unsigned long xnestEventMask;
 
 static int _X_NORETURN
diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h
index c1fbaebe5..6252ff964 100644
--- a/hw/xnest/Display.h
+++ b/hw/xnest/Display.h
@@ -37,7 +37,7 @@ extern Pixel xnestWhitePixel;
 extern Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 extern Pixmap xnestIconBitmap;
 extern Pixmap xnestScreenSaverPixmap;
-extern XlibGC xnestBitmapGC;
+extern GC xnestBitmapGC;
 extern unsigned long xnestEventMask;
 
 void xnestOpenDisplay(int argc, char *argv[]);
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index a695f7a3b..d4f3578ce 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -20,10 +20,8 @@ is" without express or implied warranty.
 #include "include/gcstruct.h"
 #include "include/privates.h"
 
-/* This file uses the GC definition form Xlib.h as XlibGC. */
-
 typedef struct {
-    XlibGC gc;
+    GC gc;
 } xnestPrivGC;
 
 extern DevPrivateKeyRec xnestGCPrivateKeyRec;
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index fafb2c876..71606f583 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -67,11 +67,9 @@ typedef XID KeySym64;
 #define KeySym          KeySym64
 #endif  /*_XSERVER64*/
 
-#define GC XlibGC
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
-#undef GC
 
 #ifdef _XSERVER64_tmp
 #define _XSERVER64