diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 7b6087d071..1052812d32 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -755,7 +755,7 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
 
     assert(src_bpp == PIXMAN_FORMAT_BPP(mask));
 
-    new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask);
+    new_vis = PIXMAN_FORMAT_VIS(src) | PIXMAN_FORMAT_VIS(mask);
 
     switch (in_ca) {
     case glamor_program_alpha_normal:
diff --git a/render/picture.c b/render/picture.c
index 6c4fe44f75..56e9b514cb 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -379,7 +379,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
         case PICT_TYPE_GRAY:
             pFormats[f].type = PictTypeIndexed;
             pFormats[f].index.vid =
-                pScreen->visuals[PICT_FORMAT_VIS(format)].vid;
+                pScreen->visuals[PIXMAN_FORMAT_VIS(format)].vid;
             break;
         }
     }