diff --git a/randr/randrstr.h b/randr/randrstr.h
index a8dfe7372..9a9b3fc3c 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -673,31 +673,6 @@ extern _X_EXPORT Bool
 extern _X_EXPORT Bool
  RRHasScanoutPixmap(ScreenPtr pScreen);
 
-/*
- * Crtc dispatch
- */
-
-extern _X_EXPORT int
- ProcRRGetCrtcInfo(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRSetCrtcConfig(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetCrtcGammaSize(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetCrtcGamma(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRSetCrtcGamma(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRSetCrtcTransform(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetCrtcTransform(ClientPtr client);
-
 /* rrdispatch.c */
 extern _X_EXPORT Bool
  RRClientKnowsRates(ClientPtr pClient);
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index de66ef5e8..8acee728c 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -21,7 +21,9 @@
  * OF THIS SOFTWARE.
  */
 
-#include "randrstr_priv.h"
+#include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
+
 #include "swaprep.h"
 #include "mipointer.h"
 
diff --git a/randr/rrdispatch_priv.h b/randr/rrdispatch_priv.h
index f679b2dc3..7823a0882 100644
--- a/randr/rrdispatch_priv.h
+++ b/randr/rrdispatch_priv.h
@@ -17,4 +17,13 @@ int ProcRRGetScreenResourcesCurrent(ClientPtr client);
 int ProcRRSetScreenConfig(ClientPtr client);
 int ProcRRGetScreenInfo(ClientPtr client);
 
+/* crtc related dispatch */
+int ProcRRGetCrtcInfo(ClientPtr client);
+int ProcRRSetCrtcConfig(ClientPtr client);
+int ProcRRGetCrtcGammaSize(ClientPtr client);
+int ProcRRGetCrtcGamma(ClientPtr client);
+int ProcRRSetCrtcGamma(ClientPtr client);
+int ProcRRSetCrtcTransform(ClientPtr client);
+int ProcRRGetCrtcTransform(ClientPtr client);
+
 #endif /* _XSERVER_RANDR_RRDISPATCH_H */