diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h
index e0c1c1f20372067a5b643f513fe2d91647199936..b4111e16670f17cc2b52bca1b38624e2b889a5cb 100644
--- a/src/include/access/attnum.h
+++ b/src/include/access/attnum.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: attnum.h,v 1.3 1996/10/31 05:56:34 momjian Exp $
+ * $Id: attnum.h,v 1.4 1996/10/31 09:46:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ATTNUM_H
 #define ATTNUM_H
 
-#include "postgres.h"
 
 /*
  * user defined attribute numbers start at 1.	-ay 2/95
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 3566260602b5c0765c33db3930749059087c4479..b23533cbe36d7eaed2f175b1a77cf472a1d1fbff 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.1 1996/08/27 21:50:09 scrappy Exp $
+ * $Id: genam.h,v 1.2 1996/10/31 09:46:37 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	GENAM_H
 #define GENAM_H
 
-#include "postgres.h"
 
 #include "access/attnum.h"
 #include "access/htup.h"
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 342dbab2a2dc279a76320fe8895feee3c83d69d2..802064cff0b0b6a9b3d23cdfdf9c43067b0a5697 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.2 1996/09/23 08:36:39 scrappy Exp $
+ * $Id: heapam.h,v 1.3 1996/10/31 09:46:37 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <sys/types.h>
 
-#include "postgres.h"
 
 #include "access/attnum.h"
 #include "access/htup.h"
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 06f01ae53b493a91adecbae3c884db9087e34aa5..bc4158224df3b579b26bdaceeb2c25f53f6821e2 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.1 1996/08/27 21:50:14 scrappy Exp $
+ * $Id: hio.h,v 1.2 1996/10/31 09:46:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	HIO_H
 #define HIO_H
 
-#include "c.h"
 
 #include "storage/block.h"
 #include "access/htup.h"
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index 6a495851305bcdcbcf4c138a49f4e3187cbde8b3..f8e4648ccebde1ecefff1bc6670f009506245cee 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: iqual.h,v 1.2 1996/10/23 07:41:27 scrappy Exp $
+ * $Id: iqual.h,v 1.3 1996/10/31 09:46:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	IQUAL_H
 #define IQUAL_H
 
-#include "c.h"
 
 #include "storage/itemid.h"
 #include "utils/rel.h"
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 120b487e8236cba3fa26d4c20b528f7c6a24c37f..0133333c9f7d388729818cc491becb961b56d0f4 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.1 1996/08/27 21:50:17 scrappy Exp $
+ * $Id: istrat.h,v 1.2 1996/10/31 09:46:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ISTRAT_H
 #define ISTRAT_H
 
-#include "postgres.h"
 #include "access/attnum.h"
 #include "access/skey.h"
 #include "access/strat.h"
diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h
index 8def3015c3b654d70eb93d46d64ea27da559eaa3..9d60e2dd3d3e3e70625535f9dcd0f5c2285fce2a 100644
--- a/src/include/access/sdir.h
+++ b/src/include/access/sdir.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sdir.h,v 1.1 1996/08/27 21:50:23 scrappy Exp $
+ * $Id: sdir.h,v 1.2 1996/10/31 09:46:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SDIR_H
 #define SDIR_H
 
-#include "c.h"
 
 /*
  * ScanDirection was an int8 for no apparent reason. I kept the original
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 5088c7f8db14cec60fef7d45810e203fa9601503..865daaece709556a3c21b02354ed9cc7f36a9837 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.1 1996/08/27 21:50:28 scrappy Exp $
+ * $Id: valid.h,v 1.2 1996/10/31 09:46:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	VALID_H
 #define VALID_H
 
-#include "c.h"
 #include "access/skey.h"
 #include "storage/buf.h"
 #include "utils/tqual.h"
diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h
index 2c4fd6d31e633b500e77b7821526cb4aeaa3323b..26a740db08689efb16a02c34c59659e651cd779f 100644
--- a/src/include/catalog/catname.h
+++ b/src/include/catalog/catname.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catname.h,v 1.1 1996/08/28 01:56:23 scrappy Exp $
+ * $Id: catname.h,v 1.2 1996/10/31 09:47:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	CATNAME_H
 #define CATNAME_H
 
-#include "postgres.h"
 
 
 #define  AggregateRelationName "pg_aggregate"
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 8b52114c4a51e24944bef4ba7cf2c5fb6e3ab2ec..fd3a3200b8f150cc27f5813068ac7901fe14cf53 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_aggregate.h,v 1.1 1996/08/28 01:56:30 scrappy Exp $
+ * $Id: pg_aggregate.h,v 1.2 1996/10/31 09:47:04 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 "postgres.h"
 
 /* ----------------------------------------------------------------
  *	pg_aggregate definition.
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index bfa9a012cee4a1830bf090f4905490f3f31ffe91..aca3de4f80b249c034b36f0d7b7551720b66b440 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_am.h,v 1.1 1996/08/28 01:56:32 scrappy Exp $
+ * $Id: pg_am.h,v 1.2 1996/10/31 09:47:07 scrappy Exp $
  *
  * NOTES
  *	the genbki.sh script reads this file and generates .bki
@@ -27,7 +27,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 /* ----------------
  *	pg_am definition.  cpp turns this into
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index fd3d052daf89b361e7d79ddf9cbf60377f151f67..6e52f4437daf7f147755587a44a7392fe837aaf0 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.1 1996/08/28 01:56:34 scrappy Exp $
+ * $Id: pg_amop.h,v 1.2 1996/10/31 09:47:12 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 "postgres.h"
 #include "access/istrat.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index e00d35c8a94c620b06193a6551009156af8ad8f6..600d53c4ef06a218baa5aaa6ce65a492fc4aeff0 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amproc.h,v 1.1 1996/08/28 01:56:36 scrappy Exp $
+ * $Id: pg_amproc.h,v 1.2 1996/10/31 09:47:17 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -26,7 +26,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 /* ----------------
  *	pg_amproc definition.  cpp turns this into
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index a6796dd2fa3cf30aa1233a6d654382a067cb83c9..76605d3bc94995de1fa4c5efd6d1f368f3dcadf7 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.1 1996/08/28 01:56:37 scrappy Exp $
+ * $Id: pg_attribute.h,v 1.2 1996/10/31 09:47:19 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -29,7 +29,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 #include "access/attnum.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index eb4ba992d6b4017476de8230abd8ab3fd1993fe0..d46357b7b674eb69f9f0dc6b425133ac98078dba 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.1 1996/08/28 01:56:39 scrappy Exp $
+ * $Id: pg_class.h,v 1.2 1996/10/31 09:47:21 scrappy Exp $
  *
  * NOTES
  *    ``pg_relation'' is being replaced by ``pg_class''.  currently
@@ -29,7 +29,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 #include "utils/nabstime.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index 92f84b8edca70309b679869a24c1fc86fb39458d..057d40b19fc318abe1f657c6badca73ffdb81244 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_database.h,v 1.1 1996/08/28 01:56:41 scrappy Exp $
+ * $Id: pg_database.h,v 1.2 1996/10/31 09:47: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 "postgres.h"
 
 /* ----------------
  *	pg_database definition.  cpp turns this into
diff --git a/src/include/catalog/pg_defaults.h b/src/include/catalog/pg_defaults.h
index 1a85c730e836c9753d7d9fda1d953483c4ffc493..554c4457a3c33119da507b7868e49c1a00d9c5ca 100644
--- a/src/include/catalog/pg_defaults.h
+++ b/src/include/catalog/pg_defaults.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_defaults.h,v 1.1 1996/08/28 01:56:42 scrappy Exp $
+ * $Id: pg_defaults.h,v 1.2 1996/10/31 09:47:24 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 "postgres.h"
 
 /* ----------------
  *	pg_defaults definition.  cpp turns this into
diff --git a/src/include/catalog/pg_demon.h b/src/include/catalog/pg_demon.h
index 62dace1ca72e1cadb41f23a6c40301649cc5a30c..a0511ee362c3149decf73870b4039156b9e61d56 100644
--- a/src/include/catalog/pg_demon.h
+++ b/src/include/catalog/pg_demon.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_demon.h,v 1.1 1996/08/28 01:56:44 scrappy Exp $
+ * $Id: pg_demon.h,v 1.2 1996/10/31 09:47:26 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 "postgres.h"
 
 /* ----------------
  *	pg_demon definition.  cpp turns this into
diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h
index b392cd25c1e9804e9c03f2a73f41d490d046cadb..b54a960b06b3eea452d7d1b6575911717293d1a6 100644
--- a/src/include/catalog/pg_group.h
+++ b/src/include/catalog/pg_group.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_group.h,v 1.1 1996/08/28 01:56:45 scrappy Exp $
+ * $Id: pg_group.h,v 1.2 1996/10/31 09:47:28 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -23,7 +23,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 CATALOG(pg_group) BOOTSTRAP {
         NameData groname;
diff --git a/src/include/catalog/pg_hosts.h b/src/include/catalog/pg_hosts.h
index ddd8f4217585bebb2250049909afb86b11a1e8fa..f192310f2c7837b714569bcf39e0050eb432a8cf 100644
--- a/src/include/catalog/pg_hosts.h
+++ b/src/include/catalog/pg_hosts.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_hosts.h,v 1.1 1996/08/28 01:56:47 scrappy Exp $
+ * $Id: pg_hosts.h,v 1.2 1996/10/31 09:47:30 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -27,7 +27,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 CATALOG(pg_hosts) BOOTSTRAP {
         NameData dbName;   
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 7141dabd757401987a8686c64620f980605642eb..1ae6c6158c572554c44d2a5685afc6cd32ecdab4 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_index.h,v 1.1 1996/08/28 01:56:49 scrappy Exp $
+ * $Id: pg_index.h,v 1.2 1996/10/31 09:47:31 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 "postgres.h"
 
 /* ----------------
  *	pg_index definition.  cpp turns this into
diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h
index 39b89d113e232cbbfa06de8c52db08b9a300617d..5357c7ebfa5e5d802b6b4e1e0fa84c71354c80aa 100644
--- a/src/include/catalog/pg_inheritproc.h
+++ b/src/include/catalog/pg_inheritproc.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inheritproc.h,v 1.1 1996/08/28 01:56:51 scrappy Exp $
+ * $Id: pg_inheritproc.h,v 1.2 1996/10/31 09:47:33 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 "postgres.h"
 
 /* ----------------
  *	pg_inheritproc definition.  cpp turns this into
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index b30380192072b3103b2c8a1010c4614b674128c0..66c6f933914fb09452ba4e166c822725e7508352 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inherits.h,v 1.1 1996/08/28 01:56:52 scrappy Exp $
+ * $Id: pg_inherits.h,v 1.2 1996/10/31 09:47:35 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 "postgres.h"
 
 /* ----------------
  *	pg_inherits definition.  cpp turns this into
diff --git a/src/include/catalog/pg_ipl.h b/src/include/catalog/pg_ipl.h
index a9c987872324b037b309a7506406e41cb1a1dc91..7242c8fc672ef74c2019d07b3637d7969a297441 100644
--- a/src/include/catalog/pg_ipl.h
+++ b/src/include/catalog/pg_ipl.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_ipl.h,v 1.1 1996/08/28 01:56:54 scrappy Exp $
+ * $Id: pg_ipl.h,v 1.2 1996/10/31 09:47:36 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 "postgres.h"
 
 /* ----------------
  *	pg_ipl definition.  cpp turns this into
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 7e5b15d3b205d6e3142f5d8de024f7710bfb88a3..35e53d7dc185d54f4cd9cb7725277dcdd843724f 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_language.h,v 1.1 1996/08/28 01:56:57 scrappy Exp $
+ * $Id: pg_language.h,v 1.2 1996/10/31 09:47:38 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 "postgres.h"
 
 /* ----------------
  *	pg_language definition.  cpp turns this into
diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index 77e5885bd03c579a9172ba9088c29dc354837bcc..64749d3e3345e534b45c9b85ffc6fd7be808ba81 100644
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_listener.h,v 1.1 1996/08/28 01:56:58 scrappy Exp $
+ * $Id: pg_listener.h,v 1.2 1996/10/31 09:47:40 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -23,7 +23,6 @@
  *      can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 /* ----------------------------------------------------------------
  *      pg_listener definition.
diff --git a/src/include/catalog/pg_log.h b/src/include/catalog/pg_log.h
index 9d9659987bf9068e5ee554e724243502475dea4f..7aa4240762d0a8ecee0f7c1a1a4566b4c2ffa8c7 100644
--- a/src/include/catalog/pg_log.h
+++ b/src/include/catalog/pg_log.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_log.h,v 1.1 1996/08/28 01:57:00 scrappy Exp $
+ * $Id: pg_log.h,v 1.2 1996/10/31 09:47:42 scrappy Exp $
  *
  * NOTES
  *    The structures and macros used by the transam/ code
@@ -26,7 +26,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 CATALOG(pg_log) BOOTSTRAP {
     Oid  	logfoo;
diff --git a/src/include/catalog/pg_magic.h b/src/include/catalog/pg_magic.h
index 7cb8948945f436d26a58b7591c8f2b959c687d4d..83f53d73d1be6297d0fb6924d106ce148fe54668 100644
--- a/src/include/catalog/pg_magic.h
+++ b/src/include/catalog/pg_magic.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_magic.h,v 1.1 1996/08/28 01:57:02 scrappy Exp $
+ * $Id: pg_magic.h,v 1.2 1996/10/31 09:47:45 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 "postgres.h"
 
 /* ----------------
  *	pg_magic definition.  cpp turns this into
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 5a88163b1045e96ae106d837fbe77f75d3295734..ca761c47b2f5d5ad28f3bd0ea8bfa36f2f7f5cb8 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.1 1996/08/28 01:57:03 scrappy Exp $
+ * $Id: pg_opclass.h,v 1.2 1996/10/31 09:47:48 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 "postgres.h"
 
 /* ----------------
  *	pg_opclass definition.  cpp turns this into
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index de9f68b2bfd9ebafa84e4c6b4eecb4081eb0dc65..8e8ea96c8148a2b490c232fce952606f61de50f1 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.1 1996/08/28 01:57:05 scrappy Exp $
+ * $Id: pg_operator.h,v 1.2 1996/10/31 09:47:49 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -27,7 +27,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 /* ----------------
  *	pg_operator definition.  cpp turns this into
diff --git a/src/include/catalog/pg_parg.h b/src/include/catalog/pg_parg.h
index cb6f9253f1d00fd4bdef098f67eb8ffc3bf5b29f..7f1fec72f3ac7612ce7087512de48163877fff17 100644
--- a/src/include/catalog/pg_parg.h
+++ b/src/include/catalog/pg_parg.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_parg.h,v 1.1 1996/08/28 01:57:07 scrappy Exp $
+ * $Id: pg_parg.h,v 1.2 1996/10/31 09:47:51 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 "postgres.h"
 
 /* ----------------
  *	pg_parg definition.  cpp turns this into
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 51c50b0000b609f0e3cd5049ee11f025fe90a41f..034fd26143448460ee107e53aa150efd18accba5 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.1 1996/08/28 01:57:09 scrappy Exp $
+ * $Id: pg_proc.h,v 1.2 1996/10/31 09:47:52 scrappy Exp $
  *
  * NOTES
  *    The script catalog/genbki.sh reads this file and generates .bki
@@ -28,7 +28,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 #include "nodes/pg_list.h"
 #include "tcop/dest.h"
 
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 3d0c4260ec51ff488bf014c4e2adc04eae713b31..04c5925596201d9656a5bf93a17a617c643918ed 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_rewrite.h,v 1.1 1996/08/28 01:57:11 scrappy Exp $
+ * $Id: pg_rewrite.h,v 1.2 1996/10/31 09:47:54 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 "postgres.h"
 
 /* ----------------
  *	pg_rewrite definition.  cpp turns this into
diff --git a/src/include/catalog/pg_server.h b/src/include/catalog/pg_server.h
index 1306ce070a644c3ea3d7b7f91056aaab6bc151cb..87d917903a796d080a446c31294061297b336e7e 100644
--- a/src/include/catalog/pg_server.h
+++ b/src/include/catalog/pg_server.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_server.h,v 1.1 1996/08/28 01:57:12 scrappy Exp $
+ * $Id: pg_server.h,v 1.2 1996/10/31 09:47:55 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 "postgres.h"
 
 /* ----------------
  *	pg_server definition.  cpp turns this into
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 65ca1d009ba4ed5c18a28d3ab64c0cdb0fc419a6..cc76e5d893ce75fac6eabc3d4cf6e7f0cd05cee6 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_statistic.h,v 1.1 1996/08/28 01:57:14 scrappy Exp $
+ * $Id: pg_statistic.h,v 1.2 1996/10/31 09:47:57 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 "postgres.h"
 
 /* ----------------
  *	pg_statistic definition.  cpp turns this into
diff --git a/src/include/catalog/pg_time.h b/src/include/catalog/pg_time.h
index 59729a2d965b5d76dc94b9e51faadd97ce5d552e..5b35d73f25b3ca39af8de406c3b7c47ead48a34e 100644
--- a/src/include/catalog/pg_time.h
+++ b/src/include/catalog/pg_time.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_time.h,v 1.1 1996/08/28 01:57:17 scrappy Exp $
+ * $Id: pg_time.h,v 1.2 1996/10/31 09:47:58 scrappy Exp $
  *
  * NOTES
  *    The structures and macros used by the transam/ code
@@ -26,7 +26,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 CATALOG(pg_time) BOOTSTRAP {
     Oid  	timefoo;
diff --git a/src/include/catalog/pg_user.h b/src/include/catalog/pg_user.h
index 468d91e52706d2d90d6b417b3ecfb667a8010c7c..15f26ba4dbf7a4c0134807a9262b06e8c8ce6142 100644
--- a/src/include/catalog/pg_user.h
+++ b/src/include/catalog/pg_user.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_user.h,v 1.1 1996/08/28 01:57:20 scrappy Exp $
+ * $Id: pg_user.h,v 1.2 1996/10/31 09:48:00 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 "postgres.h"
 
 /* ----------------
  *	pg_user definition.  cpp turns this into
diff --git a/src/include/catalog/pg_variable.h b/src/include/catalog/pg_variable.h
index db1b393bf99bb984a5b65980c315dbf314ba1537..d7b753357bb76db66c5f6c4d35f33374e4553605 100644
--- a/src/include/catalog/pg_variable.h
+++ b/src/include/catalog/pg_variable.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_variable.h,v 1.1 1996/08/28 01:57:21 scrappy Exp $
+ * $Id: pg_variable.h,v 1.2 1996/10/31 09:48:02 scrappy Exp $
  *
  * NOTES
  *    The structures and macros used by the transam/ code
@@ -26,7 +26,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "postgres.h"
 
 CATALOG(pg_variable) BOOTSTRAP {
     Oid  	varfoo;
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index 8b0df91dee9b1aa0b61a09dfa390ac2a7ccd9bab..154f9314231f1601df2f8a4dbb1c6a1c31852a96 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.1 1996/08/28 01:57:23 scrappy Exp $
+ * $Id: pg_version.h,v 1.2 1996/10/31 09:48:03 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 "postgres.h"
 #include "utils/nabstime.h"
 
 /* ----------------
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index 9821b3147cf39388e10dbf5e082b1e4d30860e14..1a1228b142d312bc2d8aa8a1689d6b235f60dee7 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: copy.h,v 1.1 1996/08/28 07:21:44 scrappy Exp $
+ * $Id: copy.h,v 1.2 1996/10/31 09:48:12 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef COPY_H
 #define	COPY_H
 
-#include "postgres.h"
 
 void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename,
 	    char *delim);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 85dd37c6d5c37cb0a29a715542726db906d9fec1..7b52bbde28d497e2fb9dc54d8982d1d8b6855e59 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: defrem.h,v 1.1 1996/08/28 07:21:46 scrappy Exp $
+ * $Id: defrem.h,v 1.2 1996/10/31 09:48:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	DEFREM_H
 #define DEFREM_H
 
-#include "postgres.h"
 #include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
 #include "nodes/parsenodes.h"
diff --git a/src/include/commands/version.h b/src/include/commands/version.h
index b4c76b100cb3d259a1dac96cb36f03315ce9c2ae..da7f2c44e1ae16dff638f08cc0a615890558e2f8 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.1 1996/08/28 07:21:53 scrappy Exp $
+ * $Id: version.h,v 1.2 1996/10/31 09:48:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VERSION_H
 #define VERSION_H
 
-#include "postgres.h"
 #include "nodes/pg_list.h"
 
 extern void DefineVersion(char *name, char *fromRelname, char *date);
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index e6875c1cd27fed765e2b99264968d63babb2d3ce..c849a06616c5b8692b33f0af1ecc1199b20572ae 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.1 1996/08/28 07:22:09 scrappy Exp $
+ * $Id: executor.h,v 1.2 1996/10/31 09:48:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "postgres.h"
 #include "nodes/pg_list.h"
 
 /* ----------------
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index 7d97ba32889e082b3b487a0496297d72cb131a45..4cc56c98744ebf33d23320883da0cca063341b79 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dllist.h,v 1.1 1996/08/28 07:22:36 scrappy Exp $
+ * $Id: dllist.h,v 1.2 1996/10/31 09:48:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,6 @@
 #ifndef DLLIST_H
 #define DLLIST_H
 
-#include "c.h"
 
 struct Dllist;
 struct Dlelem;
diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h
index 8f758b48c8909d127d10a4dd8735a7c0f9e6c624..de2868142a36bf35bbc456965f9c4015ed795337 100644
--- a/src/include/lib/fstack.h
+++ b/src/include/lib/fstack.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fstack.h,v 1.1 1996/08/28 07:22:37 scrappy Exp $
+ * $Id: fstack.h,v 1.2 1996/10/31 09:48:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #ifndef	FSTACK_H
 #define FSTACK_H
 
-#include "c.h"
 
 /*
  * FixedItem --
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index 524a11414ad60926ccf594dfb42a444f8a84a524..39863fcbcaeca8a8411f9663cec856f807b62c69 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: stringinfo.h,v 1.1 1996/08/28 07:22:41 scrappy Exp $
+ * $Id: stringinfo.h,v 1.2 1996/10/31 09:48:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef STRINGINFO_H
 #define STRINGINFO_H
 
-/*#include "c.h"		*/	/* for 'String' */
 
 /*-------------------------
  * StringInfoData holds information about a string.
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index 9042053b2014d89fad22771c4fe488186fb63a6d..d67d335643fa11b5f5419194aaeed12629d12e2d 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: auth.h,v 1.1 1996/08/28 07:22:50 scrappy Exp $
+ * $Id: auth.h,v 1.2 1996/10/31 09:48:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef AUTH_H
 #define	AUTH_H
 
-#include "c.h"
 #include "libpq/pqcomm.h"
 
 /*----------------------------------------------------------------
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index cba61f06af9c76ec38db713369dfe70de52bf211..41d4ee9ac22ce7927cf64c6bed6239ef586eb9f5 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.3 1996/10/23 07:41:47 scrappy Exp $
+ * $Id: pqcomm.h,v 1.4 1996/10/31 09:48:59 scrappy Exp $
  *
  * NOTES
  *    Some of this should move to libpq.h
@@ -25,7 +25,6 @@
 #include <netinet/in.h>
 #endif /* WIN32 */
 
-#include "postgres.h"
 
 /*
  * startup msg parameters: path length, argument string length
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index bb07cf557c37804efee04ae59f98f3834410e2d8..dc48786bb435c57bd6971405868c66ab8cade0f5 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.1 1996/08/28 07:23:03 scrappy Exp $
+ * $Id: pqsignal.h,v 1.2 1996/10/31 09:49:01 scrappy Exp $
  *
  * NOTES
  *    This shouldn't be in libpq, but the monitor and some other
@@ -19,7 +19,6 @@
 
 #include <signal.h>
 
-#include "c.h"
 
 typedef void (*pqsigfunc)(int);
 
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index d22b2ee0c95661ed44ca09849fca526e1f0cbbb1..6c6d48ae8c46dc292e880b89942e58e36b59c1a1 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.1 1996/08/28 01:57:37 scrappy Exp $
+ * $Id: nodes.h,v 1.2 1996/10/31 09:49:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODES_H
 #define	NODES_H
 
-#include "c.h"
 
 /*
  * The first field of every node is NodeTag. Each node created (with makeNode)
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 023d15bd41425bc550cb8518a26fc6bc3db7d138..4440ccc1dda58db27f8d523a4d12a33727bf0ded 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: params.h,v 1.1 1996/08/28 01:57:39 scrappy Exp $
+ * $Id: params.h,v 1.2 1996/10/31 09:49:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARAMS_H
 #define PARAMS_H
 
-#include "postgres.h"
 #include "access/attnum.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index cdbd5de127e97e332c1cff36c9e0ae7f59543a63..b431a45b79ab6987127fea64bb8670d1f95183a9 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.1 1996/08/28 01:57:44 scrappy Exp $
+ * $Id: plannodes.h,v 1.2 1996/10/31 09:49:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANNODES_H
 #define	PLANNODES_H
 
-#include "postgres.h"
 
 #include "nodes/nodes.h"
 #include "nodes/pg_list.h"
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 2961e1f7d9161c11a612be064b57f271b012a5ff..037d722c1a66d8b26124d28b0c2f2e5ea57de3c3 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.1 1996/08/28 01:57:49 scrappy Exp $
+ * $Id: relation.h,v 1.2 1996/10/31 09:49:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELATION_H
 #define RELATION_H
 
-#include "c.h"
 #include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
 #include "nodes/parsenodes.h"
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 3279985b164098c257c8fb3a9a39f92e39b4564b..36604e7896183038e408fac404d9e1491e6b1039 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.1 1996/08/28 07:23:20 scrappy Exp $
+ * $Id: plancat.h,v 1.2 1996/10/31 09:49:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANCAT_H
 #define PLANCAT_H
 
-#include "c.h"
 
 /*
  * transient data structure to hold return value of index_info. Note that
diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h
index e8d56cca4b4052778f06acd0312df29d2496b840..8fed6eb8b8cbb88bb942f4881080e1a26d088d8d 100644
--- a/src/include/parser/catalog_utils.h
+++ b/src/include/parser/catalog_utils.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog_utils.h,v 1.1 1996/08/28 07:23:51 scrappy Exp $
+ * $Id: catalog_utils.h,v 1.2 1996/10/31 09:49:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define	CATALOG_UTILS_H
 
 
-#include "postgres.h"
 
 #include "access/htup.h"
 #include "utils/rel.h"
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index 0098ca4529950947037c52f294172afa30240c9e..993d7f8257e25b5b56bfed277f7abcf226648e6f 100644
--- a/src/include/storage/block.h
+++ b/src/include/storage/block.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: block.h,v 1.1 1996/08/28 01:57:55 scrappy Exp $
+ * $Id: block.h,v 1.2 1996/10/31 09:49:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	BLOCK_H
 #define BLOCK_H
 
-#include "c.h"
-
 /*
  * BlockNumber:
  *
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index b5fce3993dd22cb47d2dfbe0d1f018789279a9b0..c01d6df82aa28c50c2a44481bf63e7b36268e198 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.1 1996/08/28 01:58:00 scrappy Exp $
+ * $Id: buf_internals.h,v 1.2 1996/10/31 09:49:42 scrappy Exp $
  *
  * NOTE
  *	If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -17,7 +17,6 @@
 #ifndef	BUFMGR_INTERNALS_H
 #define BUFMGR_INTERNALS_H
 
-#include "postgres.h"
 #include "storage/buf.h"
 #include "storage/ipc.h"
 #include "storage/shmem.h"
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index f065278e768fd6356ba34eb48fa19347d6ef21eb..37381c746a521d3769e0c4bde4e0c1e42a2fc13d 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.1 1996/08/28 01:58:04 scrappy Exp $
+ * $Id: fd.h,v 1.2 1996/10/31 09:49:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,6 @@
 #endif /* SEEK_SET */
 #endif /* WIN32 */
 
-#include "c.h"
 #include "storage/block.h"
 
 typedef char   *FileName;
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index e5baf1c2dbe08ba75327a2f3dffb08808fab4ad5..ea7d9a73b42866edf661c687da329f35e187162b 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.5 1996/10/31 05:57:40 momjian Exp $
+ * $Id: ipc.h,v 1.6 1996/10/31 09:49:48 scrappy Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -21,10 +21,6 @@
 #define _IPC_
 #endif
 
-#include <sys/types.h>
-
-#include "postgres.h"
-
 /*
  * Many architectures have support for user-level spinlocks (i.e., an
  * atomic test-and-set instruction).  However, we have only written
diff --git a/src/include/storage/item.h b/src/include/storage/item.h
index 1e07b8a6d3af5970b376cde8cb6d5937009fe1fa..c943fc33f004292a5f35851f381c68e4475f3df4 100644
--- a/src/include/storage/item.h
+++ b/src/include/storage/item.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: item.h,v 1.1 1996/08/28 01:58:06 scrappy Exp $
+ * $Id: item.h,v 1.2 1996/10/31 09:49:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ITEM_H
 #define ITEM_H
 
-#include "c.h"
-
 typedef Pointer	Item;
 
 #endif	/* ITEM_H */
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index 63599da8820efe3fad872140622fbda3881475b7..317ce0e08c2b54512efa583641dd0a65ea750e48 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itempos.h,v 1.1 1996/08/28 01:58:09 scrappy Exp $
+ * $Id: itempos.h,v 1.2 1996/10/31 09:49:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ITEMPOS_H
 #define ITEMPOS_H
 
-#include "c.h"
 #include "storage/buf.h"
 #include "storage/itemid.h"
 
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index dc9d3561c15ea5cb0ffd2b8152ad523fc189f0d2..d4642d9470af8019763f6deba8c0a0e84f691210 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -7,14 +7,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: large_object.h,v 1.1 1996/08/28 01:58:12 scrappy Exp $
+ * $Id: large_object.h,v 1.2 1996/10/31 09:49:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LARGE_OBJECT_H
 #define	LARGE_OBJECT_H
 
-#include "c.h"
 #include "utils/rel.h"
 #include "access/relscan.h"
 
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 87f7143a0b5b18af8e3aa1bf635c80bfda02c015..655ed7c93c51e5830b873796921ff1948111a371 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.1 1996/08/28 01:58:13 scrappy Exp $
+ * $Id: lmgr.h,v 1.2 1996/10/31 09:49:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LMGR_H
 #define LMGR_H
 
-#include "postgres.h"
 
 #include "storage/itemptr.h"
 #include "storage/lock.h"
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index c71aecd86983eac781e2e9e69906b5f26d07ed2b..e4af5d07c57fd8bc193f078725d00409e945e80c 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.1 1996/08/28 01:58:15 scrappy Exp $
+ * $Id: lock.h,v 1.2 1996/10/31 09:49:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LOCK_H_
 #define LOCK_H_
 
-#include "postgres.h"
 #include "storage/itemptr.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 76b38e2ca2987ace2136c29e6e847dee38faa617..759b30278a39568be4935825038e9de9f2b8e584 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.1 1996/08/28 01:58:18 scrappy Exp $
+ * $Id: off.h,v 1.2 1996/10/31 09:49:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	OFF_H
 #define OFF_H
 
-#include "c.h"
-#include "machine.h"		/* for BLCKSZ */
-#include "storage/itemid.h"
-
 /*
  * OffsetNumber:
  *
diff --git a/src/include/storage/page.h b/src/include/storage/page.h
index aee623f369717a7cba9f0c1ef3655f10bdd9a237..f2f6c1fcba55c2da102a06d0705dc660a4c5aca6 100644
--- a/src/include/storage/page.h
+++ b/src/include/storage/page.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: page.h,v 1.1 1996/08/28 01:58:20 scrappy Exp $
+ * $Id: page.h,v 1.2 1996/10/31 09:49:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PAGE_H
 #define PAGE_H
 
-#include "c.h"
-
 typedef Pointer	Page;
 
 /*
diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h
index 77145d042ce013430c808fadd17044bdcf283896..bf316304d309ca46e4d4893e92d480f5e6a21c7d 100644
--- a/src/include/storage/pagenum.h
+++ b/src/include/storage/pagenum.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pagenum.h,v 1.1 1996/08/28 01:58:21 scrappy Exp $
+ * $Id: pagenum.h,v 1.2 1996/10/31 09:50:00 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PAGENUM_H
 #define PAGENUM_H
 
-#include "c.h"
 #include "storage/page.h"
 
 typedef uint16	PageNumber;
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index e1a04fffd1299bd33587304d1f5b4d69e32ef669..b08faa481fdb8f5fdbdaa29dfb5739ec00cf7fef 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.1 1996/08/28 01:58:22 scrappy Exp $
+ * $Id: pos.h,v 1.2 1996/10/31 09:50:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	POS_H
 #define POS_H
 
-#include "c.h"
-
 /*
  * a 'position' used to be <pagenumber, offset> in postgres.  this has
  * been changed to just <offset> as the notion of having multiple pages
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 15d5335ae09080418c909fe6e4e3ed2e041552c7..3ae788248780a62cf1786856d4969606a1628482 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinval.h,v 1.1 1996/08/28 01:58:28 scrappy Exp $
+ * $Id: sinval.h,v 1.2 1996/10/31 09:50:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SINVAL_H
 #define SINVAL_H
 
-#include "c.h"
 #include "storage/spin.h"
 #include "storage/ipc.h"
 #include "storage/itemptr.h"
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index c51b355800f6e7828a2cfa0dd246647ab686f4ed..c8137d01a6c637e5d784b4f711799608ad5a4bd1 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.1 1996/08/28 01:58:29 scrappy Exp $
+ * $Id: sinvaladt.h,v 1.2 1996/10/31 09:50:07 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVALADT_H
 #define SINVALADT_H
 
-#include "postgres.h"	/* XXX */
-
 #include "storage/ipc.h"
 #include "storage/itemptr.h"
 #include "storage/sinval.h"
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index d954cedeccca0050857f44af881a5ec427b7402b..66ef255fdd56e89fe73977e85bdcddc63c8a6ee2 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.1 1996/08/28 01:58:40 scrappy Exp $
+ * $Id: acl.h,v 1.2 1996/10/31 09:51:05 scrappy Exp $
  *
  * NOTES
  *    For backward-compatability purposes we have to allow there
@@ -22,7 +22,6 @@
 #ifndef ACL_H
 #define ACL_H
 
-#include "postgres.h"
 #include "utils/array.h"
 #include "nodes/parsenodes.h" /* for ChangeACLStmt */
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 9695cd58391e8c44dfad0b6bf8da007a7f054852..d5a61cfaed22e7998389a25192e409a7805770b7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.1 1996/08/28 01:58:45 scrappy Exp $
+ * $Id: builtins.h,v 1.2 1996/10/31 09:51:07 scrappy Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -18,7 +18,6 @@
 #ifndef BUILTINS_H
 #define BUILTINS_H
 
-#include "postgres.h"
 
 #include "storage/itemptr.h"
 
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 317e35054352a132b984fbea8bc3de13f7aeb2aa..8b2f5f6901e7100671f00589aca8b796a26962c9 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.1 1996/08/28 01:58:46 scrappy Exp $
+ * $Id: catcache.h,v 1.2 1996/10/31 09:51:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 /* #define	CACHEDEBUG 	 turns DEBUG elogs on */
 
-#include "postgres.h"
     
 #include "access/skey.h"
 #include "access/htup.h"
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 1a0b2566167f05b7f43fe340ac536139eeec13ea..009141e9cba3f0b1c7e520a7895423e973e09f0d 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datum.h,v 1.1 1996/08/28 01:58:48 scrappy Exp $
+ * $Id: datum.h,v 1.2 1996/10/31 09:51:11 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	DATUM_H
 #define	DATUM_H
 
-#include "postgres.h"
 
 /*--------------------------------------------------------
  * SOME NOT VERY PORTABLE ROUTINES ???
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 8ed17d24092f6495175b297495e4acecffdabeb1..cbe4b546d0fdc1bfa220a22104b52c4ec55c35db 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.1 1996/08/28 01:58:53 scrappy Exp $
+ * $Id: exc.h,v 1.2 1996/10/31 09:51:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	EXC_H
 #define EXC_H
 
-#include "c.h"		/* for Exception, etc. */
 #include <setjmp.h>
 
 extern char *ExcFileName;
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index 50431e3fbf86874479346ee012072f640809ced3..9d2f69d137b1cb4bb0a5858249f59c4a57869711 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: excid.h,v 1.1 1996/08/28 01:58:55 scrappy Exp $
+ * $Id: excid.h,v 1.2 1996/10/31 09:51:15 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	EXCID_H
 #define EXCID_H
 
-#include "c.h"
 #include "utils/exc.h"	/* for Exception */
 
 extern Exception FailedAssertion;
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index 8fe5547b547bb1d45198e2b0624141adb8ea4e86..b710fc35892fdd5df389838c57444f0644eed875 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.1 1996/08/28 01:58:59 scrappy Exp $
+ * $Id: fmgrtab.h,v 1.2 1996/10/31 09:51:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FMGRTAB_H
 #define FMGRTAB_H
 
-#include "postgres.h"		/* for ObjectId */
 #include "fmgr.h"		/* genearated by Gen_fmgrtab.sh */
 
 typedef struct {
diff --git a/src/include/utils/geo-decls.h b/src/include/utils/geo-decls.h
index b4292c38f94b0e5061aa0104d17a0f1f8dbf82c8..5cf26925b69d9cce8dcd170431c2da65309aaa24 100644
--- a/src/include/utils/geo-decls.h
+++ b/src/include/utils/geo-decls.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geo-decls.h,v 1.1 1996/08/28 01:59:03 scrappy Exp $
+ * $Id: geo-decls.h,v 1.2 1996/10/31 09:51:18 scrappy Exp $
  *
  * NOTE
  *    These routines do *not* use the float types from adt/.
@@ -25,7 +25,6 @@
  *-------------------------------------------------------------------*/
 
 #include <math.h>
-#include "c.h"
 
 #define	EPSILON			1.0E-06
 
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 0818d1ba79368fef4ddb3f71d54bf6e66eace0e6..bdf221bc2d7cd9131d2a8aa0a6658aded1b416b7 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hsearch.h,v 1.1 1996/08/28 01:59:04 scrappy Exp $
+ * $Id: hsearch.h,v 1.2 1996/10/31 09:51:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HSEARCH_H
 #define HSEARCH_H
 
-#include "postgres.h"
 
 /*
  * Constants
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 7b5418e14ac96f4557d96a7d8116b086a27a29a5..ac74012a75c9a23bedbbd9e43f9b9428dd5a623c 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.1 1996/08/28 01:59:05 scrappy Exp $
+ * $Id: inval.h,v 1.2 1996/10/31 09:51:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	INVAL_H
 #define INVAL_H
 
-#include "postgres.h"
 #include "access/htup.h"
 #include "utils/rel.h"
 
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index d130f3dd2a25890ebac35b21bf7bd5f4a361eb0c..126a50cb0505603979c2da47fd39f7590c88dd55 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.1 1996/08/28 01:59:07 scrappy Exp $
+ * $Id: lselect.h,v 1.2 1996/10/31 09:51:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LSELECT_H
 #define	LSELECT_H
 
-#include "c.h"
 #include "access/htup.h"
 
 struct	leftist {
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index ca047cd4c4213c6c7f95215306dc07bc42716d93..1678c8d21feee2378eff4130cb212870cbd60c15 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.1 1996/08/28 01:59:09 scrappy Exp $
+ * $Id: mcxt.h,v 1.2 1996/10/31 09:51:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	MCXT_H
 #define MCXT_H
 
-#include "c.h"
 
 #include "nodes/memnodes.h"
 #include "nodes/nodes.h"
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 5582bd6b6891b1e226c4fdd52ecb2bfb8d36bb3a..bcac77fb1bca052f85a13f6365fd4ce2c7e6ad6e 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.1 1996/08/28 01:59:10 scrappy Exp $
+ * $Id: memutils.h,v 1.2 1996/10/31 09:51:27 scrappy Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -26,7 +26,6 @@
 #ifndef MEMUTILS_H
 #define MEMUTILS_H
 
-#include "c.h"
 
 #if 0
 /*****************************************************************************
@@ -97,7 +96,7 @@ s...)
  *	XXX functional interface should not change.
  *
  * Identification:
- *	$Header: /cvsroot/pgsql/src/include/utils/memutils.h,v 1.1 1996/08/28 01:59:10 scrappy Exp $
+ *	$Header: /cvsroot/pgsql/src/include/utils/memutils.h,v 1.2 1996/10/31 09:51:27 scrappy Exp $
  */
 
 typedef struct OrderedElemData OrderedElemData;
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index d3953e941a3d2a47d86ecef6de8477d543714d5c..03767ce8a8ebbf8ac69ba8fdd5e444ea1c815fc6 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.1 1996/08/28 01:59:16 scrappy Exp $
+ * $Id: palloc.h,v 1.2 1996/10/31 09:51:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PALLOC_H
 #define PALLOC_H
 
-#include "c.h"
-
 extern void*   palloc(Size size);
 extern void    pfree(void *pointer); 
 extern void *repalloc(void *pointer, Size size);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 4eb1ece56d7c4e88a8084e3ec0afee316dcc3737..6fc281fb01d759eb8ddb56dc8f6e81f989c0ec3b 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.1 1996/08/28 01:59:18 scrappy Exp $
+ * $Id: portal.h,v 1.2 1996/10/31 09:51:29 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #ifndef	PORTAL_H
 #define PORTAL_H
 
-#include "c.h"
 
 #include "nodes/execnodes.h"		/* for EState */
 #include "nodes/memnodes.h"
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 3ad124d7f64b28e349668d57f5cc68edfd1f8b24..b23269861be93ef253eedfa2745d034d235f0a99 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.1 1996/08/28 01:59:24 scrappy Exp $
+ * $Id: relcache.h,v 1.2 1996/10/31 09:51:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <sys/types.h>
 
-#include "postgres.h"
 #include "utils/rel.h"
 
 /*