diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c
index 038d63bde..0ea235136 100644
--- a/hw/xwin/winrandr.c
+++ b/hw/xwin/winrandr.c
@@ -35,6 +35,8 @@
 #endif
 #include "win.h"
 
+#include "randr/randrstr_priv.h"
+
 /*
  * Answer queries about the RandR features supported.
  */
diff --git a/randr/randrstr.h b/randr/randrstr.h
index eb606dccc..b92ad2b37 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -644,9 +644,6 @@ extern _X_EXPORT Bool
 extern _X_EXPORT Bool
  RROutputSetConnection(RROutputPtr output, CARD8 connection);
 
-extern _X_EXPORT Bool
- RROutputSetSubpixelOrder(RROutputPtr output, int subpixelOrder);
-
 extern _X_EXPORT Bool
  RROutputSetPhysicalSize(RROutputPtr output, int mmWidth, int mmHeight);
 
diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index 47e4e239c..16efc9614 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -334,4 +334,12 @@ int RROutputAddUserMode(RROutputPtr output, RRModePtr mode);
  */
 int RROutputDeleteUserMode(RROutputPtr output, RRModePtr mode);
 
+/*
+ * Set subpixel order on given output
+ *
+ * @param output  the output to set subpixel order on
+ * @param order   subpixel order value to set
+ */
+void RROutputSetSubpixelOrder(RROutputPtr output, int order);
+
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index a67dddac2..44e25f622 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -19,8 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr.h"
+#include "randr/randrstr_priv.h"
 
 #ifdef RANDR_10_INTERFACE
 static RRModePtr
diff --git a/randr/rroutput.c b/randr/rroutput.c
index b2c7cf65b..8397aac74 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -287,15 +287,13 @@ RROutputSetConnection(RROutputPtr output, CARD8 connection)
     return TRUE;
 }
 
-Bool
-RROutputSetSubpixelOrder(RROutputPtr output, int subpixelOrder)
+void RROutputSetSubpixelOrder(RROutputPtr output, int subpixelOrder)
 {
     if (output->subpixelOrder == subpixelOrder)
-        return TRUE;
+        return;
 
     output->subpixelOrder = subpixelOrder;
     RROutputChanged(output, FALSE);
-    return TRUE;
 }
 
 Bool