diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index f7ef2d605..76d05bc30 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -708,8 +708,8 @@ SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys)
 }
 
 XkbSectionPtr
-XkbAddGeomSection(XkbGeometryPtr geom,
-                  Atom name, int sz_rows, int sz_doodads, int sz_over)
+SrvXkbAddGeomSection(XkbGeometryPtr geom,
+                     Atom name, int sz_rows, int sz_doodads, int sz_over)
 {
     register int i;
     XkbSectionPtr section;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 1d132a40a..c83a376ae 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5356,8 +5356,8 @@ _CheckSetSections(XkbGeometryPtr geom,
             swaps(&sWire->angle);
         }
         CHK_ATOM_ONLY(sWire->name);
-        section = XkbAddGeomSection(geom, sWire->name, sWire->nRows,
-                                    sWire->nDoodads, sWire->nOverlays);
+        section = SrvXkbAddGeomSection(geom, sWire->name, sWire->nRows,
+                                       sWire->nDoodads, sWire->nOverlays);
         if (!section)
             return BadAlloc;
         section->priority = sWire->priority;
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 97523f955..49f94d6ff 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomSection		SrvXkbAddGeomSection
 #define XkbAddGeomShape			SrvXkbAddGeomShape
 #define XkbAllocGeometry		SrvXkbAllocGeometry
 #define XkbFreeGeomKeyAliases		SrvXkbFreeGeomKeyAliases
@@ -324,12 +323,11 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
 XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
 XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys);
 
-extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ ,
-                                       Atom /* name */ ,
-                                       int /* sz_rows */ ,
-                                       int /* sz_doodads */ ,
-                                       int      /* sz_overlays */
-    );
+XkbSectionPtr SrvXkbAddGeomSection(XkbGeometryPtr geom,
+                                   Atom name,
+                                   int sz_rows,
+                                   int sz_doodads,
+                                   int sz_overlays);
 
 XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
                                    Atom name,
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 3a65c581f..cbf907394 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -966,9 +966,9 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
     nameAtom = XkbInternAtom(buf, FALSE);
     tmp = fread(&sectionWire, SIZEOF(xkmSectionDesc), 1, file);
     nRead += SIZEOF(xkmSectionDesc) * tmp;
-    section = XkbAddGeomSection(geom, nameAtom, sectionWire.num_rows,
-                                sectionWire.num_doodads,
-                                sectionWire.num_overlays);
+    section = SrvXkbAddGeomSection(geom, nameAtom, sectionWire.num_rows,
+                                   sectionWire.num_doodads,
+                                   sectionWire.num_overlays);
     if (!section) {
         _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
         return nRead;