diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 2b901431b..dd0d71690 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -180,7 +180,7 @@ update_backing_pixmaps(struct xwl_screen *xwl_screen, int width, int height)
 
     if (old_pixmap) {
         TraverseTree(pRoot, xwl_set_pixmap_visit_window, old_pixmap);
-        dixDestroyPixmap(old_pixmap, 0);
+        pScreen->DestroyPixmap(old_pixmap);
     }
 
     pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);
diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c
index 09265078c..a470ef313 100644
--- a/hw/xwayland/xwayland-window-buffers.c
+++ b/hw/xwayland/xwayland-window-buffers.c
@@ -97,8 +97,10 @@ xwl_window_buffer_new(struct xwl_window *xwl_window)
 static void
 xwl_window_buffer_destroy_pixmap(struct xwl_window_buffer *xwl_window_buffer)
 {
+    ScreenPtr pScreen = xwl_window_buffer->pixmap->drawable.pScreen;
+
     xwl_pixmap_del_buffer_release_cb(xwl_window_buffer->pixmap);
-    dixDestroyPixmap(xwl_window_buffer->pixmap, 0);
+    (*pScreen->DestroyPixmap) (xwl_window_buffer->pixmap);
     xwl_window_buffer->pixmap = NullPixmap;
 }
 
@@ -361,7 +363,7 @@ xwl_window_realloc_pixmap(struct xwl_window *xwl_window)
                      window_pixmap->drawable.width,
                      window_pixmap->drawable.height);
     xwl_window_set_pixmap(xwl_window->surface_window, new_window_pixmap);
-    dixDestroyPixmap(window_pixmap, 0);
+    screen->DestroyPixmap(window_pixmap);
 }
 
 static Bool
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index a77f4fb88..b717fcf3c 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -317,7 +317,7 @@ damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
 
     window_pixmap = xwl_screen->screen->GetWindowPixmap(xwl_window->surface_window);
     if (xwl_is_client_pixmap(window_pixmap))
-        dixDestroyPixmap(xwl_window_swap_pixmap(xwl_window, FALSE), 0);
+        xwl_screen->screen->DestroyPixmap(xwl_window_swap_pixmap(xwl_window, FALSE));
 }
 
 static void