diff --git a/randr/randrstr.h b/randr/randrstr.h
index 75c5a5605..eedfb8f0a 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -820,18 +820,6 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
 extern _X_EXPORT void
 RRProviderInitErrorValue(void);
 
-extern _X_EXPORT int
-ProcRRGetProviders(ClientPtr client);
-
-extern _X_EXPORT int
-ProcRRGetProviderInfo(ClientPtr client);
-
-extern _X_EXPORT int
-ProcRRSetProviderOutputSource(ClientPtr client);
-
-extern _X_EXPORT int
-ProcRRSetProviderOffloadSink(ClientPtr client);
-
 extern _X_EXPORT Bool
 RRProviderInit(void);
 
@@ -870,24 +858,6 @@ extern _X_EXPORT int
                              Bool pending, Bool range, Bool immutable,
                              int num_values, INT32 *values);
 
-extern _X_EXPORT int
- ProcRRGetProviderProperty(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRListProviderProperties(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRQueryProviderProperty(ClientPtr client);
-
-extern _X_EXPORT int
-ProcRRConfigureProviderProperty(ClientPtr client);
-
-extern _X_EXPORT int
-ProcRRChangeProviderProperty(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRDeleteProviderProperty(ClientPtr client);
-
 /* rrxinerama.c */
 #ifdef XINERAMA
 extern _X_EXPORT void
diff --git a/randr/rrdispatch_priv.h b/randr/rrdispatch_priv.h
index 663997000..d9b60886b 100644
--- a/randr/rrdispatch_priv.h
+++ b/randr/rrdispatch_priv.h
@@ -43,4 +43,16 @@ int ProcRRQueryOutputProperty(ClientPtr client);
 int ProcRRConfigureOutputProperty(ClientPtr client);
 int ProcRRDeleteOutputProperty(ClientPtr client);
 
+/* provider related dispatch */
+int ProcRRGetProviders(ClientPtr client);
+int ProcRRGetProviderInfo(ClientPtr client);
+int ProcRRSetProviderOutputSource(ClientPtr client);
+int ProcRRSetProviderOffloadSink(ClientPtr client);
+int ProcRRGetProviderProperty(ClientPtr client);
+int ProcRRListProviderProperties(ClientPtr client);
+int ProcRRQueryProviderProperty(ClientPtr client);
+int ProcRRConfigureProviderProperty(ClientPtr client);
+int ProcRRChangeProviderProperty(ClientPtr client);
+int ProcRRDeleteProviderProperty(ClientPtr client);
+
 #endif /* _XSERVER_RANDR_RRDISPATCH_H */
diff --git a/randr/rrprovider.c b/randr/rrprovider.c
index 9868e8ccc..b6e3d9ea3 100644
--- a/randr/rrprovider.c
+++ b/randr/rrprovider.c
@@ -28,6 +28,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
 #include "swaprep.h"
 
diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c
index 559aa44fb..aec86e4d0 100644
--- a/randr/rrproviderproperty.c
+++ b/randr/rrproviderproperty.c
@@ -22,8 +22,9 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
-#include "randrstr_priv.h"
 #include "propertyst.h"
 #include "swaprep.h"