diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index cad86c881..7bebb1e12 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -29,8 +29,8 @@
 #include "extnsionst.h"
 
 #ifdef XF86DRI
-extern _X_EXPORT Bool noXFree86DRIExtension;
-extern void XFree86DRIExtensionInit(void);
+extern Bool noXFree86DRIExtension;
+void XFree86DRIExtensionInit(void);
 #endif
 
 #ifdef DRI2
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 3edc02b5c..833ef0b31 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -74,6 +74,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86VGAarbiter.h"
 #include "xf86Extensions.h"
 
+Bool noXFree86DRIExtension = FALSE;
+
 static int DRIEntPrivIndex = -1;
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
 
diff --git a/os/utils.c b/os/utils.c
index daf2361a3..b81bc20b4 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -125,9 +125,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif
-#ifdef XF86DRI
-Bool noXFree86DRIExtension = FALSE;
-#endif
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif