diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index ce49d064a..c0fcfe14d 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -266,12 +266,6 @@ xf86PrintModes(ScrnInfoPtr scrp);
 extern _X_EXPORT void
 xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts);
 
-/* xf86RandR.c */
-#ifdef RANDR
-extern _X_EXPORT Bool
-xf86RandRInit(ScreenPtr pScreen);
-#endif
-
 /* xf86Extensions.c */
 extern void xf86ExtensionInit(void);
 
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index c0cfc6f7c..98136bd4f 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -32,7 +32,7 @@
 
 #include "os.h"
 #include "globals.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86str.h"
 #include "xf86Priv.h"
 #include "xf86DDC.h"
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index ec6bc8322..9ffabd68d 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -32,4 +32,7 @@ void xf86DeleteScreen(ScrnInfoPtr pScrn);
 const char * xf86ModeStatusToString(ModeStatus status);
 ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags);
 
+/* xf86RandR.c */
+Bool xf86RandRInit(ScreenPtr pScreen);
+
 #endif /* _XSERVER_XF86_PRIV_H */