diff --git a/dix/events.c b/dix/events.c
index 99f657bc8..feb31902e 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -129,6 +129,8 @@ Equipment Corporation.
 #include "os/bug_priv.h"
 #include "os/client_priv.h"
 #include "os/fmt.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
@@ -139,10 +141,6 @@ Equipment Corporation.
 #include "scrnintstr.h"
 #include "cursorstr.h"
 #include "dixstruct.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "globals.h"
 #include "xace.h"
 #include "probes.h"
diff --git a/dix/getevents.c b/dix/getevents.c
index 34014ffbb..e517de2d3 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -43,6 +43,8 @@
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "resource.h"
@@ -60,11 +62,6 @@
 
 #include "xkbsrv.h"
 
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 #include "exglobals.h"
 #include "exevents.h"
 #include "extnsionst.h"
diff --git a/dix/main.c b/dix/main.c
index 225bfd274..2f64dcfea 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -98,6 +98,7 @@ Equipment Corporation.
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/screensaver.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "scrnintstr.h"
 #include "misc.h"
@@ -114,11 +115,7 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "privates.h"
 #include "exevents.h"
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#else
 #include "dixevents.h"          /* InitEvents() */
-#endif /* XINERAMA */
 
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
diff --git a/dix/property.c b/dix/property.c
index e5e579f95..047ad8bb3 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -51,6 +51,8 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/property_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "windowstr.h"
 #include "propertyst.h"
diff --git a/dix/resource.c b/dix/resource.c
index 7542f0c42..f4f333b0d 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -126,6 +126,8 @@ Equipment Corporation.
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -137,10 +139,6 @@ Equipment Corporation.
 #include "colormap.h"
 #include "inputstr.h"
 #include "cursor.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "xace.h"
 #include <assert.h>
 #include "gcstruct.h"
diff --git a/dix/window.c b/dix/window.c
index 62f8eac60..dda65670e 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -109,6 +109,8 @@ Equipment Corporation.
 #include "os/auth.h"
 #include "os/client_priv.h"
 #include "os/screensaver.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
@@ -124,10 +126,6 @@ Equipment Corporation.
 #include "gcstruct.h"
 #include "servermd.h"
 #include "mivalidate.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "dixevents.h"
 #include "globals.h"
 #ifdef COMPOSITE