diff --git a/render/render.c b/render/render.c
index a4ee8afc51..1272135dd9 100644
--- a/render/render.c
+++ b/render/render.c
@@ -58,28 +58,28 @@
 Bool noRenderExtension = FALSE;
 Bool usePanoramiX = FALSE;
 
+static int
+_not_implemented(ClientPtr client)
+{
+    return BadImplementation;
+}
+
 static int ProcRenderQueryVersion(ClientPtr pClient);
 static int ProcRenderQueryPictFormats(ClientPtr pClient);
 static int ProcRenderQueryPictIndexValues(ClientPtr pClient);
-static int ProcRenderQueryDithers(ClientPtr pClient);
 static int ProcRenderCreatePicture(ClientPtr pClient);
 static int ProcRenderChangePicture(ClientPtr pClient);
 static int ProcRenderSetPictureClipRectangles(ClientPtr pClient);
 static int ProcRenderFreePicture(ClientPtr pClient);
 static int ProcRenderComposite(ClientPtr pClient);
-static int ProcRenderScale(ClientPtr pClient);
 static int ProcRenderTrapezoids(ClientPtr pClient);
 static int ProcRenderTriangles(ClientPtr pClient);
 static int ProcRenderTriStrip(ClientPtr pClient);
 static int ProcRenderTriFan(ClientPtr pClient);
-static int ProcRenderColorTrapezoids(ClientPtr pClient);
-static int ProcRenderColorTriangles(ClientPtr pClient);
-static int ProcRenderTransform(ClientPtr pClient);
 static int ProcRenderCreateGlyphSet(ClientPtr pClient);
 static int ProcRenderReferenceGlyphSet(ClientPtr pClient);
 static int ProcRenderFreeGlyphSet(ClientPtr pClient);
 static int ProcRenderAddGlyphs(ClientPtr pClient);
-static int ProcRenderAddGlyphsFromPicture(ClientPtr pClient);
 static int ProcRenderFreeGlyphs(ClientPtr pClient);
 static int ProcRenderCompositeGlyphs(ClientPtr pClient);
 static int ProcRenderFillRectangles(ClientPtr pClient);
@@ -130,25 +130,25 @@ int (*ProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
 ProcRenderQueryVersion,
         ProcRenderQueryPictFormats,
         ProcRenderQueryPictIndexValues,
-        ProcRenderQueryDithers,
+        _not_implemented, /* ProcRenderQueryDithers */
         ProcRenderCreatePicture,
         ProcRenderChangePicture,
         ProcRenderSetPictureClipRectangles,
         ProcRenderFreePicture,
         ProcRenderComposite,
-        ProcRenderScale,
+        _not_implemented, /* ProcRenderScale */
         ProcRenderTrapezoids,
         ProcRenderTriangles,
         ProcRenderTriStrip,
         ProcRenderTriFan,
-        ProcRenderColorTrapezoids,
-        ProcRenderColorTriangles,
-        ProcRenderTransform,
+        _not_implemented, /* ProcRenderColorTrapezoids */
+        _not_implemented, /* ProcRenderColorTriangles */
+        _not_implemented, /* ProcRenderTransform */
         ProcRenderCreateGlyphSet,
         ProcRenderReferenceGlyphSet,
         ProcRenderFreeGlyphSet,
         ProcRenderAddGlyphs,
-        ProcRenderAddGlyphsFromPicture,
+        _not_implemented, /* ProcRenderAddGlyphsFromPicture */
         ProcRenderFreeGlyphs,
         ProcRenderCompositeGlyphs,
         ProcRenderCompositeGlyphs,
@@ -168,25 +168,25 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         ProcRenderQueryVersion,
         ProcRenderQueryPictFormats,
         SProcRenderQueryPictIndexValues,
-        ProcRenderQueryDithers,
+        _not_implemented, /* SProcRenderQueryDithers */
         SProcRenderCreatePicture,
         SProcRenderChangePicture,
         SProcRenderSetPictureClipRectangles,
         SProcRenderFreePicture,
         SProcRenderComposite,
-        ProcRenderScale,
+        _not_implemented, /* SProcRenderScale */
         SProcRenderTrapezoids,
         SProcRenderTriangles,
         SProcRenderTriStrip,
         SProcRenderTriFan,
-        ProcRenderColorTrapezoids,
-        ProcRenderColorTriangles,
-        ProcRenderTransform,
+        _not_implemented, /* SProcRenderColorTrapezoids */
+        _not_implemented, /* SProcRenderColorTriangles */
+        _not_implemented, /* SProcRenderTransform */
         SProcRenderCreateGlyphSet,
         SProcRenderReferenceGlyphSet,
         SProcRenderFreeGlyphSet,
         SProcRenderAddGlyphs,
-        ProcRenderAddGlyphsFromPicture,
+        _not_implemented, /* SProcRenderAddGlyphsFromPicture */
         SProcRenderFreeGlyphs,
         SProcRenderCompositeGlyphs,
         SProcRenderCompositeGlyphs,
@@ -518,12 +518,6 @@ ProcRenderQueryPictIndexValues(ClientPtr client)
     return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
 }
 
-static int
-ProcRenderQueryDithers(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int
 SingleRenderCreatePicture(ClientPtr client)
 {
@@ -672,12 +666,6 @@ SingleRenderComposite(ClientPtr client)
     return Success;
 }
 
-static int
-ProcRenderScale(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int
 SingleRenderTrapezoids(ClientPtr client)
 {
@@ -834,24 +822,6 @@ SingleRenderTriFan(ClientPtr client)
     return Success;
 }
 
-static int
-ProcRenderColorTrapezoids(ClientPtr client)
-{
-    return BadImplementation;
-}
-
-static int
-ProcRenderColorTriangles(ClientPtr client)
-{
-    return BadImplementation;
-}
-
-static int
-ProcRenderTransform(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int
 ProcRenderCreateGlyphSet(ClientPtr client)
 {
@@ -1158,12 +1128,6 @@ ProcRenderAddGlyphs(ClientPtr client)
     return err;
 }
 
-static int
-ProcRenderAddGlyphsFromPicture(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int
 ProcRenderFreeGlyphs(ClientPtr client)
 {