diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index c9a5b63821..1514412969 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -12,6 +12,8 @@
 #ifndef COMMENT_H
 #define COMMENT_H
 
+#include "nodes/pg_list.h"
+
 /*------------------------------------------------------------------
  * Function Prototypes --
  *
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 97b8f3a7b6..7eb6667da0 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,13 +7,14 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.12 2000/01/26 05:58:05 momjian Exp $
+ * $Id: execdebug.h,v 1.13 2000/06/15 00:52:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
+#include "executor/executor.h"
 #include "nodes/print.h"
 
 /* ----------------------------------------------------------------
@@ -227,8 +228,8 @@ extern int	NIndexTupleInserted;
 #define EU_nodeDisplay(l)				nodeDisplay(l)
 #define EU_printf(s)					printf(s)
 #define EU1_printf(s, a)				printf(s, a)
-#define EU2_printf(s, a)				printf(s, a, b)
-#define EU3_printf(s, a)				printf(s, a, b, c)
+#define EU2_printf(s, a, b)				printf(s, a, b)
+#define EU3_printf(s, a, b, c)			printf(s, a, b, c)
 #define EU4_printf(s, a, b, c, d)		printf(s, a, b, c, d)
 #else
 #define EU_nodeDisplay(l)
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index 8013848ef6..4ee039c0fe 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqsignal.h,v 1.12 2000/04/12 17:16:36 momjian Exp $
+ * $Id: pqsignal.h,v 1.13 2000/06/15 00:52:11 momjian Exp $
  *
  * NOTES
  *	  This shouldn't be in libpq, but the monitor and some other
@@ -18,6 +18,8 @@
 #ifndef PQSIGNAL_H
 #define PQSIGNAL_H
 
+#include <signal.h>
+
 #ifdef HAVE_SIGPROCMASK
 extern sigset_t UnBlockSig,
 			BlockSig;
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 5a1acc190f..cf308b6042 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -1,4 +1,4 @@
-/* $Id: pg_wchar.h,v 1.15 2000/06/13 07:35:27 tgl Exp $ */
+/* $Id: pg_wchar.h,v 1.16 2000/06/15 00:52:19 momjian Exp $ */
 
 #ifndef PG_WCHAR_H
 #define PG_WCHAR_H
@@ -32,7 +32,6 @@
 
 #ifdef MULTIBYTE
 typedef unsigned int pg_wchar;
-
 #else
 #define pg_wchar char
 #endif
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index b56ad152f2..b3aa67250f 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.59 2000/06/13 07:35:24 tgl Exp $
+ * $Id: miscadmin.h,v 1.60 2000/06/15 00:52:04 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -26,7 +26,7 @@
 #include <sys/types.h>			/* For pid_t */
 
 #include "postgres.h"
-
+#include "storage/ipc.h"
 
 /*****************************************************************************
  *	  globals.h --															 *
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 634d4402b1..97f2612fc1 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: timestamp.h,v 1.6 2000/06/09 01:11:15 tgl Exp $
+ * $Id: timestamp.h,v 1.7 2000/06/15 00:52:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <math.h>
 #include <limits.h>
+#include <float.h>
 
 #include "fmgr.h"