diff --git a/randr/randrstr.h b/randr/randrstr.h
index ed41f6036..e92619206 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -515,8 +515,6 @@ extern _X_EXPORT void
 extern _X_EXPORT Bool
  RRGetInfo(ScreenPtr pScreen, Bool force_query);
 
-extern _X_EXPORT Bool RRInit(void);
-
 extern _X_EXPORT Bool RRScreenInit(ScreenPtr pScreen);
 
 extern _X_EXPORT RROutputPtr RRFirstOutput(ScreenPtr pScreen);
diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index ac8ab1911..d625ee80a 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -29,6 +29,8 @@
 #ifndef _XSERVER_RANDRSTR_PRIV_H_
 #define _XSERVER_RANDRSTR_PRIV_H_
 
+#include <X11/Xdefs.h>
+
 #include "randrstr.h"
 
 extern int RREventBase, RRErrorBase;
@@ -135,4 +137,11 @@ void RRDeliverScreenEvent(ClientPtr pClient, WindowPtr pWin, ScreenPtr pScreen);
  */
 void RRResourcesChanged(ScreenPtr pScreen);
 
+/*
+ * Initialize randr subsystem
+ *
+ * @return TRUE on success
+ */
+Bool RRInit(void);
+
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 8acee728c..d1e13e3f1 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -20,6 +20,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "randr/randrstr_priv.h"
 #include "randr/rrdispatch_priv.h"