diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index d83f64c48..be5c2bbfa 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -37,12 +37,10 @@
 #include "xf86Parser.h"
 #include "xf86str.h"
 
-#ifdef HAVE_PARSER_DECLS
 /*
  * global structure that holds the result of parsing the config file
  */
 extern XF86ConfigPtr xf86configptr;
-#endif
 
 typedef enum _ConfigStatus {
     CONFIG_OK = 0,
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 048582245..0d616cd10 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -34,6 +34,7 @@
 
 #include "xf86.h"
 #include "xf86DDC_priv.h"
+#include "xf86Config.h"
 #include "xf86Crtc.h"
 #include "xf86Modes.h"
 #include "xf86Opt_priv.h"
@@ -460,8 +461,6 @@ xf86CrtcSetOrigin(xf86CrtcPtr crtc, int x, int y)
  * Output functions
  */
 
-extern XF86ConfigPtr xf86configptr;
-
 typedef enum {
     OPTION_PREFERRED_MODE,
     OPTION_ZOOM_MODES,
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 091ce6333..fdcd26a31 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -30,11 +30,11 @@
 #endif
 
 #include <libxcvt/libxcvt.h>
+
+#include "xf86Config.h"
 #include "xf86Modes.h"
 #include "xf86Priv.h"
 
-extern XF86ConfigPtr xf86configptr;
-
 /**
  * Calculates the horizontal sync rate of a mode.
  */