diff --git a/Xext/xace.c b/Xext/xace.c
index 580566a5d..71e43f254 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -33,9 +33,8 @@ CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
 
 /* Special-cased hook functions.  Called by Xserver.
  */
-#undef XaceHookDispatch
 int
-XaceHookDispatch(ClientPtr client, int major)
+XaceHookDispatch0(ClientPtr client, int major)
 {
     /* Call the extension dispatch hook */
     ExtensionEntry *ext = GetExtensionEntry(major);
diff --git a/Xext/xace.h b/Xext/xace.h
index be1f996fb..841ea82a7 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -68,10 +68,10 @@ int XaceHookIsSet(int hook);
 
 /* Special-cased hook functions
  */
-int XaceHookDispatch(ClientPtr ptr, int major);
+int XaceHookDispatch0(ClientPtr ptr, int major);
 #define XaceHookDispatch(c, m) \
     ((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \
-    XaceHookDispatch((c), (m)) : \
+    XaceHookDispatch0((c), (m)) : \
     Success)
 
 int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,