diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index b4743e3f2..2c8f31740 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -34,6 +34,8 @@ Equipment Corporation.
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screen_hooks_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "cursor.h"
@@ -46,8 +48,6 @@ Equipment Corporation.
 #include "window.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"
 #include "resource.h"
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index 9546251b3..4845d7460 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -28,6 +28,11 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/panoramiXproto.h>
+
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
+
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -39,9 +44,6 @@ Equipment Corporation.
 #include "window.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
-#include "panoramiXsrv.h"
 #include "globals.h"
 #include "panoramiXh.h"
 
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index dde209efc..8e885fbf6 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -33,6 +33,8 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"
@@ -43,8 +45,6 @@ Equipment Corporation.
 #include "migc.h"
 #include "misc.h"
 #include "dixstruct.h"
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
 #include "resource.h"
 #include "panoramiXh.h"
 
diff --git a/Xext/saver.c b/Xext/saver.c
index 3a6aeba83..10d77f217 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -39,6 +39,8 @@ in this Software without prior written authorization from the X Consortium.
 #include "dix/window_priv.h"
 #include "os/osdep.h"
 #include "os/screensaver.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -52,10 +54,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "cursorstr.h"
 #include "xace.h"
 #include "inputstr.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
diff --git a/Xext/shape.c b/Xext/shape.c
index a463f9741..584ce510b 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -33,6 +33,8 @@ in this Software without prior written authorization from The Open Group.
 
 #include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -67,11 +69,6 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
  * externally by the Xfixes extension and are now defined in window.h
  */
 
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 static int ShapeEventBase = 0;
 static RESTYPE ClientType, ShapeEventType;      /* resource types for event masks */
 
diff --git a/Xext/shm.c b/Xext/shm.c
index 3028a9517..e9bdc8d4f 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -48,6 +48,8 @@ in this Software without prior written authorization from The Open Group.
 #include "os/busfault.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -91,10 +93,6 @@ in this Software without prior written authorization from The Open Group.
 #define SHMPERM_MODE(p)		p->mode
 #endif
 
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 
 typedef struct _ShmScrPrivateRec {
     ShmFuncsPtr shmFuncs;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index f7e4bd7b1..5e0da4b21 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -42,6 +42,8 @@
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -80,11 +82,6 @@ static InternalEvent *xtest_evlist;
  */
 DeviceIntPtr xtestpointer, xtestkeyboard;
 
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 static int XTestSwapFakeInput(ClientPtr /* client */ ,
                               xReq *    /* req */
     );
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index e8978e5b0..95dcfc89b 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -32,6 +32,8 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "Xext/xvdix_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
@@ -49,9 +51,6 @@ SOFTWARE.
 #include "xvdisp.h"
 
 #ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-
 unsigned long XvXRTPort;
 #endif /* XINERAMA */
 
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 82e3717ef..5fc018cff 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -82,6 +82,8 @@ SOFTWARE.
 #include <X11/extensions/Xvproto.h>
 
 #include "dix/screen_hooks_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 #include "Xext/xvdix_priv.h"
 
 #include "misc.h"
@@ -96,11 +98,6 @@ SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 #include "input.h"
-
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "xvdisp.h"
 
 #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \