diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 9dcd651a9..94532969e 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index de584fd7a..8fe62c1c3 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 43b2dfa1b..b71a5197f 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <stdint.h>
 
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index fc25c725d..fa90de4ce 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index dea10183a..08dc3533c 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 68dcdf59a..cca393565 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <stddef.h>
 #include <X11/X.h>
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 90f3a9b65..85808cc90 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <stdint.h>
 
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 2549840cf..0fbbf6eb0 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <stdint.h>
 
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index cd8d516be..c4ca5315b 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index dd93db54f..f7c37e33a 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <stddef.h>
 #include <X11/X.h>
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 6aaa33a79..7714f3c9a 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #ifdef WIN32
 #include <X11/Xwindows.h>
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index c175cda1c..572f74e3d 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index e61601b6f..b72154f44 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 7306d25d9..411df8278 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 77b6833d5..008081e3c 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -11,10 +11,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
+#include <dix-config.h>
 
 #include <xcb/xcb.h>
 #include <xcb/shape.h>
diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index e28f34e2c..ef260a13a 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
@@ -44,7 +44,6 @@ executable(
         libxserver_xi_stubs,
         libxserver_xkb_stubs,
     ],
-    c_args: '-DHAVE_XNEST_CONFIG_H',
     install: true,
 )
 
diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h
deleted file mode 100644
index c8b3483ed..000000000
--- a/hw/xnest/xnest-config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
- *
- * All Rights Reserved.
- *
- * 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 on 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 (including the
- * next paragraph) 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * 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.
- */
-
-#ifndef XNEST_CONFIG_H
-#define XNEST_CONFIG_H
-
-#include <dix-config.h>
-
-#endif                          /* XNEST_CONFIG_H */