diff --git a/composite/compinit.c b/composite/compinit.c
index f06e0293b1..791c1183a1 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -262,7 +262,7 @@ compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs,
     visual->bitsPerRGBValue = 8;
     if (PICT_FORMAT_TYPE(alt->format) == PICT_TYPE_COLOR) {
         visual->class = PseudoColor;
-        visual->nplanes = PICT_FORMAT_BPP(alt->format);
+        visual->nplanes = PIXMAN_FORMAT_BPP(alt->format);
         visual->ColormapEntries = 1 << visual->nplanes;
     }
     else {
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index 3b9e7333c8..86edf902b5 100644
--- a/exa/exa_glyphs.c
+++ b/exa/exa_glyphs.c
@@ -552,7 +552,7 @@ exaBufferGlyph(ScreenPtr pScreen,
     if (buffer->count == GLYPH_BUFFER_SIZE)
         return ExaGlyphNeedFlush;
 
-    if (PICT_FORMAT_BPP(format) == 1)
+    if (PIXMAN_FORMAT_BPP(format) == 1)
         format = PICT_a8;
 
     for (i = 0; i < EXA_NUM_GLYPH_CACHES; i++) {
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 10d58e52ca..dbddff72ad 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -905,7 +905,7 @@ exaComposite(CARD8 op,
                    (pSrc->format == pDst->format ||
                     (PICT_FORMAT_COLOR(pDst->format) &&
                      PICT_FORMAT_COLOR(pSrc->format) &&
-                     pDst->format == PICT_FORMAT(PICT_FORMAT_BPP(pSrc->format),
+                     pDst->format == PICT_FORMAT(PIXMAN_FORMAT_BPP(pSrc->format),
                                                  PICT_FORMAT_TYPE(pSrc->format),
                                                  0,
                                                  PICT_FORMAT_R(pSrc->format),
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index c72ada085c..8816e8b71a 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -751,9 +751,9 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
         *des = src;
         return TRUE;
     }
-    src_bpp = PICT_FORMAT_BPP(src);
+    src_bpp = PIXMAN_FORMAT_BPP(src);
 
-    assert(src_bpp == PICT_FORMAT_BPP(mask));
+    assert(src_bpp == PIXMAN_FORMAT_BPP(mask));
 
     new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask);
 
@@ -1551,7 +1551,7 @@ glamor_composite_clipped_region(CARD8 op,
              && (source->format == dest->format
                  || (PICT_FORMAT_COLOR(dest->format)
                      && PICT_FORMAT_COLOR(source->format)
-                     && dest->format == PICT_FORMAT(PICT_FORMAT_BPP(source->format),
+                     && dest->format == PICT_FORMAT(PIXMAN_FORMAT_BPP(source->format),
                                                     PICT_FORMAT_TYPE(source->format),
                                                     0,
                                                     PICT_FORMAT_R(source->format),
diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
index deed029476..f777e4a2f4 100644
--- a/glamor/glamor_transfer.c
+++ b/glamor/glamor_transfer.c
@@ -43,7 +43,7 @@ glamor_upload_boxes(DrawablePtr drawable, BoxPtr in_boxes, int in_nbox,
     glamor_pixmap_private       *priv = glamor_get_pixmap_private(pixmap);
     int                         box_index;
     const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
-    int                         bytes_per_pixel = PICT_FORMAT_BPP(f->render_format) >> 3;
+    int                         bytes_per_pixel = PIXMAN_FORMAT_BPP(f->render_format) >> 3;
     char *tmp_bits = NULL;
 
     if (glamor_drawable_effective_depth(drawable) == 24 && pixmap->drawable.depth == 32)
@@ -153,7 +153,7 @@ glamor_download_boxes(DrawablePtr drawable, BoxPtr in_boxes, int in_nbox,
     glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
     int box_index;
     const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
-    int bytes_per_pixel = PICT_FORMAT_BPP(f->render_format) >> 3;
+    int bytes_per_pixel = PIXMAN_FORMAT_BPP(f->render_format) >> 3;
 
     glamor_make_current(glamor_priv);
 
diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
index eb4831ec8b..f2fbf915c5 100644
--- a/glamor/glamor_utils.h
+++ b/glamor/glamor_utils.h
@@ -620,7 +620,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
         ashift = 0;
         rshift = abits;
         if (abits == 0)
-            rshift = PICT_FORMAT_BPP(format) - (rbits + gbits + bbits);
+            rshift = PIXMAN_FORMAT_BPP(format) - (rbits + gbits + bbits);
         gshift = rshift + rbits;
         bshift = gshift + gbits;
     }
diff --git a/render/picture.c b/render/picture.c
index 5e59c46e1a..b3ac5ce846 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -347,18 +347,18 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
             pFormats[f].direct.blueMask = Mask (PICT_FORMAT_B(format));
 
             pFormats[f].direct.blue =
-                (PICT_FORMAT_BPP(format) - PICT_FORMAT_B(format));
+                (PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format));
 
             pFormats[f].direct.greenMask = Mask (PICT_FORMAT_G(format));
 
             pFormats[f].direct.green =
-                (PICT_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
+                (PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
                  PICT_FORMAT_G(format));
 
             pFormats[f].direct.redMask = Mask (PICT_FORMAT_R(format));
 
             pFormats[f].direct.red =
-                (PICT_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
+                (PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
                  PICT_FORMAT_G(format) - PICT_FORMAT_R(format));
 
             pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));