Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 3379)
+++ trunk/src/global_typedefs.h	(revision 3380)
@@ -34,10 +34,12 @@
 typedef struct rats_patch_line_s rats_patch_line_t;
 
 #ifndef XtSpecificationRelease
+#ifndef _XtIntrinsic_h
 typedef unsigned int Cardinal;
+typedef short Position;
+#endif
 /*typedef unsigned int	Pixel;*/
 typedef char *String;
-typedef short Position;
 typedef short dimension_t;
 #endif
 typedef unsigned char BYTE;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 3379)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 3380)
@@ -1,3 +1,5 @@
+#include "xincludes.h"
+
 #include "config.h"
 #include "conf_core.h"
 
@@ -6,7 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xincludes.h"
 
 #include "compat_misc.h"
 #include "global.h"
Index: trunk/src_plugins/hid_lesstif/library.c
===================================================================
--- trunk/src_plugins/hid_lesstif/library.c	(revision 3379)
+++ trunk/src_plugins/hid_lesstif/library.c	(revision 3380)
@@ -1,3 +1,5 @@
+#include "xincludes.h"
+
 #include "config.h"
 #include "conf_core.h"
 
@@ -6,8 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xincludes.h"
-
 #include "compat_misc.h"
 #include "global.h"
 #include "data.h"
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 3379)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 3380)
@@ -1,5 +1,7 @@
 /* 15 Oct 2008 Ineiev: add different crosshair shapes */
 
+#include "xincludes.h"
+
 #include "config.h"
 #include "conf_core.h"
 
@@ -16,8 +18,6 @@
 #include <unistd.h>
 #endif
 
-#include "xincludes.h"
-
 #include "global.h"
 #include "data.h"
 #include "action_helper.h"
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 3379)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 3380)
@@ -1,3 +1,5 @@
+#include "xincludes.h"
+
 #include "config.h"
 #include "conf_core.h"
 
@@ -7,8 +9,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "xincludes.h"
-
 #include "global.h"
 #include "data.h"
 #include "error.h"
Index: trunk/src_plugins/hid_lesstif/styles.c
===================================================================
--- trunk/src_plugins/hid_lesstif/styles.c	(revision 3379)
+++ trunk/src_plugins/hid_lesstif/styles.c	(revision 3380)
@@ -1,3 +1,5 @@
+#include "xincludes.h"
+
 #include "config.h"
 #include "conf_core.h"
 
@@ -6,8 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xincludes.h"
-
 #include "compat_misc.h"
 #include "global.h"
 #include "data.h"