diff --git a/Xext/dpms.c b/Xext/dpms.c
index b04ef94c0..1afbdfc75 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -75,7 +75,7 @@ DPMSFreeClient(void *data, XID id)
 
     pEvent = (DPMSEventPtr) data;
     dixLookupResourceByType((void *) &pHead, eventResource, DPMSEventType,
-                            NullClient, DixUnknownAccess);
+                            NULL, DixUnknownAccess);
     if (pHead) {
         pPrev = 0;
         for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index e7e23c3d8..dc91301c3 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -1045,7 +1045,7 @@ XvFillColorKey(DrawablePtr pDraw, CARD32 key, RegionPtr region)
 
     pval[0].val = key;
     pval[1].val = IncludeInferiors;
-    (void) ChangeGC(NullClient, gc, GCForeground | GCSubwindowMode, pval);
+    (void) ChangeGC(NULL, gc, GCForeground | GCSubwindowMode, pval);
     ValidateGC(pDraw, gc);
 
     rects = calloc(nbox, sizeof(xRectangle));