diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 717f04251..217bc6e9a 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Args.h"
 
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index 3165193d7..5fdfba8cc 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Color.h"
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 6ba1377e6..b26302219 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointrst.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNCursor.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index cbef01e65..f461e0480 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -28,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Init.h"
 #include "Args.h"
@@ -52,7 +50,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 4e9dbf463..a9f6b1ba7 100644
--- a/hw/xnest/Display.h
+++ b/hw/xnest/Display.h
@@ -15,6 +15,9 @@ is" without express or implied warranty.
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #define UNDEFINED -1
 
 #define MAXDEPTH 32
@@ -35,7 +38,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/Events.c b/hw/xnest/Events.c
index 879ee48be..f7d8eab04 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -30,8 +30,6 @@ is" without express or implied warranty.
 #include "inpututils.h"
 #include "mi.h"
 
-#include "Xnest.h"
-
 #include "Args.h"
 #include "Color.h"
 #include "Display.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 916715877..bd3c6efe3 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNFont.h"
 
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index fb6f5c84e..098308647 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "mistruct.h"
 #include "region.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNGC.h"
 #include "GCOps.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 145a605bb..398a634f2 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "region.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 7e5133381..f7e6a0873 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -23,8 +23,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Events.h"
 #include "Handlers.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 73a84cade..6e1745912 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -32,7 +32,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mi.h"
 #include "dixfontstr.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Screen.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 81138676d..fe8f750ad 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -29,8 +29,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Keyboard.h"
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 2010bfa26..c78c98102 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "privates.h"
 #include "mi.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNPixmap.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 671de1573..c813a6521 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -24,8 +24,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Pointer.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 2e473c09e..133031098 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index f2c1707f4..983a2ca04 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -16,10 +16,10 @@ is" without express or implied warranty.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Visual.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 36da689fe..e58df9f0e 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -17,6 +17,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shape.h>
 
 #include "gcstruct.h"
 #include "window.h"
@@ -25,11 +26,8 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "scrnintstr.h"
 #include "region.h"
-
 #include "mi.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index 6a222d073..dbd51ff9a 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -20,7 +20,7 @@ is" without express or implied warranty.
 /* 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
deleted file mode 100644
index 075848a34..000000000
--- a/hw/xnest/Xnest.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 1995  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-
-#define GC XlibGC
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-#undef GC