diff --git a/Xext/shape.c b/Xext/shape.c
index e7c7a45b0..3af0e4b68 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shapeproto.h>
+
+#include "dix/gc_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +45,6 @@ in this Software without prior written authorization from The Open Group.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/shapeproto.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "extinit.h"
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 87f975eef..61704a79e 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -32,4 +32,6 @@ void FreeDefaultStipple(int screenNum);
 
 int SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash);
 
+int VerifyRectOrder(int nrects, xRectangle *prects, int ordering);
+
 #endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 4b25aaea0..8b37e566c 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,10 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
                               BITS32 /*mask */ ,
                               ChangeGCValPtr /*pCGCV */ );
 
-extern _X_EXPORT int VerifyRectOrder(int /*nrects */ ,
-                                     xRectangle * /*prects */ ,
-                                     int /*ordering */ );
-
 extern _X_EXPORT int SetClipRects(GCPtr /*pGC */ ,
                                   int /*xOrigin */ ,
                                   int /*yOrigin */ ,