diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 75f9e37b2..3b17b0d3f 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -32,6 +32,8 @@ Equipment Corporation.
 #include <X11/extensions/panoramiXproto.h>
 
 #include "dix/dix_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "cursor.h"
@@ -44,8 +46,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 f95e69de1..c341f6884 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 c27e9b515..f3b7625c3 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 7a0634ae2..6a2472eb6 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 725cafc33..052d2d0f5 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -47,6 +47,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"
@@ -90,10 +92,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 {
     CloseScreenProcPtr CloseScreen;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 05ac0e967..bb8e11237 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"
@@ -81,11 +83,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 c21c0d202..b88a53d52 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 443167a35..e04467695 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -81,6 +81,8 @@ SOFTWARE.
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
 
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 #include "Xext/xvdix_priv.h"
 
 #include "misc.h"
@@ -95,11 +97,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) \