diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 520813c63..465675ef5 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -168,7 +168,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
                                     Bool implicit_modifier)
 {
     PixmapPtr pixmap;
-    struct xwl_pixmap *xwl_pixmap;
     struct xwl_screen *xwl_screen = xwl_screen_get(screen);
 #ifdef GBM_BO_FD_FOR_PLANE
     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
@@ -220,7 +219,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
     for (plane = 0; plane < num_planes; plane++) fds[plane] = -1;
 #endif
 
-    xwl_pixmap = calloc(1, sizeof(*xwl_pixmap));
+    struct xwl_pixmap *xwl_pixmap = calloc(1, sizeof(struct xwl_pixmap));
     if (xwl_pixmap == NULL)
         return NULL;
 
@@ -719,7 +718,6 @@ xwl_dri3_open_client(ClientPtr client,
 {
     struct xwl_screen *xwl_screen = xwl_screen_get(screen);
     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
-    struct xwl_auth_state *state;
     drm_magic_t magic;
     int fd;
 
@@ -731,7 +729,7 @@ xwl_dri3_open_client(ClientPtr client,
         return Success;
     }
 
-    state = malloc(sizeof *state);
+    struct xwl_auth_state *state = calloc(1, sizeof(struct xwl_auth_state));
     if (state == NULL) {
         close(fd);
         return BadAlloc;
diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 09844ee04..77dc560f0 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -129,7 +129,6 @@ os_create_anonymous_file(off_t size)
 {
     static const char template[] = "/xwayland-shared-XXXXXX";
     const char *path;
-    char *name;
     int fd;
     int ret;
 
@@ -152,7 +151,7 @@ os_create_anonymous_file(off_t size)
             return -1;
         }
 
-        name = malloc(strlen(path) + sizeof(template));
+        char *name = calloc(1, strlen(path) + sizeof(template));
         if (!name)
             return -1;