diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
index c965ee301c..764162004f 100644
--- a/glamor/glamor_picture.c
+++ b/glamor/glamor_picture.c
@@ -124,7 +124,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
         }
         break;
 
-    case PICT_x8b8g8r8:
+    case PIXMAN_x8b8g8r8:
     case PICT_a8b8g8r8:
         *tex_format = GL_RGBA;
         if (!glamor_priv->is_gles) {
diff --git a/render/picture.c b/render/picture.c
index 90a81fa474..ba90f3dd62 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -272,7 +272,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
         case 32:
             if (pDepth->depth >= 24) {
                 addFormat(formats, &nformats, PIXMAN_x8r8g8b8, pDepth->depth);
-                addFormat(formats, &nformats, PICT_x8b8g8r8, pDepth->depth);
+                addFormat(formats, &nformats, PIXMAN_x8b8g8r8, pDepth->depth);
             }
             if (pDepth->depth >= 30) {
                 addFormat(formats, &nformats, PICT_a2r10g10b10, pDepth->depth);