diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index d0cc51e99..68a9fc184 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -575,7 +575,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
 }
 
 XkbKeyAliasPtr
-XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
+SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
 {
     register int i;
     register XkbKeyAliasPtr alias;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 744dba63d..2d7387c74 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5599,7 +5599,7 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
         if (!_XkbCheckRequestBounds(client, req, wire, wire + XkbKeyNameLength))
                 return BadLength;
 
-        if (XkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL)
+        if (SrvXkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL)
             return BadAlloc;
         wire += 2 * XkbKeyNameLength;
     }
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 5ade436be..9f8f60010 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomKeyAlias 		SrvXkbAddGeomKeyAlias
 #define XkbAddGeomColor 		SrvXkbAddGeomColor
 #define XkbAddGeomDoodad		SrvXkbAddGeomDoodad
 #define XkbAddGeomKey			SrvXkbAddGeomKey
@@ -317,10 +316,9 @@ extern XkbPropertyPtr XkbAddGeomProperty(XkbGeometryPtr /* geom */ ,
                                          char * /* value */
     );
 
-extern XkbKeyAliasPtr XkbAddGeomKeyAlias(XkbGeometryPtr /* geom */ ,
-                                         char * /* alias */ ,
-                                         char * /* real */
-    );
+XkbKeyAliasPtr SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom,
+                                     char *alias,
+                                     char *real);
 
 extern XkbColorPtr XkbAddGeomColor(XkbGeometryPtr /* geom */ ,
                                    char * /* spec */ ,