diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 5c03305b99edd7e3bf4dfb4f360180d34b591ce7..df80889a2cdaae935ed9af1af1e61ba06d6d431b 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.10 1997/01/22 04:41:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.11 1997/01/24 18:00:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,11 +21,11 @@
 # include <limits.h>
 # define MAXINT        INT_MAX
 #else
-# if defined(USE_LIMITS_H)
+# ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #  define MAXINT	INT_MAX
 # else
-#  ifdef USE_VALUES_H
+#  ifdef HAVE_VALUES_H
 #   include <values.h>
 #  endif
 # endif 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 9d2e103896f4fdc99c72e30961fc42c1e059d302..abde224531662aff47cb3f9b6a6f99c92500c788 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.32 1997/01/22 04:45:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.33 1997/01/24 18:00:27 scrappy Exp $
  *
  * NOTES
  *
@@ -53,12 +53,12 @@
 #include <sys/stat.h>           /* for umask */
 #include <sys/time.h>
 #include <sys/socket.h>
-#if defined(USE_LIMITS_H)
+#ifdef HAVE_LIMITS_H
 # include <limits.h>
 # define MAXINT         INT_MAX
 #else
 # include <values.h>
-#endif /* !USE_LIMITS_H */
+#endif 
 #include <sys/wait.h>
 
 #include <errno.h>
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
index 4ddf1f798f7a0467ae6942167f08cda9f5616a95..c88beeb590d23dfa4bf458a56446a52518ce2aba 100644
--- a/src/backend/utils/Gen_fmgrtab.sh
+++ b/src/backend/utils/Gen_fmgrtab.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.12 1997/01/22 04:56:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.13 1997/01/24 17:59:58 scrappy Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh,v 1.12 1997/01/22 04:56:34 scrappy Exp $
+ * $Id: Gen_fmgrtab.sh,v 1.13 1997/01/24 17:59:58 scrappy Exp $
  *
  * NOTES
  *	******************************
@@ -175,7 +175,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.12 1997/01/22 04:56:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.13 1997/01/24 17:59:58 scrappy Exp $
  *
  * NOTES
  *
@@ -200,7 +200,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
 #ifdef WIN32
 # include <limits.h>
 #else
-# if defined(USE_LIMITS_H)
+# ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #  define MAXINT	INT_MAX
 # else
diff --git a/src/include/config.h b/src/include/config.h
index 67a40a95f404b8f10f83b2b0a6c9d51c5ce65956..4ad148373e262ab8b90322e2121c796571ab45e8 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -8,10 +8,7 @@
 
 #define BLCKSZ	8192
 
-#if !defined(nextstep)
-#define USE_VALUES_H
-#endif
-
+#define HAVE_VALUES_H
 #define HAVE_MEMMOVE
 #define HAVE_TERMIOS_H
 
@@ -41,7 +38,7 @@
 #endif
 
 #if defined(BSD44_derived)
-#  define USE_LIMITS_H
+#  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME
 #  define NEED_CBRT
 #  define NEED_I386_TAS_ASM
@@ -62,7 +59,7 @@
 #  if defined(PRE_BSDI_2_1)
 #    define NEED_UNION_SEMUN 
 #  endif
-#  define USE_LIMITS_H
+#  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME
 #  define NEED_CBRT
 #  define HAS_TEST_AND_SET
@@ -88,7 +85,7 @@
 #endif
 
 #if defined(i386_solaris) 
-#  define USE_LIMITS_H
+#  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  define NEED_ISINF 
@@ -131,6 +128,7 @@
 #endif
 
 #if defined(nextstep)
+# undef HAVE_VALUES_H
 # include <sys/ioctl.h>
 # if defined(__STRICT_ANSI__)
 #  define isascii(c)  ((unsigned)(c)<=0177)
@@ -148,7 +146,7 @@
 #  define NEED_SIG_JMP
 # endif
 
-# define USE_LIMITS_H
+# define HAVE_LIMITS_H
 # define JMP_BUF
 # define NO_WAITPID
   typedef struct mutex slock_t;
@@ -159,7 +157,7 @@
 #endif
 
 #if defined(sparc_solaris)
-#  define USE_LIMITS_H
+#  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  define NEED_ISINF