diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 4a06416d1..3e38cbdb3 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -496,7 +496,7 @@ _XkbGeomAlloc(void **old,
 				(n),sizeof(XkbOverlayKeyRec))
 
 Status
-XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes)
+SrvXkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes)
 {
     XkbGeometryPtr geom;
     Status rtrn;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index d808d9f4c..1f09bc15d 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5627,7 +5627,7 @@ _XkbSetGeometry(ClientPtr client, DeviceIntPtr dev, xkbSetGeometryReq * stuff)
     sizes.num_sections = stuff->nSections;
     sizes.num_doodads = stuff->nDoodads;
     sizes.num_key_aliases = stuff->nKeyAliases;
-    if ((status = XkbAllocGeometry(xkb, &sizes)) != Success) {
+    if ((status = SrvXkbAllocGeometry(xkb, &sizes)) != Success) {
         xkb->geom = old;
         return status;
     }
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 539593da3..1a6a903ab 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAllocGeometry		SrvXkbAllocGeometry
 #define XkbFreeGeomKeyAliases		SrvXkbFreeGeomKeyAliases
 #define XkbFreeGeomColors		SrvXkbFreeGeomColors
 #define XkbFreeGeomDoodads		SrvXkbFreeGeomDoodads
@@ -504,9 +503,7 @@ extern Status XkbAllocGeomKeys(XkbRowPtr /* row */ ,
                                int      /* nKeys */
     );
 
-extern Status XkbAllocGeometry(XkbDescPtr /* xkb */ ,
-                               XkbGeometrySizesPtr      /* sizes */
-    );
+Status SrvXkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes);
 
 extern Bool
  XkbComputeShapeTop(XkbShapePtr /* shape */ ,
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 1fbbad380..0c9e11812 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -1052,7 +1052,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
     sizes.num_sections = wireGeom.num_sections;
     sizes.num_doodads = wireGeom.num_doodads;
     sizes.num_key_aliases = wireGeom.num_key_aliases;
-    if (XkbAllocGeometry(xkb, &sizes) != Success) {
+    if (SrvXkbAllocGeometry(xkb, &sizes) != Success) {
         _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
         return nRead;
     }