diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 5d2529ff4..8b46ef344 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -37,6 +37,7 @@ Equipment Corporation.
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
+#include <X11/Xmd.h>
 #include <X11/extensions/panoramiXproto.h>
 
 #include "gcstruct.h"
diff --git a/composite/compext.c b/composite/compext.c
index 605d19ce3..b80faaeac 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -44,6 +44,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "compint.h"
 #include "xace.h"
@@ -572,7 +573,6 @@ CompositeExtensionInit(void)
 }
 
 #ifdef XINERAMA
-#include "panoramiXsrv.h"
 
 int (*PanoramiXSaveCompositeVector[CompositeNumberRequests]) (ClientPtr);
 
diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index c646840c7..13358d97a 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -42,16 +42,15 @@
  */
 
 #include <dix-config.h>
+#include <X11/Xmd.h>
+
+#include "Xext/panoramiXsrv.h"
 
 #include "dix/window_priv.h"
 
 #include "compint.h"
 #include "xace.h"
 
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 /*
  * Delete the given overlay client list element from its screen list.
  */
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 80c097a0c..1d6f9b15c 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -46,14 +46,11 @@
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "compint.h"
 #include "compositeext_priv.h"
 
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 #ifdef COMPOSITE_DEBUG
 static int
 compCheckWindow(WindowPtr pWin, void *data)