--- a/src/xmu.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/xmu.h	Mon Aug 13 11:13:30 2007 +0200
@@ -2,6 +2,9 @@
 
 /* Synched up with: Not in FSF. */
 
+#ifndef INCLUDED_xmu_h_
+#define INCLUDED_xmu_h_
+
 #ifdef HAVE_XMU
 
 # include <X11/Xmu/CharSet.h>
@@ -9,6 +12,7 @@
 # include <X11/Xmu/CurUtil.h>
 # include <X11/Xmu/Drawing.h>
 # include <X11/Xmu/Error.h>
+# include <X11/Xmu/Misc.h>
 
 /* Do the EDITRES protocol if running X11R5 (or later) version */
 #if (XtSpecificationRelease >= 5) 
@@ -20,12 +24,19 @@
 
 #else
 
-int XmuCursorNameToIndex (CONST char *name);
-int XmuReadBitmapDataFromFile (CONST char *filename, unsigned int *width,
+int XmuCursorNameToIndex (const char *name);
+int XmuReadBitmapDataFromFile (const char *filename, unsigned int *width,
                                unsigned int *height, unsigned char **datap,
                                int *x_hot, int *y_hot);
 int XmuPrintDefaultErrorMessage (Display *dpy, XErrorEvent *event, FILE *fp);
-void XmuCopyISOLatin1Lowered (char *, CONST char *);
+void XmuCopyISOLatin1Lowered (char *, const char *);
 
-#endif
+#define Max(x, y)       (((x) > (y)) ? (x) : (y))
+#define Min(x, y)       (((x) < (y)) ? (x) : (y))
+#define AssignMax(x, y) {if ((y) > (x)) x = (y);}
+#define AssignMin(x, y) {if ((y) < (x)) x = (y);}
+typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation;
 
+#endif /* HAVE_XMU */
+
+#endif /* INCLUDED_xmu_h_ */