diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 3ce1f1259..cd0e0a5f2 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -78,6 +78,8 @@
 #include "dgaproc.h"
 #include "protocol-versions.h"
 
+Bool noXFree86DGAExtension = FALSE;
+
 #define DGA_PROTOCOL_OLD_SUPPORT 1
 
 static DevPrivateKeyRec DGAScreenKeyRec;
diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index 735a9e6ea..6e9f8832d 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -47,9 +47,9 @@ extern void XFree86VidModeExtensionInit(void);
 
 #ifdef XFreeXDGA
 #include <X11/extensions/xf86dgaproto.h>
-extern _X_EXPORT Bool noXFree86DGAExtension;
-extern void XFree86DGAExtensionInit(void);
-extern void XFree86DGARegister(void);
+extern Bool noXFree86DGAExtension;
+void XFree86DGAExtensionInit(void);
+void XFree86DGARegister(void);
 #endif
 
 #endif
diff --git a/os/utils.c b/os/utils.c
index 4b085c8bc..61a09b367 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -122,9 +122,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-#ifdef XFreeXDGA
-Bool noXFree86DGAExtension = FALSE;
-#endif
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif