diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index fd9c2fb1ae4ea492358375578563ef75b552b5cc..1c3fb05bc6ac5adad3223b780808bd2407e4fdb8 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_eval.c,v 1.43 1999/08/16 02:17:48 tgl Exp $
+ * $Id: geqo_eval.c,v 1.44 1999/09/21 20:58:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,10 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
+#ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
+#endif
 
 #include "optimizer/cost.h"
 #include "optimizer/geqo.h"
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index ae646c618075f355ae54ef547c4c888b93c94db8..3fa6e50b1a4d4009a399611e770595b5dd214887 100644
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@@ -7,12 +7,14 @@
 *
 *
 * IDENTIFICATION
-*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.14 1999/07/16 04:59:13 momjian Exp $
+*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.15 1999/09/21 20:58:08 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
 
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 16957495328f0faca3d1229bd7bb81d502671f95..d063a73199e84a4002373d5b6ba7b080babeb5cc 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,13 +9,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.9 1999/07/17 20:17:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.10 1999/09/21 20:58:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <math.h>
 
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
 
 #include "postgres.h"
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c21611cc1a377b4b5d666b5075dea192a7532a70..67ac6ce9c302b9100783ba912f2deb85bcd190e4 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.115 1999/07/19 02:27:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.116 1999/09/21 20:58:19 momjian Exp $
  *
  * NOTES
  *
@@ -58,8 +58,10 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
+#ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
+#endif
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 6d98fe6ffff86f767ed78754a1108c3e97910e49..f2d7c4a60f26600ed9006b5d76dab18f67ea8055 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.37 1999/07/17 20:17:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.38 1999/09/21 20:58:25 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -34,6 +34,13 @@
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
+#ifndef MAXINT
+#define MAXINT		  INT_MAX
+#endif
+#else
+#ifdef HAVE_VALUES_H
+#include <values.h>
+#endif
 #endif
 
 #include "access/xact.h"
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 7738e99a57783dad86f3e8543704a4385d3297fd..97b2065cd40c3c741afebe495ae43165992ea959 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.47 1999/07/17 20:17:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.48 1999/09/21 20:58:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,6 +55,13 @@
 #include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
+#ifndef MAXINT
+#define MAXINT		  INT_MAX
+#endif
+#else
+#ifdef HAVE_VALUES_H
+#include <values.h>
+#endif
 #endif
 #include "fmgr.h"
 #include "utils/builtins.h"