xkb: Remove XKMformat.h include from xkbsrv.h into the files that need it.

xkbsrv.h is used by drivers, they don't need the XKM format and shouldn't
require it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

include/xkbsrv.h

@@ -947,7 +947,6 @@ extern int XkbGetKeysym(
         DeviceEvent*            /* event*/);
 
 #include "xkbfile.h"
-#include <X11/extensions/XKMformat.h>
 #include "xkbrules.h"
 
 #define	_XkbListKeycodes	0

xkb/xkb.c

@@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkb.h"
 
 #include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
 
 int		XkbEventBase;
 static	int	XkbErrorBase;

xkb/xkbfmisc.c

@@ -34,6 +34,7 @@
 
 #include <X11/Xos.h>
 #include <X11/Xfuncs.h>
+#include <X11/extensions/XKMformat.h>
 
 #include <X11/X.h>
 #include <X11/keysym.h>

xkb/xkbout.c

@@ -36,6 +36,7 @@
 #include <X11/X.h>
 #include <X11/keysym.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"

xkb/xkbtext.c

@@ -36,6 +36,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"

xkb/xkmread.c

@@ -36,6 +36,7 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"