diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 67fafaca..d7f51523 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -676,7 +676,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
     {PIXMAN_x8r8g8b8,	FMT_8_8_8_8},
     {PIXMAN_a8b8g8r8,	FMT_8_8_8_8},
     {PIXMAN_x8b8g8r8,	FMT_8_8_8_8},
-    {PICT_b8g8r8a8,	FMT_8_8_8_8},
+    {PIXMAN_b8g8r8a8,	FMT_8_8_8_8},
     {PICT_b8g8r8x8,	FMT_8_8_8_8},
     {PICT_r5g6b5,	FMT_5_6_5},
     {PICT_a1r5g5b5,	FMT_1_5_5_5},
@@ -737,7 +737,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_x8r8g8b8:
     case PIXMAN_a8b8g8r8:
     case PIXMAN_x8b8g8r8:
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	*dst_format = COLOR_8_8_8_8;
 	break;
@@ -923,7 +923,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
 	pix_b = SQ_SEL_Z; /* B */
 	pix_a = SQ_SEL_1; /* A */
 	break;
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
 	pix_r = SQ_SEL_Y; /* R */
 	pix_g = SQ_SEL_Z; /* G */
 	pix_b = SQ_SEL_W; /* B */
@@ -1184,7 +1184,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
 	    pix_b = zf; /* B */
 	    pix_a = 1.0; /* A */
 	    break;
-	case PICT_b8g8r8a8:
+	case PIXMAN_b8g8r8a8:
 	    pix_r = yf; /* R */
 	    pix_g = zf; /* G */
 	    pix_b = wf; /* B */
@@ -1454,7 +1454,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
     case PIXMAN_x8b8g8r8:
 	cb_conf.comp_swap = 0; /* ABGR */
 	break;
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	cb_conf.comp_swap = 3; /* BGRA */
 	break;
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 746d60e9..cf682f40 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -735,7 +735,7 @@ static struct formatinfo R600TexFormats[] = {
     {PIXMAN_x8r8g8b8,	FMT_8_8_8_8},
     {PIXMAN_a8b8g8r8,	FMT_8_8_8_8},
     {PIXMAN_x8b8g8r8,	FMT_8_8_8_8},
-    {PICT_b8g8r8a8,	FMT_8_8_8_8},
+    {PIXMAN_b8g8r8a8,	FMT_8_8_8_8},
     {PICT_b8g8r8x8,	FMT_8_8_8_8},
     {PICT_r5g6b5,	FMT_5_6_5},
     {PICT_a1r5g5b5,	FMT_1_5_5_5},
@@ -796,7 +796,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_x8r8g8b8:
     case PIXMAN_a8b8g8r8:
     case PIXMAN_x8b8g8r8:
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	*dst_format = COLOR_8_8_8_8;
 	break;
@@ -938,7 +938,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
 	pix_b = SQ_SEL_Z; /* B */
 	pix_a = SQ_SEL_1; /* A */
 	break;
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
 	pix_r = SQ_SEL_Y; /* R */
 	pix_g = SQ_SEL_Z; /* G */
 	pix_b = SQ_SEL_W; /* B */
@@ -1228,7 +1228,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
 	    pix_b = zf; /* B */
 	    pix_a = 1.0; /* A */
 	    break;
-	case PICT_b8g8r8a8:
+	case PIXMAN_b8g8r8a8:
 	    pix_r = yf; /* R */
 	    pix_g = zf; /* G */
 	    pix_b = wf; /* B */
@@ -1493,7 +1493,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
     case PIXMAN_x8b8g8r8:
 	cb_conf.comp_swap = 0; /* ABGR */
 	break;
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	cb_conf.comp_swap = 3; /* BGRA */
 	break;
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 29f80f12..6e2a3096 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -98,7 +98,7 @@ static struct formatinfo R300TexFormats[] = {
     {PIXMAN_x8r8g8b8,	R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8)},
     {PIXMAN_a8b8g8r8,	R300_EASY_TX_FORMAT(Z, Y, X, W, W8Z8Y8X8)},
     {PIXMAN_x8b8g8r8,	R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
-    {PICT_b8g8r8a8,	R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
+    {PIXMAN_b8g8r8a8,	R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
     {PICT_b8g8r8x8,	R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
     {PICT_r5g6b5,	R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
     {PICT_a1r5g5b5,	R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)},
@@ -140,7 +140,7 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_x8r8g8b8:
     case PIXMAN_a8b8g8r8:
     case PIXMAN_x8b8g8r8:
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	*dst_format = R300_COLORFORMAT_ARGB8888;
 	break;
@@ -1611,7 +1611,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
 		      R300_OUT_FMT_C2_SEL_BLUE |
 		      R300_OUT_FMT_C3_SEL_ALPHA);
 	break;
-    case PICT_b8g8r8a8:
+    case PIXMAN_b8g8r8a8:
     case PICT_b8g8r8x8:
 	output_fmt = (R300_OUT_FMT_C4_8 |
 		      R300_OUT_FMT_C0_SEL_ALPHA |