diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index 6e9f8832d..6b5024c01 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -41,7 +41,7 @@ void DRI2ExtensionInit(void);
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-extern _X_EXPORT Bool noXFree86VidModeExtension;
+extern Bool noXFree86VidModeExtension;
 extern void XFree86VidModeExtensionInit(void);
 #endif
 
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index 69ee892fc..0a5ada44e 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -49,6 +49,8 @@
 #include "xf86Extensions.h"
 #include "xf86cmap.h"
 
+Bool noXFree86VidModeExtension = FALSE;
+
 static vidMonitorValue
 xf86VidModeGetMonitorValue(ScreenPtr pScreen, int valtyp, int indx)
 {
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 20ccc31a9..2cd262eb7 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -59,7 +59,7 @@
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-extern _X_EXPORT Bool noXFree86VidModeExtension;
+Bool noXFree86VidModeExtension = FALSE;
 #endif
 
 void
diff --git a/os/utils.c b/os/utils.c
index ce9f0f262..102690ef1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -120,10 +120,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-#ifdef XF86VIDMODE
-Bool noXFree86VidModeExtension = FALSE;
-#endif
-
 Bool noGEExtension = FALSE;
 
 #define X_INCLUDE_NETDB_H