diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 348ffb269..ec83acefe 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -735,7 +735,7 @@ glamor_flush_composite_rects(ScreenPtr screen)
 }
 
 static const int pict_format_combine_tab[][3] = {
-    {PICT_TYPE_ARGB, PICT_TYPE_A, PICT_TYPE_ARGB},
+    {PIXMAN_TYPE_ARGB, PICT_TYPE_A, PIXMAN_TYPE_ARGB},
     {PICT_TYPE_ABGR, PICT_TYPE_A, PICT_TYPE_ABGR},
 };
 
diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
index 740db739c..1cc86bf08 100644
--- a/glamor/glamor_utils.h
+++ b/glamor/glamor_utils.h
@@ -603,7 +603,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
     if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_A) {
         rshift = gshift = bshift = ashift = 0;
     }
-    else if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+    else if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_ARGB) {
         bshift = 0;
         gshift = bbits;
         rshift = gshift + gbits;
diff --git a/render/picture.c b/render/picture.c
index 08f69b35e..6aabc36d7 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -211,7 +211,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
              */
             if (pVisual->offsetBlue == 0 &&
                 pVisual->offsetGreen == b && pVisual->offsetRed == b + g) {
-                type = PICT_TYPE_ARGB;
+                type = PIXMAN_TYPE_ARGB;
             }
             else if (pVisual->offsetRed == 0 &&
                      pVisual->offsetGreen == r &&
@@ -293,7 +293,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
         format = formats[f].format;
         pFormats[f].format = format;
         switch (PIXMAN_FORMAT_TYPE(format)) {
-        case PICT_TYPE_ARGB:
+        case PIXMAN_TYPE_ARGB:
             pFormats[f].type = PictTypeDirect;
 
             pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
@@ -649,7 +649,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
                  formats[n].direct.blueMask | formats[n].direct.greenMask) == 0)
                 type = PICT_TYPE_A;
             else if (formats[n].direct.red > formats[n].direct.blue)
-                type = PICT_TYPE_ARGB;
+                type = PIXMAN_TYPE_ARGB;
             else if (formats[n].direct.red == 0)
                 type = PICT_TYPE_ABGR;
             else