diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 0cb5c84bb..da32e7bec 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -168,8 +168,8 @@ _XkbClearColor(char *color_in)
     return;
 }
 
-void
-XkbFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll)
+static void
+SrvXkbFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll)
 {
     _XkbFreeGeomNonLeafElems(freeAll, first, count,
                              &geom->num_colors, &geom->sz_colors,
@@ -355,7 +355,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
     if ((which & XkbGeomPropertiesMask) && (geom->properties != NULL))
         XkbFreeGeomProperties(geom, 0, geom->num_properties, TRUE);
     if ((which & XkbGeomColorsMask) && (geom->colors != NULL))
-        XkbFreeGeomColors(geom, 0, geom->num_colors, TRUE);
+        SrvXkbFreeGeomColors(geom, 0, geom->num_colors, TRUE);
     if ((which & XkbGeomShapesMask) && (geom->shapes != NULL))
         XkbFreeGeomShapes(geom, 0, geom->num_shapes, TRUE);
     if ((which & XkbGeomSectionsMask) && (geom->sections != NULL))
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 765a63081..474a53252 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbFreeGeomColors		SrvXkbFreeGeomColors
 #define XkbFreeGeomDoodads		SrvXkbFreeGeomDoodads
 #define XkbFreeGeomProperties		SrvXkbFreeGeomProperties
 #define	XkbFreeGeomKeys			SrvXkbFreeGeomKeys
@@ -342,13 +341,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
                                  XkbSectionPtr section,
                                  Atom name);
 
-extern void
- XkbFreeGeomColors(XkbGeometryPtr /* geom */ ,
-                   int /* first */ ,
-                   int /* count */ ,
-                   Bool         /* freeAll */
-    );
-
 extern void
  XkbFreeGeomDoodads(XkbDoodadPtr /* doodads */ ,
                     int /* nDoodads */ ,