diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index 8e15a349ef..93797fc419 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -97,7 +97,7 @@ glamor_copy_glyph(PixmapPtr     glyph_pixmap,
         }
         changes[0].val = 0xff;
         changes[1].val = 0x00;
-        if (ChangeGC(NullClient, scratch_gc,
+        if (ChangeGC(NULL, scratch_gc,
                      GCForeground|GCBackground, changes) != Success) {
             glamor_destroy_pixmap(upload_pixmap);
             FreeScratchGC(scratch_gc);
diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c
index 9758cf3590..f7db693fe8 100644
--- a/glamor/glamor_dash.c
+++ b/glamor/glamor_dash.c
@@ -110,8 +110,7 @@ glamor_get_dash_pixmap(GCPtr gc)
         ChangeGCVal     changes;
 
         changes.val = pixel;
-        (void) ChangeGC(NullClient, scratch_gc,
-                        GCForeground, &changes);
+        (void) ChangeGC(NULL, scratch_gc, GCForeground, &changes);
         ValidateGC(&pixmap->drawable, scratch_gc);
         rect.x = offset;
         rect.y = 0;
diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c
index ae014a87ba..38ae5ed062 100644
--- a/glamor/glamor_transform.c
+++ b/glamor/glamor_transform.c
@@ -254,7 +254,7 @@ glamor_get_stipple_pixmap(GCPtr gc)
 
     changes[0].val = 0xff;
     changes[1].val = 0x00;
-    if (ChangeGC(NullClient, scratch_gc,
+    if (ChangeGC(NULL, scratch_gc,
                  GCForeground|GCBackground, changes) != Success)
         goto bail_gc;
     ValidateGC(&pixmap->drawable, scratch_gc);
diff --git a/glamor/glamor_utils.c b/glamor/glamor_utils.c
index ec32aa229b..3249ecd376 100644
--- a/glamor/glamor_utils.c
+++ b/glamor/glamor_utils.c
@@ -46,7 +46,7 @@ glamor_solid_boxes(DrawablePtr drawable,
         ChangeGCVal vals[1];
 
         vals[0].val = fg_pixel;
-        ChangeGC(NullClient, gc, GCForeground, vals);
+        ChangeGC(NULL, gc, GCForeground, vals);
         ValidateGC(drawable, gc);
         gc->ops->PolyFillRect(drawable, gc, nbox, rect);
         FreeScratchGC(gc);
@@ -67,7 +67,7 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
     gc = GetScratchGC(drawable->depth, drawable->pScreen);
     if (!gc)
         return;
-    ChangeGC(NullClient, gc, GCForeground, vals);
+    ChangeGC(NULL, gc, GCForeground, vals);
     ValidateGC(drawable, gc);
     rect.x = x;
     rect.y = y;