diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 44143eb6f..67f1d5d74 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -785,8 +785,8 @@ SrvXkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name)
 }
 
 XkbOverlayKeyPtr
-XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
-                     XkbOverlayRowPtr row, char *over, char *under)
+SrvXkbAddGeomOverlayKey(XkbOverlayPtr overlay,
+                        XkbOverlayRowPtr row, char *over, char *under)
 {
     register int i;
     XkbOverlayKeyPtr key;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index a411e46f3..82ea0e52e 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5311,9 +5311,9 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
             if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
                 return BadLength;
 
-            if (XkbAddGeomOverlayKey(ol, row,
-                                     (char *) kWire->over,
-                                     (char *) kWire->under) == NULL) {
+            if (SrvXkbAddGeomOverlayKey(ol, row,
+                                        (char *) kWire->over,
+                                        (char *) kWire->under) == NULL) {
                 client->errorValue = _XkbErrCode3(0x21, r, k);
                 return BadMatch;
             }
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 63bb44766..b1d8f95d7 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define	XkbAddGeomOverlayKey		SrvXkbAddGeomOverlayKey
 #define XkbAddGeomProperty		SrvXkbAddGeomProperty
 #define XkbAddGeomRow			SrvXkbAddGeomRow
 #define XkbAddGeomSection		SrvXkbAddGeomSection
@@ -346,11 +345,10 @@ XkbOverlayRowPtr SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay,
                                          int row_under,
                                          int sz_keys);
 
-extern XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr /* overlay */ ,
-                                             XkbOverlayRowPtr /* row */ ,
-                                             char * /* over */ ,
-                                             char *     /* under */
-    );
+XkbOverlayKeyPtr SrvXkbAddGeomOverlayKey(XkbOverlayPtr overlay,
+                                         XkbOverlayRowPtr row,
+                                         char *over,
+                                         char *under);
 
 XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
                                  XkbSectionPtr section,