diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 527cc9286..b71a5197f 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -30,7 +30,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointrst.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h
index 25b2d819e..51832a2e3 100644
--- a/hw/xnest/Display.h
+++ b/hw/xnest/Display.h
@@ -17,8 +17,6 @@ is" without express or implied warranty.
 
 #include "colormap.h"
 
-#include "Xnest.h"
-
 #define UNDEFINED -1
 
 #define MAXDEPTH 32
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index afda1c91e..f03c9a4bf 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -29,7 +29,6 @@ is" without express or implied warranty.
 #include "inputstr.h"
 #include "inpututils.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Args.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 426d8a43e..3490c2ef8 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -27,7 +27,6 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index d49ff3967..15a6d03c6 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -30,7 +30,6 @@ is" without express or implied warranty.
 #include "mistruct.h"
 #include "region.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index ca4079b42..c4ca5315b 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -22,8 +22,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 4be121ac4..6f3e047ca 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -34,9 +34,7 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "extinit_priv.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Pointer.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 7a9818dbc..2fcef5de8 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -21,6 +21,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XKB.h>
 #include <xcb/xkb.h>
 
 #include "screenint.h"
@@ -29,7 +30,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
@@ -37,10 +37,6 @@ is" without express or implied warranty.
 #include "Keyboard.h"
 #include "Args.h"
 #include "Events.h"
-
-// must come after Xnest.h, because of trickery to avoid name clash
-#include <X11/extensions/XKB.h>
-
 #include "xkbsrv.h"
 
 DeviceIntPtr xnestKeyboardDevice = NULL;
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 610bbab9c..572f74e3d 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -25,7 +25,6 @@ is" without express or implied warranty.
 #include "privates.h"
 #include "mi.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 7949c0ec7..b72154f44 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -23,7 +23,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 279ba2431..c1dff365b 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -30,7 +30,6 @@ is" without express or implied warranty.
 #include "micmap.h"
 #include "resource.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 4d02c1ced..1499fed6d 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -30,7 +30,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "region.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
deleted file mode 100644
index 66f3fccaa..000000000
--- a/hw/xnest/Xnest.h
+++ /dev/null
@@ -1,93 +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.
-
-*/
-#ifndef _XORG_XNEST_H
-#define _XORG_XNEST_H
-
-/*
-** Machines with a 64 bit library interface and a 32 bit server require
-** name changes to protect the guilty.
-*/
-#ifdef _XSERVER64
-#define _XSERVER64_tmp
-#undef _XSERVER64
-typedef unsigned long XID64;
-typedef unsigned long Mask64;
-typedef unsigned long Atom64;
-typedef unsigned long VisualID64;
-typedef unsigned long Time64;
-
-#define XID     XID64
-#define Mask    Mask64
-#define Atom    Atom64
-#define VisualID VisualID64
-#define Time    Time64
-typedef XID Window64;
-typedef XID Drawable64;
-typedef XID Font64;
-typedef XID Pixmap64;
-typedef XID Cursor64;
-typedef XID Colormap64;
-typedef XID GContext64;
-typedef XID KeySym64;
-
-#define Window          Window64
-#define Drawable        Drawable64
-#define Font            Font64
-#define Pixmap          Pixmap64
-#define Cursor          Cursor64
-#define Colormap        Colormap64
-#define GContext        GContext64
-#define KeySym          KeySym64
-#endif  /*_XSERVER64*/
-
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xlib-xcb.h>
-
-#ifdef _XSERVER64_tmp
-#define _XSERVER64
-#undef _XSERVER64_tmp
-#undef XID
-#undef Mask
-#undef Atom
-#undef VisualID
-#undef Time
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef KeySym
-#endif /*_XSERVER64_tmp*/
-
-#endif /* _XORG_XNEST_H */
diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index a8931b031..28dc78396 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
@@ -20,7 +20,6 @@ srcs = [
     'xkb.c',
 ]
 
-x11_xcb_dep = dependency('x11-xcb', required: true)
 xcb_dep = dependency('xcb', required: true)
 xcb_aux_dep = dependency('xcb-aux', required: true)
 xcb_shape_dep = dependency('xcb-shape', required: true)
@@ -33,13 +32,11 @@ executable(
     include_directories: inc,
     dependencies: [
         common_dep,
-        xnest_dep,
         xcb_dep,
         xcb_aux_dep,
         xcb_shape_dep,
         xcb_icccm_dep,
         xcb_xkb_dep,
-        x11_xcb_dep,
     ],
     link_with: [
         libxserver_main,
diff --git a/hw/xnest/xcb.c b/hw/xnest/xcb.c
index 75d13af62..0f040c49c 100644
--- a/hw/xnest/xcb.c
+++ b/hw/xnest/xcb.c
@@ -16,7 +16,6 @@
 #include "include/gc.h"
 #include "include/servermd.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 #include "xnest-xkb.h"
 #include "XNGC.h"
diff --git a/meson.build b/meson.build
index abab17ed3..c0535920a 100644
--- a/meson.build
+++ b/meson.build
@@ -248,20 +248,6 @@ endif
 
 ## configure Xnest - nesting X server
 build_xnest = get_option('xnest') != 'false'
-xnest_required = get_option('xnest') == 'true'
-xnest_dep = [
-    dependency('xext', version: xext_req, required: xnest_required),
-    dependency('x11', required: xnest_required),
-    dependency('xau', required: xnest_required),
-]
-if get_option('xnest') == 'auto'
-    # check for all the deps being found, to handle 'auto' mode.
-    foreach d: xnest_dep
-        if not d.found()
-            build_xnest = false
-        endif
-    endforeach
-endif
 
 build_xwin = false
 if get_option('xwin') == 'auto'