diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index bad0befb9..7bd392e3e 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -523,4 +523,11 @@ int RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
  */
 void RRXineramaExtensionInit(void);
 
+/*
+ * Init transform structure
+ *
+ * @param transform   the transform structure to initialized
+ */
+void RRTransformInit(RRTransformPtr transform);
+
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */
diff --git a/randr/rrtransform.c b/randr/rrtransform.c
index 449fae837..669ffa2ee 100644
--- a/randr/rrtransform.c
+++ b/randr/rrtransform.c
@@ -19,9 +19,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr.h"
-#include "rrtransform.h"
+#include "randr/randrstr_priv.h"
+#include "randr/rrtransform.h"
 
 void
 RRTransformInit(RRTransformPtr transform)
diff --git a/randr/rrtransform.h b/randr/rrtransform.h
index 8ccb94ce3..5b93ce4c9 100644
--- a/randr/rrtransform.h
+++ b/randr/rrtransform.h
@@ -39,9 +39,6 @@ struct _rrTransform {
     int height;
 };
 
-extern _X_EXPORT void
- RRTransformInit(RRTransformPtr transform);
-
 extern _X_EXPORT Bool
  RRTransformEqual(RRTransformPtr a, RRTransformPtr b);