diff --git a/render/glyph.c b/render/glyph.c
index 5fa7f3b5b..716b859f5 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -610,7 +610,7 @@ miGlyphs(CARD8 op,
                               maskFormat, CPComponentAlpha, &component_alpha,
                               serverClient, &error);
         if (!pMask) {
-            (*pScreen->DestroyPixmap) (pMaskPixmap);
+            dixDestroyPixmap(pMaskPixmap, 0);
             return;
         }
         pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
@@ -678,7 +678,7 @@ miGlyphs(CARD8 op,
                          xSrc + x - xDst,
                          ySrc + y - yDst, 0, 0, x, y, width, height);
         FreePicture((void *) pMask, (XID) 0);
-        (*pScreen->DestroyPixmap) (pMaskPixmap);
+        dixDestroyPixmap(pMaskPixmap, 0);
     }
 }
 
diff --git a/render/mipict.c b/render/mipict.c
index 7fb03435b..f3aa5fc75 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -67,7 +67,7 @@ miChangePictureClip(PicturePtr pPicture, int type, void *value, int n)
         clientClip = BitmapToRegion(pScreen, (PixmapPtr) value);
         if (!clientClip)
             return BadAlloc;
-        (*pScreen->DestroyPixmap) ((PixmapPtr) value);
+        dixDestroyPixmap((PixmapPtr) value, 0);
         break;
     case CT_REGION:
         clientClip = value;
diff --git a/render/picture.c b/render/picture.c
index d41a0ed91..728f159f9 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1414,7 +1414,7 @@ FreePicture(void *value, XID pid)
                 }
             }
             else if (pPicture->pDrawable->type == DRAWABLE_PIXMAP) {
-                (*pScreen->DestroyPixmap) ((PixmapPtr) pPicture->pDrawable);
+                dixDestroyPixmap((PixmapPtr) pPicture->pDrawable, 0);
             }
         }
         dixFreeObjectWithPrivates(pPicture, PRIVATE_PICTURE);
diff --git a/render/render.c b/render/render.c
index 122bfead1..99f063f9d 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1136,7 +1136,7 @@ ProcRenderAddGlyphs(ClientPtr client)
 
                 /* The picture takes a reference to the pixmap, so we
                    drop ours. */
-                (pScreen->DestroyPixmap) (pDstPix);
+                dixDestroyPixmap(pDstPix, 0);
                 pDstPix = NULL;
 
                 if (!pDst) {
@@ -1541,7 +1541,7 @@ ProcRenderCreateCursor(ClientPtr client)
             free(mskbits);
             return error;
         }
-        (*pScreen->DestroyPixmap) (pPixmap);
+        dixDestroyPixmap(pPixmap, 0);
         CompositePicture(PictOpSrc,
                          pSrc, 0, pPicture, 0, 0, 0, 0, 0, 0, width, height);
         (*pScreen->GetImage) (pPicture->pDrawable,