diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2c7de0303..9962cf8b9 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -59,6 +59,7 @@
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "randr/randrstr_priv.h"
 
 #include "servermd.h"
 #include "windowstr.h"
@@ -82,7 +83,6 @@
 #include "xf86InPriv.h"
 #include "xf86Crtc.h"
 #include "picturestr.h"
-#include "randrstr.h"
 #include "xf86Bus.h"
 #include "globals.h"
 #include "xserver-properties.h"
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 6cca0b20a..9d02f49af 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -675,9 +675,6 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
 /* rrprovider.c */
 #define PRIME_SYNC_PROP         "PRIME Synchronization"
 
-extern _X_EXPORT void
-RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr primaryScreen);
-
 extern _X_EXPORT RRPropertyValuePtr
  RRGetProviderProperty(RRProviderPtr provider, Atom property, Bool pending);
 
diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index eaa655483..8cbf2c8d7 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -425,4 +425,12 @@ void RRProviderDestroy (RRProviderPtr provider);
  */
 void RRDeliverProviderEvent(ClientPtr pClient, WindowPtr pWin, RRProviderPtr provider);
 
+/*
+ * Auto configure a GPU screen
+ *
+ * @param pScreen         the GPU screen to configure
+ * @param primaryScreen   the associated primary screen
+ */
+void RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr primaryScreen);
+
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */