diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 7afaa822e..d09fbc4c7 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -271,8 +271,8 @@ _XkbClearRow(char *row_in)
     return;
 }
 
-void
-XkbFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll)
+static void
+SrvXkbFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll)
 {
     _XkbFreeGeomNonLeafElems(freeAll, first, count,
                              &section->num_rows, &section->sz_rows,
@@ -288,7 +288,7 @@ _XkbClearSection(char *section_in)
     XkbSectionPtr section = (XkbSectionPtr) section_in;
 
     if (section->rows != NULL)
-        XkbFreeGeomRows(section, 0, section->num_rows, TRUE);
+        SrvXkbFreeGeomRows(section, 0, section->num_rows, TRUE);
     if (section->doodads != NULL) {
         SrvXkbFreeGeomDoodads(section->doodads, section->num_doodads, TRUE);
         section->doodads = NULL;
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 2cf4116ea..433b900bd 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define	XkbFreeGeomRows			SrvXkbFreeGeomRows
 #define XkbFreeGeomSections		SrvXkbFreeGeomSections
 #define	XkbFreeGeomPoints		SrvXkbFreeGeomPoints
 #define	XkbFreeGeomOutlines		SrvXkbFreeGeomOutlines
@@ -359,13 +358,6 @@ extern void
                      Bool       /* freeAll */
     );
 
-extern void
- XkbFreeGeomRows(XkbSectionPtr /* section */ ,
-                 int /* first */ ,
-                 int /* count */ ,
-                 Bool           /* freeAll */
-    );
-
 extern void
  XkbFreeGeomSections(XkbGeometryPtr /* geom */ ,
                      int /* first */ ,