diff --git a/dix/colormap.c b/dix/colormap.c
index b6afe230e..677edf286 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -474,7 +474,7 @@ TellNoMap(WindowPtr pwin, Colormap * pmid)
 #ifdef XINERAMA
         if (noPanoramiXExtension || !pwin->drawable.pScreen->myNum)
 #endif /* XINERAMA */
-            DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
+            dixDeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
         if (pwin->optional) {
             pwin->optional->colormap = None;
             CheckWindowOptionalNeed(pwin);
@@ -503,7 +503,7 @@ TellLostMap(WindowPtr pwin, void *value)
             .u.colormap.state = ColormapUninstalled
         };
         xE.u.u.type = ColormapNotify;
-        DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
+        dixDeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
     }
 
     return WT_WALKCHILDREN;
@@ -528,7 +528,7 @@ TellGainedMap(WindowPtr pwin, void *value)
             .u.colormap.state = ColormapInstalled
         };
         xE.u.u.type = ColormapNotify;
-        DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
+        dixDeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
     }
 
     return WT_WALKCHILDREN;
diff --git a/dix/events.c b/dix/events.c
index 67e275681..eb585c0b8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2944,7 +2944,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
  * @return event delivery state (@see enum EventDeliveryState)
  */
 enum EventDeliveryState
-DeliverEvents(WindowPtr pWin, xEvent *xE, size_t count, WindowPtr otherParent)
+dixDeliverEvents(WindowPtr pWin, xEvent *xE, size_t count, WindowPtr otherParent)
 {
     DeviceIntRec dummy;
     int deliveries;
diff --git a/dix/property.c b/dix/property.c
index 86222818a..1b01bda9e 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -166,7 +166,7 @@ deliverPropertyNotifyEvent(WindowPtr pWin, int state, PropertyPtr pProp)
     };
     event.u.u.type = PropertyNotify;
 
-    DeliverEvents(pWin, &event, 1, (WindowPtr) NULL);
+    dixDeliverEvents(pWin, &event, 1, (WindowPtr) NULL);
 }
 
 int
diff --git a/dix/window.c b/dix/window.c
index 06793c0ef..840041574 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -931,7 +931,7 @@ dixCreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
             .u.createNotify.override = pWin->overrideRedirect
         };
         event.u.u.type = CreateNotify;
-        DeliverEvents(pParent, &event, 1, NullWindow);
+        dixDeliverEvents(pParent, &event, 1, NullWindow);
     }
     return pWin;
 }
@@ -1018,7 +1018,7 @@ CrushTree(WindowPtr pWin)
             if (SubStrSend(pChild, pParent)) {
                 xEvent event = { .u.u.type = DestroyNotify };
                 event.u.destroyNotify.window = pChild->drawable.id;
-                DeliverEvents(pChild, &event, 1, NullWindow);
+                dixDeliverEvents(pChild, &event, 1, NullWindow);
             }
             FreeResource(pChild->drawable.id, X11_RESTYPE_WINDOW);
             pSib = pChild->nextSib;
@@ -1060,7 +1060,7 @@ DeleteWindow(void *value, XID wid)
     if (wid && pParent && SubStrSend(pWin, pParent)) {
         xEvent event = { .u.u.type = DestroyNotify };
         event.u.destroyNotify.window = pWin->drawable.id;
-        DeliverEvents(pWin, &event, 1, NullWindow);
+        dixDeliverEvents(pWin, &event, 1, NullWindow);
     }
 
     FreeWindowResources(pWin);
@@ -1455,7 +1455,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
                     .u.colormap.state = IsMapInstalled(cmap, pWin)
                 };
                 xE.u.u.type = ColormapNotify;
-                DeliverEvents(pWin, &xE, 1, NullWindow);
+                dixDeliverEvents(pWin, &xE, 1, NullWindow);
             }
             break;
         case CWCursor:
@@ -1851,7 +1851,7 @@ ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh)
                     .u.gravity.y = cwsy - wBorderWidth(pSib)
                 };
                 event.u.u.type = GravityNotify;
-                DeliverEvents(pSib, &event, 1, NullWindow);
+                dixDeliverEvents(pSib, &event, 1, NullWindow);
                 pSib->origin.x = cwsx;
                 pSib->origin.y = cwsy;
             }
@@ -2374,7 +2374,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
             event.u.configureNotify.y += screenInfo.screens[0]->y;
         }
 #endif /* XINERAMA */
-        DeliverEvents(pWin, &event, 1, NullWindow);
+        dixDeliverEvents(pWin, &event, 1, NullWindow);
     }
     if (mask & CWBorderWidth) {
         if (action == RESTACK_WIN) {
@@ -2462,7 +2462,7 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
     }
 
     event.u.u.type = CirculateNotify;
-    DeliverEvents(pWin, &event, 1, NullWindow);
+    dixDeliverEvents(pWin, &event, 1, NullWindow);
     ReflectStackChange(pWin,
                        (direction == RaiseLowest) ? pFirst : NullWindow,
                        VTStack);
@@ -2519,7 +2519,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
         event.u.reparent.y += screenInfo.screens[0]->y;
     }
 #endif /* XINERAMA */
-    DeliverEvents(pWin, &event, 1, pParent);
+    dixDeliverEvents(pWin, &event, 1, pParent);
 
     /* take out of sibling chain */
 
@@ -2627,7 +2627,7 @@ DeliverMapNotify(WindowPtr pWin)
         .u.mapNotify.override = pWin->overrideRedirect,
     };
     event.u.u.type = MapNotify;
-    DeliverEvents(pWin, &event, 1, NullWindow);
+    dixDeliverEvents(pWin, &event, 1, NullWindow);
 }
 
 /*****
@@ -2818,7 +2818,7 @@ DeliverUnmapNotify(WindowPtr pWin, Bool fromConfigure)
         .u.unmapNotify.fromConfigure = fromConfigure
     };
     event.u.u.type = UnmapNotify;
-    DeliverEvents(pWin, &event, 1, NullWindow);
+    dixDeliverEvents(pWin, &event, 1, NullWindow);
 }
 
 /*****
@@ -3074,7 +3074,7 @@ SendVisibilityNotify(WindowPtr pWin)
         .u.visibility.state = visibility
     };
     event.u.u.type = VisibilityNotify;
-    DeliverEvents(pWin, &event, 1, NullWindow);
+    dixDeliverEvents(pWin, &event, 1, NullWindow);
 }
 
 #define RANDOM_WIDTH 32
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index da30f1f08..513eefb7e 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -303,7 +303,7 @@ QuartzUpdateScreens(void)
     e.u.configureNotify.height = height;
     e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
     e.u.configureNotify.override = pRoot->overrideRedirect;
-    DeliverEvents(pRoot, &e, 1, NullWindow);
+    dixDeliverEvents(pRoot, &e, 1, NullWindow);
 
     quartzProcs->UpdateScreen(pScreen);
 
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 9b3ea4ef4..cb67b5862 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -351,7 +351,7 @@ miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy)
     }
 #endif /* XINERAMA */
 
-    DeliverEvents(pWin, pEvent, numRects, NullWindow);
+    dixDeliverEvents(pWin, pEvent, numRects, NullWindow);
 
     free(pEvent);
 }
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 3aaab5f4d..d37c97330 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -86,7 +86,7 @@ RRSendConfigNotify(ScreenPtr pScreen)
         .u.configureNotify.override = pWin->overrideRedirect
     };
     event.u.u.type = ConfigureNotify;
-    DeliverEvents(pWin, &event, 1, NullWindow);
+    dixDeliverEvents(pWin, &event, 1, NullWindow);
 }
 
 void