diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index da32e7bec..455b278ec 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -34,6 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
+static void
+SrvXkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll);
+
 /***====================================================================***/
 
 static void
@@ -287,7 +290,7 @@ _XkbClearSection(char *section_in)
     if (section->rows != NULL)
         XkbFreeGeomRows(section, 0, section->num_rows, TRUE);
     if (section->doodads != NULL) {
-        XkbFreeGeomDoodads(section->doodads, section->num_doodads, TRUE);
+        SrvXkbFreeGeomDoodads(section->doodads, section->num_doodads, TRUE);
         section->doodads = NULL;
     }
     return;
@@ -329,8 +332,8 @@ _XkbClearDoodad(char *doodad_in)
     return;
 }
 
-void
-XkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll)
+static void
+SrvXkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll)
 {
     register int i;
     register XkbDoodadPtr doodad;
@@ -361,7 +364,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
     if ((which & XkbGeomSectionsMask) && (geom->sections != NULL))
         XkbFreeGeomSections(geom, 0, geom->num_sections, TRUE);
     if ((which & XkbGeomDoodadsMask) && (geom->doodads != NULL)) {
-        XkbFreeGeomDoodads(geom->doodads, geom->num_doodads, TRUE);
+        SrvXkbFreeGeomDoodads(geom->doodads, geom->num_doodads, TRUE);
         geom->doodads = NULL;
         geom->num_doodads = geom->sz_doodads = 0;
     }
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 474a53252..4596fe946 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbFreeGeomDoodads		SrvXkbFreeGeomDoodads
 #define XkbFreeGeomProperties		SrvXkbFreeGeomProperties
 #define	XkbFreeGeomKeys			SrvXkbFreeGeomKeys
 #define	XkbFreeGeomRows			SrvXkbFreeGeomRows
@@ -341,12 +340,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
                                  XkbSectionPtr section,
                                  Atom name);
 
-extern void
- XkbFreeGeomDoodads(XkbDoodadPtr /* doodads */ ,
-                    int /* nDoodads */ ,
-                    Bool        /* freeAll */
-    );
-
 extern void
  XkbFreeGeomProperties(XkbGeometryPtr /* geom */ ,
                        int /* first */ ,