diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 4747846f5..4df88f63f 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -271,6 +271,7 @@ cat > sdksyms.c << EOF
 #include "window.h"
 #include "windowstr.h"
 #include "xace.h"
+#include "xkbfile.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #include "xkbrules.h"
diff --git a/include/meson.build b/include/meson.build
index 994b4cfba..2393c1625 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -499,6 +499,7 @@ if build_xorg
             'displaymode.h',
             'window.h',
             'windowstr.h',
+            'xkbfile.h',
             'xkbsrv.h',
             'xkbstr.h',
             'xkbrules.h',
diff --git a/include/xkbfile.h b/include/xkbfile.h
new file mode 100644
index 000000000..9bc25cd94
--- /dev/null
+++ b/include/xkbfile.h
@@ -0,0 +1,32 @@
+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+
+#ifndef _XKBFILE_H_
+#define	_XKBFILE_H_ 1
+
+#include "xkbstr.h"
+
+#endif                          /* _XKBFILE_H_ */
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ab3a40743..2f291886b 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -818,7 +818,7 @@ extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
 extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
                                       XkbDescPtr /* src */ );
 
-#include "xkbstr.h"
+#include "xkbfile.h"
 #include "xkbrules.h"
 
 extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
diff --git a/test/test_xkb.c b/test/test_xkb.c
index 11a0f4ce8..2fd9d1f36 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -44,6 +44,7 @@
 #include <xkbsrv.h>
 #include "../xkb/xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
+#include "xkbfile.h"
 #include <assert.h>
 
 #include "tests-common.h"
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index edd4de4b5..2819935eb 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -48,6 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "property.h"
 #include "scrnintstr.h"
 #include "xkbgeom.h"
+#include "xkbfile.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index a8b2f1523..e1b97a56f 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -46,6 +46,7 @@
 #include <xkbsrv.h>
 
 #include "xkbgeom.h"
+#include "xkbfile.h"
 
 #define	VMOD_HIDE_VALUE	0
 #define	VMOD_SHOW_VALUE	1