diff --git a/glamor/glamor.c b/glamor/glamor.c
index d3482e0dde..ba064446da 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -599,7 +599,7 @@ glamor_setup_formats(ScreenPtr screen)
         glamor_add_format(screen, 30, PIXMAN_x2b10g10r10,
                           GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, TRUE);
     } else {
-        glamor_add_format(screen, 30, PICT_x2r10g10b10,
+        glamor_add_format(screen, 30, PIXMAN_x2r10g10b10,
                           GL_RGB10_A2, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, TRUE);
     }
 
diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
index 7e47fc567f..c965ee301c 100644
--- a/glamor/glamor_picture.c
+++ b/glamor/glamor_picture.c
@@ -138,7 +138,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
         }
         break;
 
-    case PICT_x2r10g10b10:
+    case PIXMAN_x2r10g10b10:
     case PICT_a2r10g10b10:
         if (!glamor_priv->is_gles) {
             *tex_format = GL_BGRA;
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index f5ac10a4fe..34aa84e031 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -860,7 +860,7 @@ glamor_render_format_is_supported(PicturePtr picture)
 
     switch (picture->format) {
     case PICT_a2r10g10b10:
-        return storage_format == PICT_x2r10g10b10;
+        return storage_format == PIXMAN_x2r10g10b10;
     case PIXMAN_a8r8g8b8:
     case PIXMAN_x8r8g8b8:
         return storage_format == PIXMAN_a8r8g8b8 || storage_format == PIXMAN_x8r8g8b8;
diff --git a/render/picture.c b/render/picture.c
index 4f260be4d5..90a81fa474 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -276,7 +276,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
             }
             if (pDepth->depth >= 30) {
                 addFormat(formats, &nformats, PICT_a2r10g10b10, pDepth->depth);
-                addFormat(formats, &nformats, PICT_x2r10g10b10, pDepth->depth);
+                addFormat(formats, &nformats, PIXMAN_x2r10g10b10, pDepth->depth);
                 addFormat(formats, &nformats, PICT_a2b10g10r10, pDepth->depth);
                 addFormat(formats, &nformats, PIXMAN_x2b10g10r10, pDepth->depth);
             }