diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 05334de81..7afaa822e 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -250,8 +250,8 @@ XkbFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count, Bool freeAll)
 
 /***====================================================================***/
 
-void
-XkbFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll)
+static void
+SrvXkbFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll)
 {
     _XkbFreeGeomLeafElems(freeAll, first, count,
                           &row->num_keys, &row->sz_keys,
@@ -267,7 +267,7 @@ _XkbClearRow(char *row_in)
     XkbRowPtr row = (XkbRowPtr) row_in;
 
     if (row->keys != NULL)
-        XkbFreeGeomKeys(row, 0, row->num_keys, TRUE);
+        SrvXkbFreeGeomKeys(row, 0, row->num_keys, TRUE);
     return;
 }
 
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 92be0085e..2cf4116ea 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define	XkbFreeGeomKeys			SrvXkbFreeGeomKeys
 #define	XkbFreeGeomRows			SrvXkbFreeGeomRows
 #define XkbFreeGeomSections		SrvXkbFreeGeomSections
 #define	XkbFreeGeomPoints		SrvXkbFreeGeomPoints
@@ -360,13 +359,6 @@ extern void
                      Bool       /* freeAll */
     );
 
-extern void
- XkbFreeGeomKeys(XkbRowPtr /* row */ ,
-                 int /* first */ ,
-                 int /* count */ ,
-                 Bool           /* freeAll */
-    );
-
 extern void
  XkbFreeGeomRows(XkbSectionPtr /* section */ ,
                  int /* first */ ,