diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index 7bebb1e12..735a9e6ea 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -35,8 +35,8 @@ void XFree86DRIExtensionInit(void);
 
 #ifdef DRI2
 #include <X11/extensions/dri2proto.h>
-extern _X_EXPORT Bool noDRI2Extension;
-extern void DRI2ExtensionInit(void);
+extern Bool noDRI2Extension;
+void DRI2ExtensionInit(void);
 #endif
 
 #ifdef XF86VIDMODE
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index bb72eacbe..6a879a958 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -56,6 +56,7 @@
 
 static int DRI2EventBase;
 
+Bool noDRI2Extension = FALSE;
 
 static Bool
 validDrawable(ClientPtr client, XID drawable, Mask access_mode,
diff --git a/os/utils.c b/os/utils.c
index b81bc20b4..4b085c8bc 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -128,9 +128,6 @@ Bool noXFree86DGAExtension = FALSE;
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif
-#ifdef DRI2
-Bool noDRI2Extension = FALSE;
-#endif
 
 Bool noGEExtension = FALSE;