diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 7402f522..ed2d5995 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -678,7 +678,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
     {PIXMAN_x8b8g8r8,	FMT_8_8_8_8},
     {PIXMAN_b8g8r8a8,	FMT_8_8_8_8},
     {PIXMAN_b8g8r8x8,	FMT_8_8_8_8},
-    {PICT_r5g6b5,	FMT_5_6_5},
+    {PIXMAN_r5g6b5,	FMT_5_6_5},
     {PICT_a1r5g5b5,	FMT_1_5_5_5},
     {PICT_x1r5g5b5,     FMT_1_5_5_5},
     {PICT_a8,		FMT_8},
@@ -741,7 +741,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_b8g8r8x8:
 	*dst_format = COLOR_8_8_8_8;
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	*dst_format = COLOR_5_6_5;
 	break;
     case PICT_a1r5g5b5:
@@ -938,7 +938,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
     case PIXMAN_x2r10g10b10:
     case PICT_x1r5g5b5:
     case PIXMAN_x8r8g8b8:
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	pix_r = SQ_SEL_Z; /* R */
 	pix_g = SQ_SEL_Y; /* G */
 	pix_b = SQ_SEL_X; /* B */
@@ -1198,7 +1198,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
 	    break;
 	case PICT_x1r5g5b5:
 	case PIXMAN_x8r8g8b8:
-	case PICT_r5g6b5:
+	case PIXMAN_r5g6b5:
 	    pix_r = zf; /* R */
 	    pix_g = yf; /* G */
 	    pix_b = xf; /* B */
@@ -1458,7 +1458,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
     case PIXMAN_b8g8r8x8:
 	cb_conf.comp_swap = 3; /* BGRA */
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	cb_conf.comp_swap = 2; /* RGB */
 	break;
     case PICT_a8:
diff --git a/src/r600_exa.c b/src/r600_exa.c
index a0844914..e48a8513 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -737,7 +737,7 @@ static struct formatinfo R600TexFormats[] = {
     {PIXMAN_x8b8g8r8,	FMT_8_8_8_8},
     {PIXMAN_b8g8r8a8,	FMT_8_8_8_8},
     {PIXMAN_b8g8r8x8,	FMT_8_8_8_8},
-    {PICT_r5g6b5,	FMT_5_6_5},
+    {PIXMAN_r5g6b5,	FMT_5_6_5},
     {PICT_a1r5g5b5,	FMT_1_5_5_5},
     {PICT_x1r5g5b5,     FMT_1_5_5_5},
     {PICT_a8,		FMT_8},
@@ -800,7 +800,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_b8g8r8x8:
 	*dst_format = COLOR_8_8_8_8;
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	*dst_format = COLOR_5_6_5;
 	break;
     case PICT_a1r5g5b5:
@@ -953,7 +953,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
     case PIXMAN_x2r10g10b10:
     case PICT_x1r5g5b5:
     case PIXMAN_x8r8g8b8:
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	pix_r = SQ_SEL_Z; /* R */
 	pix_g = SQ_SEL_Y; /* G */
 	pix_b = SQ_SEL_X; /* B */
@@ -1242,7 +1242,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
 	    break;
 	case PICT_x1r5g5b5:
 	case PIXMAN_x8r8g8b8:
-	case PICT_r5g6b5:
+	case PIXMAN_r5g6b5:
 	    pix_r = zf; /* R */
 	    pix_g = yf; /* G */
 	    pix_b = xf; /* B */
@@ -1497,7 +1497,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
     case PIXMAN_b8g8r8x8:
 	cb_conf.comp_swap = 3; /* BGRA */
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	cb_conf.comp_swap = 2; /* RGB */
 	break;
     case PICT_a8:
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index fffb9125..13416416 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -76,7 +76,7 @@ struct formatinfo {
 static struct formatinfo R100TexFormats[] = {
     {PIXMAN_a8r8g8b8,	RADEON_TXFORMAT_ARGB8888 | RADEON_TXFORMAT_ALPHA_IN_MAP},
     {PIXMAN_x8r8g8b8,	RADEON_TXFORMAT_ARGB8888},
-	{PICT_r5g6b5,	RADEON_TXFORMAT_RGB565},
+    {PIXMAN_r5g6b5,	RADEON_TXFORMAT_RGB565},
 	{PICT_a1r5g5b5,	RADEON_TXFORMAT_ARGB1555 | RADEON_TXFORMAT_ALPHA_IN_MAP},
 	{PICT_x1r5g5b5,	RADEON_TXFORMAT_ARGB1555},
 	{PICT_a8,	RADEON_TXFORMAT_I8 | RADEON_TXFORMAT_ALPHA_IN_MAP},
@@ -87,7 +87,7 @@ static struct formatinfo R200TexFormats[] = {
     {PIXMAN_x8r8g8b8,	R200_TXFORMAT_ARGB8888},
     {PIXMAN_a8b8g8r8,	R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP},
     {PIXMAN_x8b8g8r8,	R200_TXFORMAT_ABGR8888},
-    {PICT_r5g6b5,	R200_TXFORMAT_RGB565},
+    {PIXMAN_r5g6b5,	R200_TXFORMAT_RGB565},
     {PICT_a1r5g5b5,	R200_TXFORMAT_ARGB1555 | R200_TXFORMAT_ALPHA_IN_MAP},
     {PICT_x1r5g5b5,	R200_TXFORMAT_ARGB1555},
     {PICT_a8,		R200_TXFORMAT_I8 | R200_TXFORMAT_ALPHA_IN_MAP},
@@ -100,7 +100,7 @@ static struct formatinfo R300TexFormats[] = {
     {PIXMAN_x8b8g8r8,	R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
     {PIXMAN_b8g8r8a8,	R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
     {PIXMAN_b8g8r8x8,	R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
-    {PICT_r5g6b5,	R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
+    {PIXMAN_r5g6b5,	R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
     {PICT_a1r5g5b5,	R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)},
     {PICT_x1r5g5b5,	R300_EASY_TX_FORMAT(X, Y, Z, ONE, W1Z5Y5X5)},
     {PICT_a8,		R300_EASY_TX_FORMAT(ZERO, ZERO, ZERO, X, X8)},
@@ -115,7 +115,7 @@ static Bool RADEONGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_x8r8g8b8:
 	*dst_format = RADEON_COLOR_FORMAT_ARGB8888;
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	*dst_format = RADEON_COLOR_FORMAT_RGB565;
 	break;
     case PICT_a1r5g5b5:
@@ -144,7 +144,7 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
     case PIXMAN_b8g8r8x8:
 	*dst_format = R300_COLORFORMAT_ARGB8888;
 	break;
-    case PICT_r5g6b5:
+    case PIXMAN_r5g6b5:
 	*dst_format = R300_COLORFORMAT_RGB565;
 	break;
     case PICT_a1r5g5b5: