diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index a70b7de4c..2a887ce1e 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -61,8 +61,6 @@ extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
 extern _X_EXPORT ScrnInfoPtr *xf86Screens;      /* List of pointers to ScrnInfoRecs */
 extern _X_EXPORT const unsigned char byte_reversed[256];
 
-extern _X_EXPORT confDRIRec xf86ConfigDRI;
-
 #define XF86SCRNINFO(p) xf86ScreenToScrn(p)
 
 /* Compatibility functions for pre-input-thread drivers */
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index be5c2bbfa..7be9f3ed7 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -69,4 +69,6 @@ GDevPtr autoConfigDevice(GDevPtr preconf_device);
 void xf86SetVerbosity(int verb);
 void xf86SetLogVerbosity(int verb);
 
+extern confDRIRec xf86ConfigDRI;
+
 #endif                          /* _xf86_config_h */
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index ab3b2fc30..8eb9e62c9 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -73,6 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "inputstr.h"
 #include "xf86VGAarbiter_priv.h"
 #include "xf86Extensions.h"
+#include "xf86Config.h"
 
 static int DRIEntPrivIndex = -1;
 static DevPrivateKeyRec DRIScreenPrivKeyRec;