diff --git a/Xext/vidmode.c b/Xext/vidmode.c
index 7ea5ddfb5..7c838f449 100644
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@@ -33,6 +33,8 @@ from Kaleb S. KEITHLEY
 #include <dix-config.h>
 #endif
 
+#ifdef XF86VIDMODE
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/xf86vmproto.h>
@@ -2145,3 +2147,5 @@ VidModePtr VidModeInit(ScreenPtr pScreen)
 
     return VidModeGetPtr(pScreen);
 }
+
+#endif /* XF86VIDMODE */
diff --git a/include/vidmodestr.h b/include/vidmodestr.h
index 3a4418501..b47daa779 100644
--- a/include/vidmodestr.h
+++ b/include/vidmodestr.h
@@ -133,8 +133,10 @@ typedef struct {
     VidModeGetGammaRampSizeProcPtr    GetGammaRampSize;
 } VidModeRec, *VidModePtr;
 
+#ifdef XF86VIDMODE
 void VidModeAddExtension(Bool allow_non_local);
 VidModePtr VidModeGetPtr(ScreenPtr pScreen);
 VidModePtr VidModeInit(ScreenPtr pScreen);
+#endif /* XF86VIDMODE */
 
 #endif