diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 55fb0a0ce..70e0bca72 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -676,7 +676,7 @@ XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
 }
 
 XkbKeyPtr
-XkbAddGeomKey(XkbRowPtr row)
+SrvXkbAddGeomKey(XkbRowPtr row)
 {
     XkbKeyPtr key;
 
diff --git a/xkb/xkb.c b/xkb/xkb.c
index ff732f0c7..a9039e261 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5392,7 +5392,7 @@ _CheckSetSections(XkbGeometryPtr geom,
                 if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
                     return BadLength;
 
-                key = XkbAddGeomKey(row);
+                key = SrvXkbAddGeomKey(row);
                 if (!key)
                     return BadAlloc;
                 memcpy(key->name.name, kWire->name, XkbKeyNameLength);
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 152f781d9..b7e37c87d 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomKey			SrvXkbAddGeomKey
 #define XkbAddGeomOutline		SrvXkbAddGeomOutline
 #define XkbAddGeomOverlay		SrvXkbAddGeomOverlay
 #define XkbAddGeomOverlayRow		SrvXkbAddGeomOverlayRow
@@ -331,8 +330,7 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
                                    int  /* sz_outlines */
     );
 
-extern XkbKeyPtr XkbAddGeomKey(XkbRowPtr        /* row */
-    );
+XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
 
 extern XkbRowPtr XkbAddGeomRow(XkbSectionPtr /* section */ ,
                                int      /* sz_keys */
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 6fcf7517d..b69bb54c3 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -1000,7 +1000,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
             for (k = 0; k < rowWire.num_keys; k++) {
                 tmp = fread(&keyWire, SIZEOF(xkmKeyDesc), 1, file);
                 nRead += SIZEOF(xkmKeyDesc) * tmp;
-                key = XkbAddGeomKey(row);
+                key = SrvXkbAddGeomKey(row);
                 if (!key) {
                     _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
                     return nRead;