diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 94ea0a00f2..328b328644 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.11 1997/01/08 08:31:07 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.12 1997/01/24 23:48:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -290,13 +290,13 @@ Async_NotifyAtCommit()
 #ifdef ASYNC_DEBUG
 			elog(DEBUG, "Notifying others");
 #endif
-#ifndef win32
+#ifdef HAVE_KILL
 			if (kill(DatumGetInt32(d), SIGUSR2) < 0) {
 			    if (errno == ESRCH) {
 				heap_delete(lRel, &lTuple->t_ctid);
 			    }
 			}
-#endif /* win32 */
+#endif 
 		    }
 		}
 		ReleaseBuffer(b);
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 396dd80c08..a56ee06637 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.15 1997/01/22 01:42:16 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.16 1997/01/24 23:48:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,12 +40,12 @@
 #include <commands/vacuum.h>
 #include <storage/bufpage.h>
 #include "storage/shmem.h"
-#ifdef NEED_RUSAGE
+#ifndef HAVE_RUSAGE
 # include <rusagestub.h>
-#else /* NEED_RUSAGE */
+#else 
 # include <sys/time.h>
 # include <sys/resource.h>
-#endif /* NEED_RUSAGE */
+#endif 
 
 bool VacuumRunning =	false;
 static int MESSLEV;	/* message level */
diff --git a/src/include/config.h b/src/include/config.h
index 51c78925cf..66737fdf4b 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -18,6 +18,7 @@
 #define HAVE_ISINF
 #define HAVE_CBRT
 #define HAVE_RINT
+#define HAVE_RUSAGE
 
 #if defined(aix)
 #  undef HAVE_SYS_SELECT_H
@@ -95,7 +96,7 @@
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  undef HAVE_ISINF 
-#  define NEED_RUSAGE 
+#  undef HAVE_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define HAVE_TZSET
 #  define NEED_UNION_SEMUN 
@@ -167,7 +168,7 @@
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  undef HAVE_ISINF 
-#  define NEED_RUSAGE 
+#  undef HAVE_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define USE_POSIX_TIME
 #  define HAVE_TZSET
@@ -186,7 +187,7 @@ typedef unsigned char slock_t;
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  undef HAVE_ISINF 
-#  define NEED_RUSAGE 
+#  undef HAVE_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define HAVE_TZSET
 #  define NEED_UNION_SEMUN