5 files changed, 31 insertions, 28 deletions
diff --git a/libX11/src/xkb/XKB.c b/libX11/src/xkb/XKB.c
index 79cd3a73e..bdb317993 100644
--- a/libX11/src/xkb/XKB.c
+++ b/libX11/src/xkb/XKB.c
@@ -32,14 +32,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
 
 #ifdef XKB_IN_SERVER
 #define XkbVirtualModsToReal    SrvXkbVirtualModsToReal
 #endif
 
+#include "Xlibint.h"
+#include <X11/extensions/XKBproto.h>
+#include "XKBlibint.h"
+
 XkbInternAtomFunc	_XkbInternAtomFunc= XInternAtom;
 XkbGetAtomNameFunc	_XkbGetAtomNameFunc= XGetAtomName;
 
diff --git a/libX11/src/xkb/XKBBind.c b/libX11/src/xkb/XKBBind.c
index 5872cf631..46f639051 100644
--- a/libX11/src/xkb/XKBBind.c
+++ b/libX11/src/xkb/XKBBind.c
@@ -34,23 +34,6 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "XKBlib.h"
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-#ifdef USE_OWN_COMPOSE
-#define	COMPOSE_NO_CONST_MEMBERS
-#include "imComp.h"
-#endif
-
-#define AllMods (ShiftMask|LockMask|ControlMask| \
-		 Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
 
 #ifdef XKB_IN_SERVER
 #define XkbAllocClientMap   SrvXkbAllocClientMap
@@ -79,7 +62,24 @@ from The Open Group.
 #define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
 #endif
 
-                 
+#include "XKBlib.h"
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#include <X11/extensions/XKBproto.h>
+#include "XKBlibint.h"
+
+#ifdef USE_OWN_COMPOSE
+#define	COMPOSE_NO_CONST_MEMBERS
+#include "imComp.h"
+#endif
+
+#define AllMods (ShiftMask|LockMask|ControlMask| \
+		 Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
+
 static int _XkbLoadDpy(
     Display *dpy
 );
diff --git a/libX11/src/xkb/XKBGetMap.c b/libX11/src/xkb/XKBGetMap.c
index eb981a3a5..b692dfbdf 100644
--- a/libX11/src/xkb/XKBGetMap.c
+++ b/libX11/src/xkb/XKBGetMap.c
@@ -33,9 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
 
 #ifdef XKB_IN_SERVER
 #define XkbAllocClientMap   SrvXkbAllocClientMap
@@ -64,6 +61,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
 #endif
 
+#include "Xlibint.h"
+#include <X11/extensions/XKBproto.h>
+#include "XKBlibint.h"
+
 static Status
 _XkbReadKeyTypes(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
 {
diff --git a/libX11/src/xkb/XKBMisc.c b/libX11/src/xkb/XKBMisc.c
index 9a6308a34..c7db46587 100644
--- a/libX11/src/xkb/XKBMisc.c
+++ b/libX11/src/xkb/XKBMisc.c
@@ -48,6 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
+#define XkbVirtualModsToReal    SrvXkbVirtualModsToReal
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
@@ -55,7 +56,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <X11/extensions/XKBsrv.h>
 
-#define XkbVirtualModsToReal    SrvXkbVirtualModsToReal
 #endif /* XKB_IN_SERVER */
 
 /***====================================================================***/
diff --git a/libX11/src/xkb/XKBUse.c b/libX11/src/xkb/XKBUse.c
index f066e4c73..a9db88d16 100644
--- a/libX11/src/xkb/XKBUse.c
+++ b/libX11/src/xkb/XKBUse.c
@@ -33,9 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <ctype.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
 
 #ifdef XKB_IN_SERVER
 #define XkbAllocClientMap   SrvXkbAllocClientMap
@@ -64,6 +61,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
 #endif
 
+#include "Xlibint.h"
+#include <X11/extensions/XKBproto.h>
+#include "XKBlibint.h"
+
 static Bool	_XkbIgnoreExtension = False;
 
 void