diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 87dce70993..c3c45b223b 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -207,7 +207,9 @@ SingleXvPutVideo(ClientPtr client)
                         stuff->drw_w, stuff->drw_h);
 }
 
+#ifdef XINERAMA
 static int XineramaXvPutVideo(ClientPtr client);
+#endif
 
 static int
 ProcXvPutVideo(ClientPtr client)
@@ -249,7 +251,9 @@ SingleXvPutStill(ClientPtr client)
                         stuff->drw_w, stuff->drw_h);
 }
 
+#ifdef XINERAMA
 static int XineramaXvPutStill(ClientPtr client);
+#endif
 
 static int
 ProcXvPutStill(ClientPtr client)
@@ -407,7 +411,9 @@ SingleXvStopVideo(ClientPtr client)
     return XvdiStopVideo(client, pPort, pDraw);
 }
 
+#ifdef XINERAMA
 static int XineramaXvStopVideo(ClientPtr client);
+#endif
 
 static int
 ProcXvStopVideo(ClientPtr client)
@@ -446,7 +452,9 @@ SingleXvSetPortAttribute(ClientPtr client)
     return status;
 }
 
+#ifdef XINERAMA
 static int XineramaXvSetPortAttribute(ClientPtr client);
+#endif
 
 static int
 ProcXvSetPortAttribute(ClientPtr client)
@@ -618,8 +626,10 @@ SingleXvPutImage(ClientPtr client)
                         stuff->width, stuff->height);
 }
 
+#ifdef XINERAMA
 static int
 XineramaXvPutImage(ClientPtr client);
+#endif
 
 static int
 ProcXvPutImage(ClientPtr client)
@@ -708,7 +718,9 @@ SingleXvShmPutImage(ClientPtr client)
     return status;
 }
 
+#ifdef XINERAMA
 static int XineramaXvShmPutImage(ClientPtr client);
+#endif
 
 #endif /* CONFIG_MITSHM */
 
diff --git a/composite/compext.c b/composite/compext.c
index 3f246ce138..e69ac18021 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -55,7 +55,9 @@
 static CARD8 CompositeReqCode;
 static DevPrivateKeyRec CompositeClientPrivateKeyRec;
 
+#ifdef XINERAMA
 static int compositeUseXinerama = 0;
+#endif
 
 #define CompositeClientPrivateKey (&CompositeClientPrivateKeyRec)
 RESTYPE CompositeClientWindowType;
diff --git a/xfixes/region.c b/xfixes/region.c
index 2b378b7bbc..c09d41e5be 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -497,8 +497,10 @@ ProcXFixesFetchRegion(ClientPtr client)
     return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
 }
 
+#ifdef XINERAMA
 static int
 PanoramiXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff);
+#endif
 
 static int
 SingleXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff);
@@ -625,8 +627,10 @@ SingleXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegionRe
     return Success;
 }
 
+#ifdef XINERAMA
 static int
 PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegionReq *stuff);
+#endif
 
 int
 ProcXFixesSetWindowShapeRegion(ClientPtr client)
@@ -651,8 +655,10 @@ ProcXFixesSetWindowShapeRegion(ClientPtr client)
 static int
 SingleXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegionReq *stuff);
 
+#ifdef XINERAMA
 static int
 PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegionReq *stuff);
+#endif
 
 int
 ProcXFixesSetPictureClipRegion(ClientPtr client)