remove:

	#include "postgres.h"
	#include "c.h"

31 files changed, 31 insertions, 62 deletions

diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h
index 2c4fd6d31e..26a740db08 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 8b52114c4a..fd3a3200b8 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 bfa9a012ce..aca3de4f80 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 fd3d052daf..6e52f4437d 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 e00d35c8a9..600d53c4ef 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 a6796dd2fa..76605d3bc9 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 eb4ba992d6..d46357b7b6 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 92f84b8edc..057d40b19f 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 1a85c730e8..554c4457a3 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 62dace1ca7..a0511ee362 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 b392cd25c1..b54a960b06 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 ddd8f42175..f192310f2c 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 7141dabd75..1ae6c6158c 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 39b89d113e..5357c7ebfa 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 b303801920..66c6f93391 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 a9c9878723..7242c8fc67 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 7e5b15d3b2..35e53d7dc1 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 77e5885bd0..64749d3e33 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 9d9659987b..7aa4240762 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 7cb8948945..83f53d73d1 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 5a88163b10..ca761c47b2 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 de9f68b2bf..8e8ea96c81 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 cb6f9253f1..7f1fec72f3 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 51c50b0000..034fd26143 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 3d0c4260ec..04c5925596 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 1306ce070a..87d917903a 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 65ca1d009b..cc76e5d893 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 59729a2d96..5b35d73f25 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 468d91e527..15f26ba4db 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 db1b393bf9..d7b753357b 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 8b0df91dee..154f931423 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"
 
 /* ----------------