diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index b4ac23131..458bd48bc 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -40,7 +40,6 @@
 
 extern _X_EXPORT int xf86FbBpp;
 extern _X_EXPORT int xf86Depth;
-extern _X_EXPORT Bool xf86FlipPixels;
 extern _X_EXPORT Gamma xf86Gamma;
 
 /* Other parameters */
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index de882478c..dd7b39dd3 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -33,6 +33,7 @@ extern char *xf86PointerName;
 extern char *xf86KeyboardName;
 
 extern rgb xf86Weight;
+extern Bool xf86FlipPixels;
 
 /* xf86Cursor.c */
 void xf86LockZoom(ScreenPtr pScreen, int lock);
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 886d3c76c..e1c2163f3 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -21,7 +21,7 @@
 
 #include "misc.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86_OSproc.h"
 #include "xf86Opt_priv.h"
 #include "xf86Priv.h"