--- a/src/lisp.h	Mon Aug 13 09:39:46 2007 +0200
+++ b/src/lisp.h	Mon Aug 13 09:40:41 2007 +0200
@@ -39,6 +39,18 @@
 #include <stdio.h>		/* NULL, etc. */
 #include <ctype.h>
 #include <stdarg.h>
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+/* Define INT_MAX, DBL_DIG if not in limits.h */
+#ifndef INT_MAX
+#define INT_MAX ((int) ((1U << (INTBITS - 1)) - 1))
+#endif
+#ifndef DBL_DIG
+#define DBL_DIG 16
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -292,10 +304,6 @@
 #define REGISTER register
 #endif
 
-#ifndef INT_MAX
-#define INT_MAX ((int) ((1U << (INTBITS - 1)) - 1))
-#endif
-
 #if defined (__GNUC__) && (__GNUC__ >= 2)
 /* Entomological studies have revealed that the following junk is
    necessary under GCC.  GCC has a compiler bug where incorrect
@@ -1153,10 +1161,6 @@
 #define float_next(f) ((f)->data.next)
 #define float_data(f) ((f)->data.d)
 
-#ifndef DBL_DIG
-# define DBL_DIG 16
-#endif
-
 #define XFLOATINT(n) extract_float (n)
 
 #define CHECK_INT_OR_FLOAT(x)					\