diff --git a/glamor/glamor.c b/glamor/glamor.c
index ae40e94163..d3482e0dde 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -596,7 +596,7 @@ glamor_setup_formats(ScreenPtr screen)
     }
 
     if (glamor_priv->is_gles) {
-        glamor_add_format(screen, 30, PICT_x2b10g10r10,
+        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,
diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
index 0855656fe2..7e47fc567f 100644
--- a/glamor/glamor_picture.c
+++ b/glamor/glamor_picture.c
@@ -148,7 +148,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
         }
         break;
 
-    case PICT_x2b10g10r10:
+    case PIXMAN_x2b10g10r10:
     case PICT_a2b10g10r10:
         if (!glamor_priv->is_gles) {
             *tex_format = GL_RGBA;
diff --git a/render/picture.c b/render/picture.c
index 0efb596c70..4f260be4d5 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -278,7 +278,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
                 addFormat(formats, &nformats, PICT_a2r10g10b10, pDepth->depth);
                 addFormat(formats, &nformats, PICT_x2r10g10b10, pDepth->depth);
                 addFormat(formats, &nformats, PICT_a2b10g10r10, pDepth->depth);
-                addFormat(formats, &nformats, PICT_x2b10g10r10, pDepth->depth);
+                addFormat(formats, &nformats, PIXMAN_x2b10g10r10, pDepth->depth);
             }
             break;
         }