diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index eb15acb0ae..de180547ad 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,29 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bootstrap.h,v 1.1 1996/08/28 07:21:31 scrappy Exp $
+ * $Id: bootstrap.h,v 1.2 1996/11/06 10:29:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BOOTSTRAP_H
 #define BOOTSTRAP_H
 
-#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <ctype.h>
 
-#include "access/htup.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
-#include "utils/tqual.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"	/* for BufferManagerFlush */
-#include "utils/portal.h"
-#include "utils/elog.h"
-#include "utils/rel.h"
 
 #define	MAXATTR 40		/* max. number of attributes in a relation */
 
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 6e52f4437d..6dea14a0f8 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amop.h,v 1.2 1996/10/31 09:47:12 scrappy Exp $
+ * $Id: pg_amop.h,v 1.3 1996/11/06 10:29:18 scrappy Exp $
  *
  * NOTES
  *   the genbki.sh script reads this file and generates .bki
@@ -24,7 +24,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "access/istrat.h"
 
 /* ----------------
  *	pg_amop definition.  cpp turns this into
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index 154f931423..4602199466 100644
--- a/src/include/catalog/pg_version.h
+++ b/src/include/catalog/pg_version.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_version.h,v 1.2 1996/10/31 09:48:03 scrappy Exp $
+ * $Id: pg_version.h,v 1.3 1996/11/06 10:29:23 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -24,7 +24,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "utils/nabstime.h"
 
 /* ----------------
  *	pg_version definition.  cpp turns this into
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index bb500942e3..d734651c15 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.2 1996/10/04 20:16:52 scrappy Exp $
+ * $Id: async.h,v 1.3 1996/11/06 10:29:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ASYNC_H
 #define	ASYNC_H
 
-#include "nodes/memnodes.h"
 
 extern void Async_NotifyHandler(SIGNAL_ARGS);
 extern void Async_Notify(char *relname);
diff --git a/src/include/commands/version.h b/src/include/commands/version.h
index da7f2c44e1..227fcaeaaa 100644
--- a/src/include/commands/version.h
+++ b/src/include/commands/version.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: version.h,v 1.2 1996/10/31 09:48:24 scrappy Exp $
+ * $Id: version.h,v 1.3 1996/11/06 10:29:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VERSION_H
 #define VERSION_H
 
-#include "nodes/pg_list.h"
 
 extern void DefineVersion(char *name, char *fromRelname, char *date);
 extern void VersionCreate(char *vname, char *bname);
diff --git a/src/include/lib/qsort.h b/src/include/lib/qsort.h
index 4fae4634f4..3382d0b34e 100644
--- a/src/include/lib/qsort.h
+++ b/src/include/lib/qsort.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: qsort.h,v 1.1 1996/08/28 07:22:40 scrappy Exp $
+ * $Id: qsort.h,v 1.2 1996/11/06 10:29:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	QSORT_H
 #define	QSORT_H
 
-#include <sys/types.h>
 
 extern void pg_qsort(void *bot,
 		     size_t nmemb,
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index d67d335643..e04a9ce66f 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: auth.h,v 1.2 1996/10/31 09:48:57 scrappy Exp $
+ * $Id: auth.h,v 1.3 1996/11/06 10:29:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef AUTH_H
 #define	AUTH_H
 
-#include "libpq/pqcomm.h"
+#include <libpq/pqcomm.h>
 
 /*----------------------------------------------------------------
  * Common routines and definitions
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 72e374bdc8..c68fefefd8 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,14 +4,13 @@
  *    Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.1 1996/10/11 09:12:17 bryanh Exp $
+ * $Id: hba.h,v 1.2 1996/11/06 10:29:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HBA_H
 #define	HBA_H
 
-#include <libpq/pqcomm.h>
 
 extern int
 hba_recvauth(const Port *port, const char database[], const char user[],
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index fed461b17a..a48203858c 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -6,23 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fs.h,v 1.1 1996/08/28 07:23:00 scrappy Exp $
+ * $Id: libpq-fs.h,v 1.2 1996/11/06 10:30:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LIBPQ_FS_H
 #define LIBPQ_FS_H
 
-#include "lib/dllist.h"
-#include <sys/file.h>
-#include <sys/stat.h>
 
-#include <fcntl.h>		/* for O_ on some */
 #ifndef WIN32
-#include <unistd.h>		/* for SEEK_ on most */
 #endif /* WIN32 */
 #ifndef SEEK_SET
-#include <stdio.h>		/* for SEEK_ on others */
 #endif /* SEEK_SET */
 
 /* UNIX compatibility junk.  This should be in all systems' include files,
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index dc48786bb4..769ba172b7 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqsignal.h,v 1.2 1996/10/31 09:49:01 scrappy Exp $
+ * $Id: pqsignal.h,v 1.3 1996/11/06 10:30:08 scrappy Exp $
  *
  * NOTES
  *    This shouldn't be in libpq, but the monitor and some other
@@ -17,7 +17,6 @@
 #ifndef PQSIGNAL_H
 #define PQSIGNAL_H
 
-#include <signal.h>
 
 
 typedef void (*pqsigfunc)(int);
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index c95177e8d1..91ceb1140c 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.1 1996/10/31 07:10:13 scrappy Exp $
+ * $Id: miscadmin.h,v 1.2 1996/11/06 10:28:59 scrappy Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -27,10 +27,6 @@
  *    globals.h --                                                           *
  *****************************************************************************/
 
-#include "postgres.h"
-
-/* #include "storage/sinval.h" */
-
 /*
  * from postmaster/postmaster.c
  */
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 789c82085a..d74a35d27e 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.1 1996/08/28 07:23:12 scrappy Exp $
+ * $Id: internal.h,v 1.2 1996/11/06 10:30:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,13 +22,6 @@
  *    
  */
 
-#include "nodes/nodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parsetree.h"
-#include "nodes/relation.h"
-#include "catalog/pg_index.h"	/* for INDEX_MAX_KEYS */
-#include "utils/syscache.h"	/* for SearchSysCacheGetAttribute, etc. */
 
 /*
  *    	System-dependent tuning constants
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 8c74ae4bb7..649974cb5f 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.1 1996/08/28 07:23:26 scrappy Exp $
+ * $Id: planner.h,v 1.2 1996/11/06 10:30:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define PLANNER_H
 
 /*
-#include "optimizer/internal.h"
-#include "parser/parse_query.h"
 */
 
 extern Plan *planner(Query *parse);
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index cda18ffdc4..b51cc0f305 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsetree.h,v 1.1 1996/08/28 07:23:57 scrappy Exp $
+ * $Id: parsetree.h,v 1.2 1996/11/06 10:30:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,8 +18,6 @@
  *	need pg_list.h for definitions of CAR(), etc. macros
  * ----------------
  */
-#include "nodes/pg_list.h"
-#include "nodes/parsenodes.h"
 
 /* ----------------
  *	range table macros
diff --git a/src/include/regex/regexp.h b/src/include/regex/regexp.h
index bf39dab693..25438e3f37 100644
--- a/src/include/regex/regexp.h
+++ b/src/include/regex/regexp.h
@@ -57,9 +57,7 @@ typedef struct regexp {
 	char program[1];	/* Unwarranted chumminess with compiler. */
 } regexp;
 
-/* #include <sys/cdefs.h> */
 /* since not all systems have cdefs.h, we'll use our own here - jolly */
-#include "cdefs.h"
 
 __BEGIN_DECLS
 regexp *pg95_regcomp __P((const char *));
diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h
index 539268cfed..ea54dee521 100644
--- a/src/include/rewrite/locks.h
+++ b/src/include/rewrite/locks.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: locks.h,v 1.1 1996/08/28 07:24:04 scrappy Exp $
+ * $Id: locks.h,v 1.2 1996/11/06 10:30:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LOCKS_H
 #define	LOCKS_H
 
-#include "rewrite/prs2lock.h"
 
 extern List *matchLocks(CmdType event, RuleLock *rulelocks, int varno,
 			Query *parsetree);
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 6dcaf09499..36d03f6a61 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteSupport.h,v 1.1 1996/08/28 07:24:13 scrappy Exp $
+ * $Id: rewriteSupport.h,v 1.2 1996/11/06 10:31:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	REWRITESUPPORT_H
 #define	REWRITESUPPORT_H
 
-#include "nodes/pg_list.h"
 
 extern int IsDefinedRewriteRule(char *ruleName);