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/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index f9f1c255e..9468fe6ce 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -63,7 +63,7 @@
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-Bool noXFree86VidModeExtension;
+Bool noXFree86VidModeExtension = FALSE;
 #endif
 
 void