diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index 1d7495fb3..cc37fc6aa 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <X11/X.h>
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86Xinput_priv.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 3b1535338..cfdc0f0c7 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -46,7 +46,6 @@ extern _X_EXPORT int xf86Depth;
 extern _X_EXPORT xf86InfoRec xf86Info;
 
 extern _X_EXPORT DriverPtr *xf86DriverList;
-extern _X_EXPORT int xf86NumScreens;
 extern _X_EXPORT const char *xf86VisualNames[];
 extern _X_EXPORT int xf86Verbose;       /* verbosity level */
 extern _X_EXPORT int xf86LogVerbose;    /* log file verbosity level */
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 3cb8f7565..b70003cab 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -32,6 +32,7 @@
 
 #include "dix/colormap_priv.h"
 
+#include "xf86_priv.h"
 #include "xf86VGAarbiter_priv.h"
 #include "xf86VGAarbiterPriv.h"
 #include "xf86Bus.h"
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index f6b2a640f..f365acc8e 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -48,6 +48,7 @@ extern serverLayoutRec xf86ConfigLayout;
 extern int xf86NumDrivers;
 extern Bool xf86Resetting;
 extern Bool xf86Initialising;
+extern int xf86NumScreens;
 
 /* xf86Cursor.c */
 void xf86LockZoom(ScreenPtr pScreen, int lock);
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 4499b9035..7a5d6dc4b 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -29,7 +29,7 @@
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "os.h"
 #include "globals.h"
 #include "xf86Modes.h"