diff --git a/test/test_xkb.c b/test/test_xkb.c
index 6eb5dedce7..06aa96d70d 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -44,7 +44,7 @@
 #include "inputstr.h"
 #include "opaque.h"
 #include "property.h"
-#include "../xkb/xkbgeom.h"
+#include "../xkb/xkbgeom_priv.h"
 #include <X11/extensions/XKMformat.h>
 #include <assert.h>
 
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index b83a5fc922..4d6c35a821 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "misc.h"
 #include "inputstr.h"
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 #include <os.h>
 
 #include "xkb/xkbsrv_priv.h"
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 28296f4f2f..cdc758b45c 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 /***====================================================================***/
 
diff --git a/xkb/xkb.c b/xkb/xkb.c
index cc9854dd94..ba1ee1d4bb 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -4465,7 +4465,7 @@ ProcXkbSetNames(ClientPtr client)
     return Success;
 }
 
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 20f7046a4d..4c4a36b5af 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -50,7 +50,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "opaque.h"
 #include "property.h"
 #include "scrnintstr.h"
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 #define      _XKB_RF_NAMES_PROP_ATOM         "_XKB_RULES_NAMES"
 
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 12793098dd..68ee0b0888 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include "eventstr.h"
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 /***====================================================================***/
 
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 2ec3b85edb..1b7ce394d7 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -44,7 +44,7 @@
 #include "dix.h"
 #include "xkbstr.h"
 #include <xkbsrv.h>
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 unsigned
 _XkbKSCheckCase(KeySym ks)
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom_priv.h
similarity index 100%
rename from xkb/xkbgeom.h
rename to xkb/xkbgeom_priv.h
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index e19e704845..5d9435b187 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -44,7 +44,7 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 #define	VMOD_HIDE_VALUE	0
 #define	VMOD_SHOW_VALUE	1
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 5d8caf4fb7..a15c1d1178 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -41,7 +41,7 @@
 #include "dix.h"
 #include "xkbstr.h"
 #include <xkbsrv.h>
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 /***====================================================================***/
 
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index fa8bae8a5f..172ce9eeae 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -42,7 +42,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"
-#include "xkbgeom.h"
+#include "xkbgeom_priv.h"
 
 static Atom
 XkbInternAtom(char *str, Bool only_if_exists)