diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 2289a18260..10456d97f0 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -39,7 +39,7 @@ Portability fixes for linux_ppc, Irix, linux_alpha, OpenBSD, alpha
 Remove QUERY_LIMIT, use SELECT...LIMIT
 Fix for EXPLAIN on inheritance(Tom)
 Patch to allow vacuum on multi-segment tables(Hiroshi)
-R=Tree optimizer selectivity fix(Tom)
+R-Tree optimizer selectivity fix(Tom)
 ACL file descriptor leak fix(Atsushi Ogawa)
 New expresssion subtree code(Tom)
 Avoid disk writes for read-only transactions(Vadim)
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 06321990a8..bf2499fa05 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -14,6 +14,7 @@
 #include <postgres.h>
 
 #include <fmgr.h>
+#include <catalog/pg_index.h>
 #include <access/genam.h>
 #include <access/gist.h>
 #include <access/gistscan.h>
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index fb52d42902..21321e8efc 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.18 1999/07/14 01:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.19 1999/07/15 15:18:33 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -30,7 +30,6 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <utils/mcxt.h>
 
 static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
 static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 73f6e350de..3d420f8d2f 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.16 1999/07/14 01:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.17 1999/07/15 15:18:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include <fmgr.h>
 #include <utils/memutils.h>
 #include <access/iqual.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 75303fd37f..6c5bfa3531 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.47 1999/07/14 01:19:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.48 1999/07/15 15:18:35 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -89,7 +89,6 @@
 #include <utils/inval.h>
 #include <utils/memutils.h>
 #include <utils/builtins.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index b17a71cdd9..222af071dd 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.16 1999/07/03 00:32:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.17 1999/07/15 15:18:35 momjian Exp $
  *
  * NOTES
  *	  initam should be moved someplace else.
@@ -21,7 +21,6 @@
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 293a32bfa8..59ebb29e2e 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.31 1999/07/14 01:19:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.32 1999/07/15 15:18:37 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -70,7 +70,6 @@
 #include <fmgr.h>
 #include <storage/lmgr.h>
 #include <access/heapam.h>
-#include <utils/mcxt.h>
 
 /* ----------------
  *	 undefine macros we aren't going to use that would otherwise
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 07a72e131e..d71cf12d4a 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.43 1999/07/14 01:19:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.44 1999/07/15 15:18:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,8 +19,9 @@
 #include <access/nbtree.h>
 #include <access/heapam.h>
 #include <access/xact.h>
+#include <storage/bufmgr.h>
+#include <access/transam.h>
 #include <fmgr.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 474b1593a8..436edadcf0 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.25 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.26 1999/07/15 15:18:39 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -28,7 +28,7 @@
 #include <access/nbtree.h>
 #include <miscadmin.h>
 #include <storage/lmgr.h>
-#include <utils/mcxt.h>
+#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 577c2a4eeb..eea869776d 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.24 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.25 1999/07/15 15:18:40 momjian Exp $
  *
  *
  * NOTES
@@ -30,8 +30,8 @@
 #include <postgres.h>
 
 #include <storage/bufpage.h>
+#include <storage/bufmgr.h>
 #include <access/nbtree.h>
-#include <utils/mcxt.h>
 
 typedef struct BTScanListData
 {
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 61dde4b9f0..17ac151acc 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.46 1999/07/14 01:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.47 1999/07/15 15:18:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,9 @@
 #include <access/genam.h>
 #include <fmgr.h>
 #include <storage/bufpage.h>
+#include <storage/bufmgr.h>
 #include <access/nbtree.h>
 #include <catalog/pg_proc.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 6927f7e3c6..30aca9e088 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.41 1999/07/14 01:19:42 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.42 1999/07/15 15:18:41 momjian Exp $
  *
  * NOTES
  *
@@ -53,8 +53,8 @@
 
 #include "access/nbtree.h"
 #include "storage/bufpage.h"
+#include "storage/bufmgr.h"
 #include "utils/memutils.h"
-#include "utils/mcxt.h"
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index c682462ddd..5368c090f9 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.28 1999/07/14 01:19:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.29 1999/07/15 15:18:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include "executor/execdebug.h"
 #include "fmgr.h"
 #include "storage/bufpage.h"
-#include "utils/mcxt.h"
 
 extern int	NIndexTupleProcessed;
 
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 1bfe10d325..7f2c4b9131 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.14 1999/07/14 01:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.15 1999/07/15 15:18:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <access/iqual.h>
 #include <access/rtree.h>
 #include <storage/bufpage.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index a685f692d0..36e971dc67 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.19 1999/07/14 01:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.20 1999/07/15 15:18:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include <utils/builtins.h>
 #include <utils/geo_decls.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 6c3dba0056..1e473ded8b 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.24 1999/07/14 01:19:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.25 1999/07/15 15:18:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <storage/bufpage.h>
 #include <access/rtree.h>
 #include <access/rtstrat.h>
-#include <utils/mcxt.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 03bb786f4b..5cbf8123e7 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.27 1999/06/10 14:17:06 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.28 1999/07/15 15:18:44 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -21,7 +21,6 @@
 #include <access/transam.h>
 #include <access/xact.h>
 #include <access/heapam.h>
-#include <utils/mcxt.h>
 #include <catalog/catname.h>
 #include <storage/spin.h>
 #include <commands/vacuum.h>
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index cd860e0450..add151c30e 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.42 1999/06/29 04:54:46 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.43 1999/07/15 15:18:45 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -150,7 +150,6 @@
 #include <access/transam.h>
 #include <storage/fd.h>
 #include <storage/proc.h>
-#include <utils/mcxt.h>
 #include <catalog/heap.h>
 #include <utils/relcache.h>
 #include <miscadmin.h>
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 58dfbecd22..017c042747 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: xid.c,v 1.23 1999/07/14 01:19:45 momjian Exp $
+ *	$Id: xid.c,v 1.24 1999/07/15 15:18:45 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -22,7 +22,6 @@
 
 #include <postgres.h>
 #include <access/xact.h>
-#include <utils/mcxt.h>
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 6c7e7c16fa..15c684f756 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.60 1999/05/25 16:07:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.61 1999/07/15 15:18:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@
 #include "utils/geo_decls.h"
 #include "utils/hsearch.h"
 #include "utils/lsyscache.h"
-#include "utils/mcxt.h"
 #include "utils/nabstime.h"
 #include "utils/portal.h"
 #include "utils/rel.h"
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 6e28f04759..e6486d336b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.89 1999/07/08 02:46:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.90 1999/07/15 15:18:48 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -57,7 +57,6 @@
 #include "tcop/tcopprot.h"
 #include "utils/catcache.h"
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 31747b2395..68abfc7b88 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.81 1999/07/07 09:27:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.82 1999/07/15 15:18:49 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -30,6 +30,7 @@
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
@@ -40,9 +41,9 @@
 #include "parser/parse_func.h"
 #include "storage/lmgr.h"
 #include "storage/smgr.h"
+#include "storage/bufpage.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
-#include "utils/mcxt.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 58c87302d0..a8ce33d7bc 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.37 1999/05/25 16:08:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.38 1999/07/15 15:18:50 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -19,8 +19,10 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
+#include "parser/parse_type.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "parser/parse_func.h"
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "parser/parse_oper.h"
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 3d31741cfe..9c79eec956 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.29 1999/05/25 16:08:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.30 1999/07/15 15:18:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,7 @@
 #include "utils/lsyscache.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
+#include "parser/parse_type.h"
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 29fb0d9a49..7eab1d213a 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.39 1999/05/25 16:08:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.40 1999/07/15 15:18:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,6 @@
 #include <commands/command.h>
 #include <utils/builtins.h>
 #include <utils/excid.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_class.h>
 #include <optimizer/internal.h>
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index ebd4fd0c29..0ff886ded5 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.47 1999/06/19 04:54:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.48 1999/07/15 15:18:52 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -36,7 +36,6 @@
 #include "utils/acl.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/temprel.h"
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 34d322524c..6760ca9f2d 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.29 1999/05/25 16:08:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.30 1999/07/15 15:18:53 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -50,9 +50,9 @@
 #include <fmgr.h>				/* for fmgr */
 #include <utils/builtins.h>		/* prototype for textin() */
 #include <commands/defrem.h>
-#include <optimizer/xfunc.h>
 #include <tcop/dest.h>
 #include <catalog/pg_shadow.h>
+#include <optimizer/cost.h>
 
 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 061534054a..f88d29b7a0 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.25 1999/05/25 16:08:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.26 1999/07/15 15:18:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,6 @@
 #include <commands/command.h>
 #include <storage/bufmgr.h>
 #include <utils/excid.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_class.h>
 #include <optimizer/internal.h>
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index cc3d27599c..a710888d7f 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -23,8 +23,8 @@
 #include "nodes/memnodes.h"
 #include "nodes/parsenodes.h"
 #include "storage/lmgr.h"
+#include "storage/bufpage.h"
 #include "storage/bufmgr.h"
-#include "utils/mcxt.h"
 #include "utils/inval.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index b5fa699981..e475fba1e2 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110 1999/07/03 00:32:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.111 1999/07/15 15:18:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,6 @@
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/inval.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index 38b830ea6a..dfe9fae775 100644
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -14,7 +14,7 @@
  *		ExecInitTee
  *		ExecEndTee
  *
- *	$Id: nodeTee.c,v 1.3 1999/05/25 22:41:04 momjian Exp $
+ *	$Id: nodeTee.c,v 1.4 1999/07/15 15:19:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,9 +23,7 @@
 #include <sys/file.h>
 #include "postgres.h"
 
-#include "utils/palloc.h"
 #include "utils/relcache.h"
-#include "utils/mcxt.h"
 #include "storage/bufmgr.h"
 #include "storage/smgr.h"
 #include "optimizer/internal.h"
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 8e5f012fd8..2facc9096b 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: execAmi.c,v 1.36 1999/07/13 21:17:31 momjian Exp $
+ *	$Id: execAmi.c,v 1.37 1999/07/15 15:18:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,6 @@
 
 #include "executor/executor.h"
 #include "storage/smgr.h"
-#include "utils/mcxt.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/nodeSort.h"
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index ba3741db02..bef6874861 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.17 1999/05/17 17:03:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.18 1999/07/15 15:18:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "postgres.h"
 
-#include "utils/palloc.h"
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "nodes/relation.h"
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index a3026fd30a..d6cd6b1f84 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.88 1999/06/17 15:15:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.89 1999/07/15 15:18:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeIndexscan.h"
 #include "utils/builtins.h"
-#include "utils/palloc.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
@@ -54,6 +53,7 @@
 #include "access/xact.h"
 #include "catalog/heap.h"
 #include "commands/trigger.h"
+#include "access/transam.h"
 
 void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
 			   Query *parseTree);
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 58acc885ba..b6af1fe683 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.53 1999/06/12 19:22:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.54 1999/07/15 15:18:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,6 @@
 #include "utils/builtins.h"
 #include "utils/fcache.h"
 #include "utils/fcache2.h"
-#include "utils/mcxt.h"
 #include "utils/memutils.h"
 
 
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 1ffe928b57..a41c4ff456 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.25 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.26 1999/07/15 15:18:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,6 @@
 #include "catalog/pg_type.h"
 #include "parser/parse_type.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/lsyscache.h"
 
 static TupleTableSlot *NodeGetResultTupleSlot(Plan *node);
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 2bd3d03bc6..0b7c220acc 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.45 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.46 1999/07/15 15:18:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,7 +55,7 @@
 #include "optimizer/clauses.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
-#include "utils/mcxt.h"
+#include "catalog/pg_index.h"
 
 static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
 					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index c32c14a596..00fc00182d 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.26 1999/05/25 16:08:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.27 1999/07/15 15:18:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,8 +28,6 @@
 #include "fmgr.h"
 #include "utils/fcache.h"
 #include "utils/datum.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
 #include "catalog/pg_language.h"
 #include "access/heapam.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index a47a9ad549..44a14391b4 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -27,7 +27,6 @@
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
 #include "optimizer/clauses.h"
 
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index c46b467caa..745269e071 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.19 1999/05/25 16:08:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeAppend.h"
 #include "executor/nodeIndexscan.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "parser/parsetree.h"	/* for rt_store() macro */
 
 static bool exec_append_initialize_next(Append *node);
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 461bc1b8a5..57f2bb9d4d 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.36 1999/05/25 16:08:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.37 1999/07/15 15:19:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,8 +40,6 @@
 #include "access/skey.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "catalog/index.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 1ca99c1bef..3f118e90cf 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.19 1999/06/03 03:17:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
 #include "access/heapam.h"
-#include "utils/palloc.h"
 #include "utils/psort.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index 995dd5237a..fec4f25ecb 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: stringinfo.c,v 1.18 1999/07/14 01:19:46 momjian Exp $
+ *	  $Id: stringinfo.c,v 1.19 1999/07/15 15:19:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "postgres.h"
 #include "lib/stringinfo.h"
-#include "utils/mcxt.h"
 
 #ifdef NOT_USED
 /*
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 2a0a6a04a0..9b232e705d 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: be-dumpdata.c,v 1.25 1999/05/25 22:41:06 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.26 1999/07/15 15:19:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +38,6 @@
 #include <storage/buf.h>
 #include <utils/memutils.h>
 #include <fmgr.h>
-#include <utils/mcxt.h>
 #include <utils/exc.h>
 #include <utils/syscache.h>
 #include <catalog/pg_type.h>
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 443c2db76d..871a7923a3 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.35 1999/06/04 21:13:38 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.36 1999/07/15 15:19:04 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -43,7 +43,6 @@
 #include <nodes/nodes.h>
 #include <utils/memutils.h>
 #include <lib/fstack.h>
-#include <utils/mcxt.h>
 #include <catalog/pg_shadow.h>	/* for superuser() */
 #include <storage/fd.h>			/* for O_ */
 #include <storage/large_object.h>
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 2fad684400..86f5ef2a99 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,7 +9,7 @@
  * Dec 17, 1997 - Todd A. Brandys
  *	Orignal Version Completed.
  *
- * $Id: crypt.c,v 1.19 1999/07/14 01:19:47 momjian Exp $
+ * $Id: crypt.c,v 1.20 1999/07/15 15:19:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "utils/nabstime.h"
 #include "storage/fd.h"
 #include "libpq/crypt.h"
-#include "utils/mcxt.h"
 
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index ab9b21392f..0f0ad4df29 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.82 1999/05/25 22:41:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.83 1999/07/15 15:19:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,6 @@
 
 #include "utils/syscache.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "catalog/pg_type.h"
 #include "storage/lmgr.h"
 #include "optimizer/planmain.h"
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 6a680190b2..6062857937 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.39 1999/06/06 17:46:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.40 1999/07/15 15:19:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,6 @@
 
 #include "utils/builtins.h"		/* for namestrcmp() */
 #include "utils/datum.h"
-#include "utils/elog.h"
 #include "storage/itemptr.h"
 
 static bool equali(List *a, List *b);
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 0fa1906c96..4711d9b6fe 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.19 1999/05/26 12:55:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.20 1999/07/15 15:19:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,6 @@
 
 #include "utils/syscache.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "catalog/pg_type.h"
 #include "storage/lmgr.h"
 #include "optimizer/planmain.h"
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 256e041966..e58149d111 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.22 1999/07/14 01:19:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.23 1999/07/15 15:19:07 momjian Exp $
  *
  * NOTES
  *	  XXX a few of the following functions are duplicated to handle
@@ -26,9 +26,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"		/* for namecpy */
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 /*
  *	makeList
diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c
index 38220edd5d..c8c335df12 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.8 1999/07/14 01:19:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.9 1999/07/15 15:19:08 momjian Exp $
  *
  * HISTORY
  *	  Andrew Yu			Oct 20, 1994	file creation
@@ -17,10 +17,7 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "nodes/nodes.h"
-#include "utils/mcxt.h"
 
 /*
  * newNode -
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 1fdc83ecce..f73811431e 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: outfuncs.c,v 1.86 1999/05/25 22:41:14 momjian Exp $
+ *	$Id: outfuncs.c,v 1.87 1999/07/15 15:19:08 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -27,9 +27,7 @@
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/datum.h"
-#include "utils/palloc.h"
 
 #include "nodes/nodes.h"
 #include "nodes/execnodes.h"
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index 3c2f1a3bd9..6da19489d0 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.15 1999/05/19 16:46:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.16 1999/07/15 15:19:08 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -22,7 +22,6 @@
 #include "postgres.h"
 #include "nodes/pg_list.h"
 #include "nodes/readfuncs.h"
-#include "utils/elog.h"
 
 /*
  * stringToNode -
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 09d2d1cdbf..de226c0118 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.65 1999/07/13 21:17:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.66 1999/07/15 15:19:08 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -32,8 +32,6 @@
 #include "access/htup.h"
 #include "fmgr.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 8c9240b717..721671e702 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.c,v 1.5 1999/02/13 23:16:04 momjian Exp $
+ * $Id: geqo_copy.c,v 1.6 1999/07/15 15:19:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,10 +37,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-#include "utils/palloc.h"
-#include "utils/elog.h"
-
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 92fca945e8..cf0c1027ed 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -6,7 +6,7 @@
 *	 CX operator according to Oliver et al
 *	 (Proc 2nd Int'l Conf on GA's)
 *
-* $Id: geqo_cx.c,v 1.6 1999/02/13 23:16:05 momjian Exp $
+* $Id: geqo_cx.c,v 1.7 1999/07/15 15:19:10 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -40,8 +40,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index a5ab77202b..c58556f739 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -3,7 +3,7 @@
 * geqo_erx.c
 *	 edge recombination crossover [ER]
 *
-* $Id: geqo_erx.c,v 1.12 1999/07/14 01:19:51 momjian Exp $
+* $Id: geqo_erx.c,v 1.13 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -37,8 +37,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@@ -51,7 +49,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
-#include "utils/mcxt.h"
 
 static int	gimme_edge(Gene gene1, Gene gene2, Edge *edge_table);
 static void remove_gene(Gene gene, Edge edge, Edge *edge_table);
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index e572c65687..a3652e2d0b 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_eval.c,v 1.39 1999/05/25 22:41:19 momjian Exp $
+ * $Id: geqo_eval.c,v 1.40 1999/07/15 15:19:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,8 +34,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "utils/portal.h"
 
 #include "optimizer/internal.h"
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index 88bcce1ed7..2b821b168d 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_main.c,v 1.16 1999/05/25 16:09:16 momjian Exp $
+ * $Id: geqo_main.c,v 1.17 1999/07/15 15:19:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,8 +28,6 @@
 #include "nodes/plannodes.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 206ec2567d..5c4079b12d 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.c,v 1.19 1999/05/25 22:41:20 momjian Exp $
+ * $Id: geqo_misc.c,v 1.20 1999/07/15 15:19:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,8 +27,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index a68b416bd4..bb007a259d 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -4,7 +4,7 @@
 *
 *	 TSP mutation routines
 *
-* $Id: geqo_mutation.c,v 1.5 1999/02/13 23:16:09 momjian Exp $
+* $Id: geqo_mutation.c,v 1.6 1999/07/15 15:19:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -37,8 +37,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 12b9b0d9b3..955379c270 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -6,7 +6,7 @@
 *	 OX1 operator according to Davis
 *	 (Proc Int'l Joint Conf on AI)
 *
-* $Id: geqo_ox1.c,v 1.5 1999/02/13 23:16:10 momjian Exp $
+* $Id: geqo_ox1.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index c98e5f8c23..ef3b03649d 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -6,7 +6,7 @@
 *	 OX2 operator according to Syswerda
 *	 (The Genetic Algorithms Handbook, ed L Davis)
 *
-* $Id: geqo_ox2.c,v 1.5 1999/02/13 23:16:10 momjian Exp $
+* $Id: geqo_ox2.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 76cbc45f07..e9bb76a1f9 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
-* $Id: geqo_params.c,v 1.18 1999/07/14 01:19:51 momjian Exp $
+* $Id: geqo_params.c,v 1.19 1999/07/15 15:19:13 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -31,8 +31,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@@ -45,7 +43,6 @@
 
 #include "storage/fd.h"
 
-#include "utils/mcxt.h"
 
 /*
  * Parameter values read from the config file (or defaulted) are stored here
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index 692ba09eab..330732b814 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -6,7 +6,7 @@
 *	 PMX operator according to Goldberg & Lingle
 *	 (Proc Int'l Conf on GA's)
 *
-* $Id: geqo_pmx.c,v 1.6 1999/07/14 01:19:52 momjian Exp $
+* $Id: geqo_pmx.c,v 1.7 1999/07/15 15:19:13 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@@ -53,7 +51,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
-#include "utils/mcxt.h"
 
 /* pmx
  *
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 3a1b1030f6..79e237dc88 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.c,v 1.13 1999/07/14 01:19:52 momjian Exp $
+ * $Id: geqo_pool.c,v 1.14 1999/07/15 15:19:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,8 +26,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@@ -41,7 +39,6 @@
 #include "optimizer/geqo_copy.h"
 #include "optimizer/geqo_recombination.h"
 
-#include "utils/mcxt.h"
 
 static int	compare(const void *arg1, const void *arg2);
 
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index beaa2cfb57..983c01cfcc 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -6,7 +6,7 @@
 *	 PX operator according to Syswerda
 *	 (The Genetic Algorithms Handbook, L Davis, ed)
 *
-* $Id: geqo_px.c,v 1.6 1999/02/13 23:16:12 momjian Exp $
+* $Id: geqo_px.c,v 1.7 1999/07/15 15:19:14 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,8 +39,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index 7afa5e41f3..f01b59a899 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -3,7 +3,7 @@
 * geqo_recombination.c
 *	 misc recombination procedures
 *
-* $Id: geqo_recombination.c,v 1.8 1999/07/14 01:19:53 momjian Exp $
+* $Id: geqo_recombination.c,v 1.9 1999/07/15 15:19:15 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -24,8 +24,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
@@ -38,7 +36,6 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
-#include "utils/mcxt.h"
 
 /*
  * init_tour
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index b42e4450f2..8c5301f10b 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.c,v 1.7 1999/02/13 23:16:13 momjian Exp $
+ * $Id: geqo_selection.c,v 1.8 1999/07/15 15:19:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,8 +41,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index 255602bcfa..9da3bdc5e9 100644
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
-*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.12 1999/05/25 22:41:22 momjian Exp $
+*	 $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.13 1999/07/15 15:19:15 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -20,7 +20,6 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-#include "utils/palloc.h"
 
 #include "optimizer/cost.h"
 
diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index 9c57e16536..c47df87102 100644
--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.4 1999/05/25 22:41:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.5 1999/07/15 15:19:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,9 +39,6 @@
 #include "nodes/nodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/internal.h"
 #include "optimizer/cost.h"
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index d77f9d2f10..2921372d6c 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.5 1999/07/03 00:32:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.6 1999/07/15 15:19:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,6 @@
 #include "optimizer/keys.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/tlist.h"	/* for get_expr */
-#include "optimizer/xfunc.h"
 #include "storage/buf_internals.h"		/* for NBuffers */
 #include "tcop/dest.h"
 #include "utils/syscache.h"
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index d9b65c72fb..15c94a112f 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46 1999/05/25 22:41:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.47 1999/07/15 15:19:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/clauses.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"
 
 #include "commands/creatinh.h"
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index e1870912bf..b5666ffb7d 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.57 1999/06/19 04:54:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.58 1999/07/15 15:19:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/xfunc.h"
 #include "parser/parsetree.h"	/* for getrelid() */
 #include "parser/parse_expr.h"	/* for exprType() */
 #include "parser/parse_oper.h"	/* for oprid() and oper() */
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 0b9dd397d7..bbcb9e99da 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25 1999/05/25 22:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.26 1999/07/15 15:19:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/cost.h"
 #include "optimizer/plancat.h"
-#include "optimizer/xfunc.h"
 
 #include "parser/parsetree.h"
 
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index ba8880daa2..f004bb0c90 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39 1999/05/25 22:41:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.40 1999/07/15 15:19:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
 
-#include "utils/elog.h"
 
 
 static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index cc08b17bb2..17ab7e85c5 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.57 1999/05/25 22:41:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.58 1999/07/15 15:19:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,6 @@
 #include "nodes/makefuncs.h"
 
 #include "utils/lsyscache.h"
-#include "utils/palloc.h"
 #include "utils/builtins.h"
 
 #include "optimizer/restrictinfo.h"
@@ -37,7 +36,6 @@
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/planner.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/internal.h"
 
 
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 059f52e5bf..947ec23da6 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.31 1999/05/25 22:41:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.32 1999/07/15 15:19:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include "catalog/pg_type.h"
 
 #include "utils/lsyscache.h"
-#include "utils/palloc.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/planmain.h"
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 80eaaf9a05..924cb35062 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.37 1999/06/12 19:38:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.38 1999/07/15 15:19:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,14 +31,10 @@
 #include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"
 
 #include "tcop/dest.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "nodes/memnodes.h"
-#include "utils/mcxt.h"
 #include "utils/lsyscache.h"
 
 static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 5165bf428b..ac145b5e17 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.57 1999/06/21 01:20:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.58 1999/07/15 15:19:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "catalog/pg_type.h"
 #include "parser/parse_expr.h"
 
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 #include "access/heapam.h"
 
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 0ba84d3ba9..9d11dc4908 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.50 1999/06/06 17:38:10 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.51 1999/07/15 15:19:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
 
-#include "utils/elog.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/makefuncs.h"
 
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index c2ed4e0df1..7c132ec447 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.22 1999/05/29 01:48:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.23 1999/07/15 15:19:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "utils/palloc.h"
 #include "parser/parse_type.h"
 
 #include "parser/parsetree.h"	/* for getrelid() */
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 9ae2fb57a8..fae22f3262 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.33 1999/06/10 06:55:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.34 1999/07/15 15:19:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include "parser/parsetree.h"
 #include "parser/parse_clause.h"
 
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 
 #include "optimizer/internal.h"
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 88236173a5..34d73bad80 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.21 1999/05/25 22:41:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.22 1999/07/15 15:19:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include "nodes/pg_list.h"
 #include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/keys.h"
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 2cc98e7a87..3712db3d71 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.42 1999/05/25 22:41:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.43 1999/07/15 15:19:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 #include "postgres.h"
 
 #include "nodes/relation.h"
-#include "utils/elog.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/pathnode.h"
@@ -24,7 +23,6 @@
 #include "optimizer/plancat.h"
 #include "optimizer/cost.h"
 #include "optimizer/keys.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/ordering.h"
 
 #include "parser/parsetree.h"	/* for getrelid() */
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 8a331a9905..a133e7a552 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.33 1999/05/25 22:41:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.34 1999/07/15 15:19:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include "nodes/primnodes.h"
 #include "nodes/pg_list.h"
 #include "nodes/nodeFuncs.h"
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 
 #include "optimizer/internal.h"
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index e21af3abf3..59ae795f3a 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: analyze.c,v 1.111 1999/07/13 21:17:32 momjian Exp $
+ *	$Id: analyze.c,v 1.112 1999/07/15 15:19:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,6 @@
 #include "parse.h"
 
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 
 static Query *transformStmt(ParseState *pstate, Node *stmt);
 static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 2619731075..b649f9e781 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.89 1999/07/13 21:17:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.90 1999/07/15 15:19:30 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -42,14 +42,13 @@
 #include "parser/gramparse.h"
 #include "parser/parse_type.h"
 #include "utils/acl.h"
-#include "utils/palloc.h"
 #include "catalog/catname.h"
-#include "utils/elog.h"
 #include "access/xact.h"
 #include "storage/lmgr.h"
 #include "utils/numeric.h"
 #include "parser/analyze.h"
 #include "catalog/pg_type.h"
+#include "storage/bufpage.h"
 
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index fd99a9613c..22b21f7056 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.58 1999/07/13 21:17:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.59 1999/07/15 15:19:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include "nodes/pg_list.h"
 #include "parse.h"
 #include "parser/keywords.h"
-#include "utils/elog.h"
 
 /*
  * List of (keyword-name, keyword-token-value) pairs.
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index c91c9e9afb..a2bf9f080a 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.37 1999/05/26 12:55:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.38 1999/07/15 15:19:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 #include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
 #include "nodes/print.h"
-
+#include "nodes/relation.h"
 #include "parse.h"
 
 
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 9f41d00b9e..f1db135955 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.25 1999/05/25 16:10:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.26 1999/07/15 15:19:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,7 @@
 #include "parser/parse_coerce.h"
 #include "storage/bufmgr.h"
 #include "utils/syscache.h"
+#include "parser/parse_func.h"
 
 static Oid *oper_select_candidate(int nargs, Oid *input_typeids,
 					  CandidateList candidates);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 3101f7ac7a..323334dddc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.22 1999/05/25 16:10:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.23 1999/07/15 15:19:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "parser/parse_type.h"
 
 static void checkTargetTypes(ParseState *pstate, char *target_colname,
 				 char *refname, char *colname);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index f32aee93f8..d2357a9260 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.13 1999/05/25 16:10:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.14 1999/07/15 15:19:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include "postgres.h"
 #include "miscadmin.h"
 #include "parser/scansup.h"
-#include "utils/elog.h"
 
 /* ----------------
  *		scanstr
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index fd1fbd73b8..88e8c0e0f8 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -19,7 +19,6 @@
 #include <dld.h>
 #include "postgres.h"
 #include "dynloader.h"
-#include "utils/elog.h"
 #include "fmgr.h"
 
 extern char *pg_pathname;
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 1ab5ff1afb..2d81ce9025 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.11 1999/02/21 03:49:13 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.12 1999/07/15 15:19:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include <dld.h>
 #endif
 #include "dynloader.h"
-#include "utils/elog.h"
 #include "fmgr.h"
 
 #ifdef NOT_USED
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 96f2f20083..b21f9904bb 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.5 1999/02/13 23:17:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.6 1999/07/15 15:19:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "port-protos.h"
-#include "utils/elog.h"
 
 extern char *pg_pathname;
 
diff --git a/src/backend/port/random.c b/src/backend/port/random.c
index 84b8293691..a14dee96ca 100644
--- a/src/backend/port/random.c
+++ b/src/backend/port/random.c
@@ -1,12 +1,9 @@
-/* $Id: random.c,v 1.6 1999/02/07 22:07:02 tgl Exp $ */
+/* $Id: random.c,v 1.7 1999/07/15 15:19:33 momjian Exp $ */
 
 #include <stdlib.h>
 #include <math.h>				/* for pow() prototype */
 #include <errno.h>
 
-#include "config.h"
-#include "rusagestub.h"
-
 long
 random()
 {
diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c
index ed7cf4b7be..b1034f0279 100644
--- a/src/backend/port/srandom.c
+++ b/src/backend/port/srandom.c
@@ -1,12 +1,9 @@
-/* $Id: srandom.c,v 1.6 1999/02/07 22:07:02 tgl Exp $ */
+/* $Id: srandom.c,v 1.7 1999/07/15 15:19:34 momjian Exp $ */
 
 #include <stdlib.h>
 #include <math.h>				/* for pow() prototype */
 #include <errno.h>
 
-#include "config.h"
-#include "rusagestub.h"
-
 void
 srandom(unsigned int seed)
 {
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 4279963580..913768b2d1 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.108 1999/07/07 17:17:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.109 1999/07/15 15:19:38 momjian Exp $
  *
  * NOTES
  *
@@ -89,9 +89,7 @@
 #include "tcop/tcopprot.h"
 #include "commands/async.h"
 #include "nodes/nodes.h"
-#include "utils/mcxt.h"
 #include "storage/proc.h"
-#include "utils/elog.h"
 #ifndef HAVE_GETHOSTNAME
 #include "port-protos.h"		/* For gethostname() */
 #endif
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index c73cdd8784..609810ba5c 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,12 +6,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.17 1999/02/13 23:17:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.18 1999/07/15 15:19:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"			/* for oid defs */
-#include "utils/elog.h"			/* for elog */
 #include "nodes/pg_list.h"		/* lisp support package */
 #include "nodes/parsenodes.h"
 #include "nodes/primnodes.h"	/* Var node def */
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index cd0dd59c7f..27eef692d5 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.30 1999/07/04 05:16:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.31 1999/07/15 15:19:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include "access/heapam.h"		/* access methods like amopenr */
 #include "catalog/pg_rewrite.h"
 #include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"		/* for Lisp support */
+#include "nodes/pg_list.h"
 #include "parser/parse_relation.h"
 #include "rewrite/locks.h"
 #include "rewrite/rewriteDefine.h"
@@ -28,9 +28,9 @@
 #include "rewrite/rewriteSupport.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#include "utils/lsyscache.h"	/* for get_typlen */
-#include "utils/rel.h"			/* for Relation stuff */
-
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+#include "storage/bufpage.h"
 
 Oid			LastOidProcessed = InvalidOid;
 
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 4c525f4f9c..eafed074ad 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,20 +6,18 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.49 1999/07/13 21:17:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.50 1999/07/15 15:19:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 #include "miscadmin.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "utils/rel.h"
 #include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-
+#include "parser/parse_type.h"
 #include "parser/parsetree.h"	/* for parsetree manipulation */
 #include "parser/parse_relation.h"
 #include "nodes/parsenodes.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 50f1d8ec7f..feee3055c3 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,14 +6,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.33 1999/07/13 21:17:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.34 1999/07/15 15:19:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 #include "nodes/pg_list.h"
-#include "utils/elog.h"
 #include "nodes/nodes.h"
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 79ad5afed7..305d2e49ac 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.32 1999/02/13 23:17:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.33 1999/07/15 15:19:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include "storage/bufmgr.h"
 #include "utils/builtins.h"		/* for textout */
 #include "utils/catcache.h"		/* for CacheContext */
-#include "utils/mcxt.h"			/* MemoryContext stuff */
 #include "utils/rel.h"			/* for Relation, RelationData ... */
 #include "utils/syscache.h"		/* for SearchSysCache */
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index e81b2dfb96..fa3914b61c 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.56 1999/06/29 04:54:47 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.57 1999/07/15 15:19:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
-#include "utils/palloc.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "executor/execdebug.h" /* for NDirectFileRead */
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index f39f55918f..ca2e754ca4 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Id: fd.c,v 1.44 1999/07/14 01:19:53 momjian Exp $
+ *	  $Id: fd.c,v 1.45 1999/07/15 15:19:47 momjian Exp $
  *
  * NOTES:
  *
@@ -49,10 +49,7 @@
 
 #include "postgres.h"
 #include "miscadmin.h"			/* for DataDir */
-#include "utils/palloc.h"
 #include "storage/fd.h"
-#include "utils/elog.h"
-#include "utils/mcxt.h"
 
 /*
  * Problem: Postgres does a system(ld...) to do dynamic loading.
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index e317c0e1ad..8213a84c14 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.42 1999/06/06 20:19:35 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.43 1999/07/15 15:19:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,6 +69,7 @@
 #include "utils/memutils.h"
 #include "access/xact.h"
 #include "utils/tqual.h"
+#include "access/transam.h"
 
 /* shared memory global variables */
 
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 2ebda765a8..8a47ecaa42 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.20 1999/05/28 17:03:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.21 1999/07/15 15:19:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 #include "utils/trace.h"
 
 /* ----------------
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 58ee47fe61..2dce65a108 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.27 1999/06/10 14:17:11 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.28 1999/07/15 15:19:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,8 +35,6 @@
 #include "storage/multilev.h"
 #include "storage/lmgr.h"
 
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 
 #include "catalog/catname.h"
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 2349e956a8..ba44c44de0 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.55 1999/05/29 06:14:42 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.56 1999/07/15 15:19:52 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -44,7 +44,6 @@
 #include "storage/lock.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 #include "access/xact.h"
 #include "access/transam.h"
 #include "utils/trace.h"
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 204c06302d..d33bd8c437 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.23 1999/07/03 00:32:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.24 1999/07/15 15:19:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "storage/item.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/memutils.h"
 #include "storage/bufpage.h"
 
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index b5d7b86c21..d94c0ef3f4 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.46 1999/06/18 16:47:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.47 1999/07/15 15:19:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "storage/block.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"		/* where the declarations go */
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 
 #undef DIAGNOSTIC
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index f97a054130..5ed9e4965b 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.25 1999/07/14 01:19:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #include "storage/block.h"
 #include "storage/smgr.h"
 #include "utils/rel.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 static void smgrshutdown(int dummy);
 
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index aa5eb72945..496346462c 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.12 1999/07/14 01:19:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,7 @@
 #include "postgres.h"
 
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/palloc.h"
 #include "storage/smgr.h"
-#include "utils/mcxt.h"
 
 typedef struct smgrid
 {
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index f9e96a2f27..967237bec2 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.31 1999/05/25 22:42:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.32 1999/07/15 15:19:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,14 +42,12 @@
 #include "libpq/pqformat.h"
 #include "access/printtup.h"
 #include "utils/portal.h"
-#include "utils/palloc.h"
 
 #include "executor/executor.h"
 
 #include "tcop/dest.h"
 
 #include "catalog/pg_type.h"
-#include "utils/mcxt.h"
 
 #include "commands/async.h"
 
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 23f2bd7a27..05b4ef9054 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.24 1999/05/10 00:45:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.25 1999/07/15 15:19:59 momjian Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -63,7 +63,6 @@
 
 #include "tcop/tcopdebug.h"
 
-#include "utils/palloc.h"
 #include "fmgr.h"
 #include "utils/builtins.h"		/* for oideq */
 #include "tcop/fastpath.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 74c407ecd8..a17f0ebd43 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.119 1999/07/02 18:09:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.120 1999/07/15 15:19:59 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -69,7 +69,6 @@
 #include "tcop/tcopdebug.h"
 #include "tcop/tcopprot.h"		/* where declarations for this file go */
 #include "tcop/utility.h"
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
@@ -80,10 +79,6 @@
 #include "nodes/relation.h"
 #endif
 
-#ifdef NOT_USED
-#include "optimizer/xfunc.h"
-#endif
-
 #ifdef NOT_USED
 #include "nodes/plannodes.h"
 #endif
@@ -1525,7 +1520,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.119 $ $Date: 1999/07/02 18:09:27 $\n");
+		puts("$Revision: 1.120 $ $Date: 1999/07/15 15:19:59 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 83c400188f..e73de6d9bd 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.23 1999/05/25 16:11:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.24 1999/07/15 15:20:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,7 @@
 
 #include "tcop/tcopdebug.h"
 
-#include "utils/palloc.h"
 #include "nodes/nodes.h"
-#include "utils/mcxt.h"
 #include "miscadmin.h"
 #include "utils/portal.h"
 
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 38099254bf..970e47db3b 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.61 1999/05/25 16:11:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.62 1999/07/15 15:20:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,6 @@
 #include "../backend/parser/parse.h"
 #include "utils/builtins.h"
 #include "utils/acl.h"
-#include "utils/palloc.h"
 #include "rewrite/rewriteRemove.h"
 #include "rewrite/rewriteDefine.h"
 #include "tcop/tcopdebug.h"
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index b5faa82cb2..515d488e9f 100644
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tgRecipe.h,v 1.11 1999/05/25 22:42:09 momjian Exp $
+ * $Id: tgRecipe.h,v 1.12 1999/07/15 15:20:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include "libpq/libpq.h"
 #ifndef TIOGA_FRONTEND
 #include "libpq/libpq-be.h"
-#include "utils/elog.h"
 #include "utils/geo-decls.h"
 #else
 #include "libpq-fe.h"
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index b0e59e3ff0..0d97bb0a1c 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43 1999/05/25 16:11:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.44 1999/07/15 15:20:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@
 #include "storage/fd.h"
 #include "fmgr.h"
 #include "utils/array.h"
-#include "utils/elog.h"
 
 #include "libpq/libpq-fs.h"
 #include "libpq/be-fsstubs.h"
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index a0fe502895..4514a3bcc5 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.7 1999/02/13 23:19:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.8 1999/07/15 15:20:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,6 @@
 
 #include "postgres.h"
 
-#include "utils/array.h"
-
 int
 GetOffset(int n, int *dim, int *lb, int *indx)
 {
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index d0ac12f4f2..a05ababecb 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.17 1999/07/14 01:19:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.18 1999/07/15 15:20:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,6 @@
 #include "postgres.h"
 
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index dd363ee083..6cfa052055 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,7 +9,7 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.29 1999/07/14 01:19:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.30 1999/07/15 15:20:11 momjian Exp $
  */
 
 #include <stdio.h>
@@ -22,7 +22,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/cash.h"
-#include "utils/mcxt.h"
 
 static const char *num_word(Cash value);
 
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 9eaa721b49..97f0c22f2a 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -8,16 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.23 1999/07/14 01:19:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.24 1999/07/15 15:20:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>				/* for sprintf() */
 #include <string.h>
 #include "postgres.h"
-#include "utils/palloc.h"
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/mcxt.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index b4a2519831..c3feaa5063 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.33 1999/07/14 01:19:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.34 1999/07/15 15:20:13 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -40,9 +40,7 @@
 #endif
 #include "access/xact.h"
 #include "utils/builtins.h"		/* where function declarations go */
-#include "utils/palloc.h"
 #include "utils/dt.h"
-#include "utils/mcxt.h"
 
 #define INVALID_RELTIME_STR		"Undefined RelTime"
 #define INVALID_RELTIME_STR_LEN (sizeof(INVALID_RELTIME_STR)-1)
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 5962460280..0c87ce5a64 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.34 1999/07/14 01:19:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.35 1999/07/15 15:20:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "utils/nabstime.h"
 #include "utils/datetime.h"
 #include "access/xact.h"
-#include "utils/mcxt.h"
 
 static int	date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index bfdd61271a..1c774616d5 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.13 1999/07/14 01:20:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.14 1999/07/15 15:20:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,8 +31,6 @@
 #include "postgres.h"
 #include "utils/datum.h"
 #include "catalog/pg_type.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 /*-------------------------------------------------------------------------
  * datumGetSize
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 3040cf0b31..6e6dc717eb 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.73 1999/07/14 01:20:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.74 1999/07/15 15:20:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,6 @@
 #include <sys/timeb.h>
 #endif
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 
 static int	DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
 static int DecodeNumber(int flen, char *field,
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index be224f1bf7..0b2c0dd250 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.18 1999/07/14 01:20:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.19 1999/07/15 15:20:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include "postgres.h"
 #include <miscadmin.h>
 #include "utils/builtins.h"		/* where function declarations go */
-#include "utils/mcxt.h"
 
 char *
 filename_in(char *file)
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 6b4eb7af61..daf830e552 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.44 1999/07/14 01:20:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.45 1999/07/15 15:20:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,6 @@
 #endif
 #include "fmgr.h"
 #include "utils/builtins.h"		/* for ftod() prototype */
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 #ifndef NAN
 #define NAN		(0.0/0.0)
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 1b3fc643e1..743a823c2a 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.42 1999/07/14 01:20:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.43 1999/07/15 15:20:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,8 +22,6 @@
 #include "postgres.h"
 
 #include "utils/geo_decls.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 #ifndef PI
 #define PI 3.1415926536
diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
index 083f3e2e40..4a246d705f 100644
--- a/src/backend/utils/adt/geo_selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.9 1999/07/14 01:20:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.10 1999/07/15 15:20:17 momjian Exp $
  *
  *		XXX These are totally bogus.
  *
@@ -18,9 +18,7 @@
 
 #include "access/attnum.h"
 #include "utils/geo_decls.h"	/* where function declarations go */
-#include "utils/palloc.h"
 #include "utils/builtins.h"
-#include "utils/mcxt.h"
 
 float64
 areasel(Oid opid,
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index d66f9240bd..f26dc35a8a 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.22 1999/07/14 01:20:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.23 1999/07/15 15:20:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/mcxt.h"
 
 #ifndef SHRT_MAX
 #define SHRT_MAX (0x7FFF)
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index d8170dcd2e..6b2be8a5a0 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -15,9 +15,7 @@
 #include <limits.h>
 
 #include "postgres.h"
-#include "utils/palloc.h"
 #include "utils/int8.h"
-#include "utils/mcxt.h"
 
 #define MAXINT8LEN		25
 
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 7586b63769..09925bb830 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -19,10 +19,8 @@
  */
 #include <string.h>
 #include "postgres.h"			/* postgres system include file */
-#include "utils/palloc.h"
 #include "utils/builtins.h"		/* where the function declarations go */
 #include "mb/pg_wchar.h"
-#include "utils/mcxt.h"
 
 static int	like(pg_wchar * text, pg_wchar * p);
 
@@ -112,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }
 
 
-/*	$Revision: 1.26 $
+/*	$Revision: 1.27 $
 **	"like.c" A first attempt at a LIKE operator for Postgres95.
 **
 **	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 96588d9711..03a7a4e479 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,17 +1,15 @@
 /*
  *	PostgreSQL type definitions for MAC addresses.
  *
- *	$Id: mac.c,v 1.9 1999/07/14 01:20:05 momjian Exp $
+ *	$Id: mac.c,v 1.10 1999/07/15 15:20:18 momjian Exp $
  */
 
 #include <stdio.h>
 #include <string.h>
 
 #include <postgres.h>
-#include <utils/palloc.h>
 #include <utils/builtins.h>
 #include <utils/inet.h>
-#include "utils/mcxt.h"
 
 manufacturer manufacturers[] = {
 	{0x00, 0x00, 0x0C, "Cisco"},
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 4af6f1216c..304e91d206 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: nabstime.c,v 1.56 1999/07/14 01:20:05 momjian Exp $
+ *	  $Id: nabstime.c,v 1.57 1999/07/15 15:20:18 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -25,7 +25,6 @@
 #endif
 #include "utils/builtins.h"
 #include "access/xact.h"
-#include "utils/mcxt.h"
 
 static AbsoluteTime tm2abstime(struct tm * tm, int tz);
 
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index c0b403099a..e04ad84cc6 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,15 +11,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.19 1999/07/14 01:20:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.20 1999/07/15 15:20:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/palloc.h"		/* where the declarations go */
-#include "utils/mcxt.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES (none)												 *
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 0bbc185f90..1b56dfa4cb 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
  *	is for IP V4 CIDR notation, but prepared for V6: just
  *	add the necessary bits where the comments indicate.
  *
- *	$Id: network.c,v 1.11 1999/07/14 01:20:06 momjian Exp $
+ *	$Id: network.c,v 1.12 1999/07/15 15:20:18 momjian Exp $
  *	Jon Postel RIP 16 Oct 1998
  */
 
@@ -18,10 +18,8 @@
 #include <arpa/inet.h>
 
 #include <postgres.h>
-#include <utils/palloc.h>
 #include <utils/builtins.h>
 #include <utils/inet.h>
-#include "utils/mcxt.h"
 
 static int	v4bitncmp(unsigned int a1, unsigned int a2, int bits);
 
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index e1063adf67..cfe6beaff7 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.17 1999/07/14 01:20:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.18 1999/07/15 15:20:18 momjian Exp $
  *
  * ----------
  */
@@ -21,9 +21,7 @@
 
 #include "postgres.h"
 #include "utils/builtins.h"
-#include "utils/palloc.h"
 #include "utils/numeric.h"
-#include "utils/mcxt.h"
 
 /* ----------
  * Uncomment the following to enable compilation of dump_numeric()
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 3ddc4534ec..ec55bcd451 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.24 1999/07/14 01:20:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.25 1999/07/15 15:20:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 
 #include "postgres.h"
 #include "utils/builtins.h"		/* where function declarations go */
-#include "utils/mcxt.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 205477ce47..50be811b22 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,14 +1,13 @@
 /*
  *	Edmund Mergl <E.Mergl@bawue.de>
  *
- *	$Id: oracle_compat.c,v 1.19 1999/07/14 01:20:06 momjian Exp $
+ *	$Id: oracle_compat.c,v 1.20 1999/07/15 15:20:19 momjian Exp $
  *
  */
 
 
 #include <ctype.h>
 #include "postgres.h"
-#include "utils/mcxt.h"
 
 text	   *lower(text *string);
 text	   *upper(text *string);
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index daf8cb1e69..c53b535011 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.23 1999/07/14 01:20:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.24 1999/07/15 15:20:19 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -33,7 +33,6 @@
 #include <regex/regex.h>
 
 #include "utils/builtins.h"		/* where the function declarations go */
-#include "utils/mcxt.h"
 
 #if defined(DISABLE_XOPEN_NLS)
 #undef _XOPEN_SOURCE
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 1db8ddcc05..3a2a032364 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.37 1999/05/25 16:12:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.38 1999/07/15 15:20:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "access/relscan.h"
 #include "storage/bufmgr.h"
 #include "fmgr.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
 
 #include "catalog/catname.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 6df5fb04ad..928705ef22 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
  *			  out of it's tuple
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.18 1999/06/02 11:52:28 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.19 1999/07/15 15:20:19 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -44,7 +44,6 @@
 
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "nodes/nodes.h"
 #include "optimizer/clauses.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index fe11c77b19..359267653b 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.30 1999/06/19 00:44:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.31 1999/07/15 15:20:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include "fmgr.h"
 #include "utils/builtins.h"		/* for textout() prototype and where the
 								 * declarations go */
-#include "utils/palloc.h"
 
 #include "catalog/catname.h"
 #include "utils/syscache.h"
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 60c368502b..5a9bae512e 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.7 1999/07/14 01:20:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.8 1999/07/15 15:20:20 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -19,9 +19,7 @@
 #include "postgres.h"
 #include "storage/bufpage.h"
 
-#include "utils/palloc.h"
 #include "utils/builtins.h"		/* where function declarations go */
-#include "utils/mcxt.h"
 
 #define LDELIM			'('
 #define RDELIM			')'
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 6e1da178da..3c67ab854e 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -6,7 +6,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "access/xact.h"
-#include "utils/mcxt.h"
 
 time_t
 timestamp_in(const char *timestamp_str)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index d7bb2738cb..868412f46f 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.48 1999/07/04 04:56:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.49 1999/07/15 15:20:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,10 +18,11 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "catalog/pg_type.h"
+#include "storage/bufpage.h"
+#include "utils/memutils.h"
 
 #ifdef CYR_RECODE
 char	   *convertstr(char *, int, int);
-
 #endif
 
 #include "mb/pg_wchar.h"
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index e31d5f4d3d..61b07f97fe 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.49 1999/07/14 01:20:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.50 1999/07/15 15:20:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,7 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "utils/palloc.h"
 #include "utils/builtins.h"		/* where function declarations go */
-#include "utils/mcxt.h"
 
 #include "mb/pg_wchar.h"
 
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
index 98e76f78a5..a756a2ca9c 100644
--- a/src/backend/utils/adt/version.c
+++ b/src/backend/utils/adt/version.c
@@ -5,7 +5,7 @@
  *
  * IDENTIFICATION
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.7 1999/07/14 01:20:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.8 1999/07/15 15:20:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include "postgres.h"
 #include "version.h"
 
-#include "utils/mcxt.h"
 
 text	   *version(void);
 
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 8224c93578..c4044158ea 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.43 1999/06/04 02:19:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.44 1999/07/15 15:20:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,9 +19,6 @@
 #include "utils/builtins.h"
 #include "utils/portal.h"
 #include "utils/catcache.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 #include "storage/bufpage.h"
 #include "access/valid.h"
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index be59004441..cb99900ea6 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.27 1999/05/29 01:45:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.28 1999/07/15 15:20:22 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -21,8 +21,6 @@
 #include "utils/lsyscache.h"
 #include "access/tupmacs.h"
 #include "utils/rel.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
 #include "access/attnum.h"
 #include "access/heapam.h"
 
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index f8c73b7b22..7184f76985 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.62 1999/05/25 16:12:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.63 1999/07/15 15:20:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,6 @@
 #include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/hsearch.h"
-#include "utils/mcxt.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 6635ac2bd4..0d817ec012 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.6 1999/07/03 15:43:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.7 1999/07/15 15:20:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,6 @@
 #include "postgres.h"
 #include "miscadmin.h"
 #include "nodes/pg_list.h"
-#include "utils/mcxt.h"
 #include "utils/temprel.h"
 #include "access/xact.h"
 #include "access/htup.h"
diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c
index 70842f3b56..c22b8e696c 100644
--- a/src/backend/utils/error/excid.c
+++ b/src/backend/utils/error/excid.c
@@ -7,15 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.6 1999/05/25 16:12:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.7 1999/07/15 15:20:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "utils/excid.h"
-
 /*****************************************************************************
  *	 Generic Recoverable Exceptions											 *
  *****************************************************************************/
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 7d9b79575f..b5cf429e7f 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.26 1999/05/25 16:12:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.27 1999/07/15 15:20:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include "config.h"				/* for MAXPATHLEN */
 #include "fmgr.h"				/* generated by Gen_fmgrtab.sh */
 #include "utils/dynamic_loader.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "access/heapam.h"
 #include "nodes/pg_list.h"
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index d5b24cf341..8658da21a4 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.28 1999/05/25 16:12:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.29 1999/07/15 15:20:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,6 @@
 #include "nodes/params.h"
 
 #include "utils/builtins.h"
-#include "utils/elog.h"
 
 #include "nodes/parsenodes.h"
 #include "commands/trigger.h"
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 28ee6a15de..5b00ed9b0f 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.23 1999/05/31 17:01:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.24 1999/07/15 15:20:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,9 +46,7 @@
 #include	   "utils/dynahash.h"
 #include	   "utils/hsearch.h"
 #ifndef FRONTEND
-#include	   "utils/mcxt.h"
 #endif	 /* !FRONTEND */
-#include	   "utils/palloc.h"
 #include	   "utils/memutils.h"
 
 /*
diff --git a/src/backend/utils/init/enbl.c b/src/backend/utils/init/enbl.c
index 78c5ab1040..f2ac69fba7 100644
--- a/src/backend/utils/init/enbl.c
+++ b/src/backend/utils/init/enbl.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.7 1999/05/25 16:12:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.8 1999/07/15 15:20:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "utils/module.h"		/* where the declarations go */
 
 /*
  * BypassEnable
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 1d4225e582..1ef5a00fe4 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.30 1999/05/25 16:12:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.31 1999/07/15 15:20:34 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -31,7 +31,6 @@
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
-#include "utils/elog.h"
 #include "libpq/pqcomm.h"
 #include "catalog/catname.h"
 
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 86328bbd56..53e98f3211 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.29 1999/05/25 16:12:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.30 1999/07/15 15:20:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,6 @@
 
 #include "utils/portal.h"		/* for EnablePortalManager, etc. */
 #include "utils/exc.h"			/* for EnableExceptionHandling, etc. */
-#include "utils/mcxt.h"			/* for EnableMemoryContext, etc. */
-#include "utils/elog.h"
 #include "utils/builtins.h"
 
 #include "miscadmin.h"			/* where the declarations go */
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 0c2711483f..6a304ec3d1 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.40 1999/05/25 16:12:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.41 1999/07/15 15:20:34 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -60,9 +60,6 @@
 
 #include "utils/exc.h"			/* for EnableExceptionHandling, etc. */
 #include "fmgr.h"				/* for EnableDynamicFunctionManager, etc. */
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"			/* for EnableMemoryContext, etc. */
 #include "utils/inval.h"
 
 #include "catalog/catname.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index e9ea619349..607dfcf46a 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.24 1999/05/25 16:12:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.25 1999/07/15 15:20:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
+#include "access/transam.h"
 #include "access/xact.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 98cd5b6f16..8143bc2c3e 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.14 1999/05/25 16:12:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.15 1999/07/15 15:20:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,10 +22,7 @@
 #include "nodes/memnodes.h"
 #include "nodes/nodes.h"
 
-#include "utils/mcxt.h"
-#include "utils/elog.h"
 
-#include "utils/palloc.h"
 
 #undef MemoryContextAlloc
 #undef MemoryContextFree
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index bf36908973..4eb27ccbc6 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.12 1999/05/25 16:12:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.13 1999/07/15 15:20:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,9 +16,6 @@
 
 #include "postgres.h"
 
-#include "utils/mcxt.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 
 #include "nodes/memnodes.h"
 
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 2c800e033c..55512b1c95 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23 1999/06/19 05:00:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.24 1999/07/15 15:20:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,7 +81,6 @@
 #include "lib/hasht.h"
 #include "utils/module.h"
 #include "utils/excid.h"		/* for Unimplemented */
-#include "utils/mcxt.h"
 #include "utils/hsearch.h"
 
 #include "nodes/memnodes.h"
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 104e57b919..b89706638a 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.29 1999/05/25 16:13:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.30 1999/07/15 15:20:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,8 +20,6 @@
 #include "access/xact.h"
 #include "storage/bufmgr.h"
 #include "access/transam.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/tqual.h"
 
 extern bool PostgresIsInitialized;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 0353d101c2..f7e4ad21c0 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.115 1999/06/03 04:01:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.116 1999/07/15 15:20:44 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -67,6 +67,8 @@
 #include "catalog/pg_language.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_trigger.h"
+#include "access/attnum.h"
+
 #include "libpq-fe.h"
 #ifndef HAVE_STRDUP
 #include "strdup.h"
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 383877e9ad..b1c31b2c66 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -16,12 +16,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <storage/page.h>
-#include <storage/block.h>
-#include <utils/rel.h>
-#include <storage/off.h>
-
-#include <fmgr.h>
 
 /*
 ** You can have as many strategies as you please in GiSTs, as
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 4be3b676ca..d86036e9e1 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -12,9 +12,6 @@
 #ifndef GISTSCAN_H
 
 #include <access/relscan.h>
-#include <storage/off.h>
-#include <storage/block.h>
-#include <utils/rel.h>
 
 extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
 			  uint16 nkeys, ScanKey key);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 20ad45863f..77fc90b162 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -12,7 +12,6 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
-#include <access/strat.h>
 #include <utils/rel.h>
 
 extern StrategyNumber RelationGetGISTStrategy(Relation r,
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 685acee3f5..1157bf355a 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
+ * $Id: hash.h,v 1.25 1999/07/15 15:20:53 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -18,7 +18,6 @@
 
 #include <access/sdir.h>
 #include <access/funcindex.h>
-#include <storage/bufpage.h>
 #include <access/relscan.h>
 #include <access/itup.h>
 #include <utils/int8.h>
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 17f5f2aede..1071fa6d9c 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,20 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.43 1999/07/10 22:06:26 tgl Exp $
+ * $Id: heapam.h,v 1.44 1999/07/15 15:20:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HEAPAM_H
 #define HEAPAM_H
 
+#include <time.h>
 #include "access/tupmacs.h"
 #include "access/htup.h"
 #include "access/relscan.h"
 #include "storage/block.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
-#include <time.h>
 
 /* ----------------------------------------------------------------
  *				heap access method statistics
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index bf5164b5e8..d94d959b7a 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $
+ * $Id: hio.h,v 1.12 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define HIO_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
-
 
 extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
 					 HeapTuple tuple);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 3901e5f10f..507a17907f 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -1,4 +1,4 @@
-/*-------------------------------------------------------------------------
+ /*-------------------------------------------------------------------------
  *
  * htup.h
  *	  POSTGRES heap tuple definitions.
@@ -6,17 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.22 1999/07/12 13:32:38 momjian Exp $
+ * $Id: htup.h,v 1.23 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HTUP_H
 #define HTUP_H
 
-#include <utils/nabstime.h>
 #include <storage/bufpage.h>
-#include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MinHeapTupleBitmapSize	32		/* 8 * 4 */
 
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 6f45129158..90ed45926a 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $
+ * $Id: istrat.h,v 1.14 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define ISTRAT_H
 
 #include <utils/rel.h>
-#include <access/strat.h>
 
 /*
  * StrategyNumberIsValid
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 85fc975e71..f89211029c 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.17 1999/02/13 23:20:55 momjian Exp $
+ * $Id: itup.h,v 1.18 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <access/tupmacs.h>
 #include <access/tupdesc.h>
 #include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MaxIndexAttributeNumber 7
 
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index b4993ca3d2..9618e5fb72 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.27 1999/05/25 22:04:55 momjian Exp $
+ * $Id: nbtree.h,v 1.28 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,8 @@
 
 #include <access/sdir.h>
 #include <access/relscan.h>
-#include <storage/itemid.h>
-#include <storage/page.h>
 #include <access/funcindex.h>
 #include <access/itup.h>
-#include <storage/bufmgr.h>		/* don't remove, required by
-								 * BT_READ/BT_WRITE */
-#include <storage/itemptr.h>
 
 /*
  *	BTPageOpaqueData -- At the end of every page, we store a pointer
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 4481c575e6..fe8b03f40c 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $
+ * $Id: relscan.h,v 1.16 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELSCAN_H
 #define RELSCAN_H
 
-#include <storage/buf.h>
-#include <utils/rel.h>
-#include <access/htup.h>
 #include <utils/tqual.h>
 
 typedef ItemPointerData MarkData;
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 0cc2381b7d..d5d105ec3f 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.14 1999/02/13 23:20:57 momjian Exp $
+ * $Id: rtree.h,v 1.15 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,10 +17,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <access/skey.h>
-#include <access/strat.h>
-#include <storage/block.h>
-#include <storage/off.h>
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies					8
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index 31b77bba2b..fb3e090b6c 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.9 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtstrat.h,v 1.10 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RTSTRAT_H
 
 #include <utils/rel.h>
-#include <access/attnum.h>
 
 extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 3f2d6e8d96..baaf4bd0ac 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $
+ * $Id: tupmacs.h,v 1.11 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TUPMACS_H
 #define TUPMACS_H
 
+#include "utils/memutils.h"
+
 /*
  * check to see if the ATT'th bit of an array of 8-bit bytes is set.
  */
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index a855806c19..9f155200e2 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.20 1999/02/13 23:21:00 momjian Exp $
+ * $Id: xact.h,v 1.21 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XACT_H
 #define XACT_H
 
-#include <access/transam.h>
 #include <utils/nabstime.h>
+#include <access/transam.h>
 
 /* ----------------
  *		transaction state structure
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 95cdf8845f..a43ffae1dd 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.16 1999/05/25 16:13:40 momjian Exp $
+ * $Id: index.h,v 1.17 1999/07/15 15:20:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,9 +14,7 @@
 #define INDEX_H
 
 #include <nodes/execnodes.h>
-#include <nodes/parsenodes.h>
 #include <access/itup.h>
-#include <access/funcindex.h>
 
 extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId);
 
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index f694b43a75..2ff93f6574 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.19 1999/02/13 23:21:03 momjian Exp $
+ * $Id: indexing.h,v 1.20 1999/07/15 15:20:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #define INDEXING_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
 
 /*
  * Some definitions for indices on pg_attribute
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 61f40cbff3..bad0e1513d 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -6,14 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.9 1999/07/14 01:20:12 momjian Exp $
+ * $Id: dbcommands.h,v 1.10 1999/07/15 15:21:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DBCOMMANDS_H
 #define DBCOMMANDS_H
 
+#include <signal.h>
 #include "tcop/dest.h"
+
 /*
  * Originally from tmp/daemon.h. The functions declared in daemon.h does not
  * exist; hence removed.		-- AY 7/29/94
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 89e13188ea..9b7fff0b24 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -9,11 +9,8 @@
 #ifndef TRIGGER_H
 #define TRIGGER_H
 
-#include "access/tupdesc.h"
-#include "access/htup.h"
 #include "nodes/parsenodes.h"
 #include "nodes/execnodes.h"
-#include "utils/rel.h"
 
 typedef uint32 TriggerEvent;
 
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index b456003f00..59a72bbb15 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.21 1999/07/14 01:20:15 momjian Exp $
+ * $Id: vacuum.h,v 1.22 1999/07/15 15:21:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,9 +18,7 @@
 #include "catalog/pg_index.h"
 #include "catalog/pg_attribute.h"
 #include "nodes/pg_list.h"
-#include "storage/block.h"
 #include "storage/itemptr.h"
-#include "storage/off.h"
 
 
 typedef struct VAttListData
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index be72695412..e7df6135d0 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.8 1999/02/13 23:21:22 momjian Exp $
+ * $Id: execFlatten.h,v 1.9 1999/07/15 15:21:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include "nodes/relation.h"
 #include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
 
 extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone);
 
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 14aacc8bd3..cd67bd3f32 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.9 1999/07/14 01:20:16 momjian Exp $
+ * $Id: execdebug.h,v 1.10 1999/07/15 15:21:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
+#include <nodes/print.h>
+
 /* ----------------------------------------------------------------
  *		debugging defines.
  *
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 43c1eb53cf..e979441a15 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.34 1999/06/17 15:15:53 momjian Exp $
+ * $Id: executor.h,v 1.35 1999/07/15 15:21:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECUTOR_H
 #define EXECUTOR_H
 
-#include <catalog/pg_index.h>
-#include <storage/bufmgr.h>
-#include <access/itup.h>
 #include <stdio.h>
 #include <executor/execdesc.h>
 
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 48a3d63fe3..4cc3a471c7 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: functions.h,v 1.9 1999/02/13 23:21:24 momjian Exp $
+ * $Id: functions.h,v 1.10 1999/07/15 15:21:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
-#include "access/tupdesc.h"
 #include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
 #include "utils/syscache.h"
 
 extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist,
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index e98c99d99f..724a7ddd31 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hashjoin.h,v 1.13 1999/05/25 22:42:45 momjian Exp $
+ * $Id: hashjoin.h,v 1.14 1999/07/15 15:21:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define HASHJOIN_H
 
 #include "access/htup.h"
-#include "storage/fd.h"
-#include "utils/mcxt.h"
 
 /* ----------------------------------------------------------------
  *				hash-join hash table structures
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 5462f31c64..7ee15e4748 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.9 1999/02/13 23:21:24 momjian Exp $
+ * $Id: nodeAgg.h,v 1.10 1999/07/15 15:21:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAGG_H
 #define NODEAGG_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecAgg(Agg *node);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 6bc6080654..34212d22df 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.10 1999/02/13 23:21:25 momjian Exp $
+ * $Id: nodeAppend.h,v 1.11 1999/07/15 15:21:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent);
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index 9be307b2a2..ee740efcd8 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeGroup.h,v 1.11 1999/07/13 21:17:37 momjian Exp $
+ * $Id: nodeGroup.h,v 1.12 1999/07/15 15:21:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEGROUP_H
 #define NODEGROUP_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecGroup(Group *node);
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 4544d6416e..605ab0b126 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -6,19 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHash.h,v 1.13 1999/05/25 16:13:55 momjian Exp $
+ * $Id: nodeHash.h,v 1.14 1999/07/15 15:21:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEHASH_H
 #define NODEHASH_H
 
-#include "executor/hashjoin.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
-#include "utils/syscache.h"
 
 extern TupleTableSlot *ExecHash(Hash *node);
 extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent);
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 336e9b4d1f..2061ac7bdc 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.14 1999/05/25 22:42:46 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.15 1999/07/15 15:21:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define NODEHASHJOIN_H
 
 #include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "utils/syscache.h"
 
 extern TupleTableSlot *ExecHashJoin(HashJoin *node);
 extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 2d959a8ca8..d8b284f8d5 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeIndexscan.h,v 1.8 1999/02/13 23:21:26 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.9 1999/07/15 15:21:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEINDEXSCAN_H
 #define NODEINDEXSCAN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecIndexScan(IndexScan *node);
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index fddc4d1edb..f10b252c1c 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.10 1999/02/21 03:49:44 scrappy Exp $
+ * $Id: nodeMaterial.h,v 1.11 1999/07/15 15:21:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMATERIAL_H
 #define NODEMATERIAL_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecMaterial(Material *node);
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 779408df65..27078d5a39 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMergejoin.h,v 1.10 1999/02/13 23:21:26 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.11 1999/07/15 15:21:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMERGEJOIN_H
 #define NODEMERGEJOIN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 7a70189672..f0a11d0100 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeNestloop.h,v 1.10 1999/05/25 16:13:56 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.11 1999/07/15 15:21:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODENESTLOOP_H
 #define NODENESTLOOP_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent);
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index c5ad4ea715..506e6e580d 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeResult.h,v 1.8 1999/02/13 23:21:27 momjian Exp $
+ * $Id: nodeResult.h,v 1.9 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODERESULT_H
 #define NODERESULT_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecResult(Result *node);
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index d858678471..a2358c4aa6 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSeqscan.h,v 1.8 1999/02/13 23:21:28 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.9 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODESEQSCAN_H
 #define NODESEQSCAN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecSeqScan(SeqScan *node);
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 590f49dfd2..a8c8f99c62 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSort.h,v 1.8 1999/02/13 23:21:28 momjian Exp $
+ * $Id: nodeSort.h,v 1.9 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODESORT_H
 #define NODESORT_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecSort(Sort *node);
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index b74fbc00af..98251c2487 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -7,8 +7,6 @@
 #ifndef NODESUBPLAN_H
 #define NODESUBPLAN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext);
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index cece9f3f93..f5355b5d32 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeUnique.h,v 1.8 1999/02/13 23:21:29 momjian Exp $
+ * $Id: nodeUnique.h,v 1.9 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEUNIQUE_H
 #define NODEUNIQUE_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecUnique(Unique *node);
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index ea9bda89b8..80af87f16a 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -10,6 +10,11 @@
 
 #include <string.h>
 #include "postgres.h"
+
+/*
+ *	These are not needed by this file, but used by other programs
+ *	using SPI
+ */
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
 #include "nodes/execnodes.h"
@@ -23,10 +28,7 @@
 #include "nodes/params.h"
 #include "utils/fcache.h"
 #include "utils/datum.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/builtins.h"
 #include "catalog/pg_language.h"
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 3e7988aa09..916d7141d2 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -3,7 +3,7 @@
  * spi.c
  *				Server Programming Interface private declarations
  *
- * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.5 1999/07/14 01:20:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.6 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -11,8 +11,6 @@
 #define SPI_PRIV_H
 
 #include "executor/spi.h"
-#include "catalog/pg_type.h"
-#include "access/printtup.h"
 
 typedef struct
 {
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index de582ba387..ad6390fa20 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.12 1999/05/25 16:13:58 momjian Exp $
+ * $Id: tuptable.h,v 1.13 1999/07/15 15:21:14 momjian Exp $
  *
  * NOTES
  *	  The tuple table interface is getting pretty ugly.
@@ -17,8 +17,6 @@
 #ifndef TUPTABLE_H
 #define TUPTABLE_H
 
-#include <storage/buf.h>
-#include <access/tupdesc.h>
 #include <access/htup.h>
 
 /* ----------------
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 7eda4e4e57..fe979ebdd5 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.14 1999/02/13 23:21:35 momjian Exp $
+ * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "libpq/pqcomm.h"
 #include "libpq/hba.h"
 
 
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index d9d1a95523..f4086c1137 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.31 1999/07/07 17:17:50 momjian Exp $
+ * $Id: libpq.h,v 1.32 1999/07/15 15:21:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 
 #include "libpq/libpq-be.h"
 #include "tcop/dest.h"
-
+#include "utils/exc.h"
 
 /* ----------------
  * PQArgBlock
diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h
index 4daf7179cf..c7289e2390 100644
--- a/src/include/libpq/pqformat.h
+++ b/src/include/libpq/pqformat.h
@@ -5,14 +5,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqformat.h,v 1.4 1999/05/25 16:14:01 momjian Exp $
+ * $Id: pqformat.h,v 1.5 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PQFORMAT_H
 #define PQFORMAT_H
 
-#include "postgres.h"
 #include "lib/stringinfo.h"
 
 #define pq_beginmessage(buf)  initStringInfo(buf)
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 21114d2455..ca324c94b1 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $
+ * $Id: execnodes.h,v 1.31 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include <nodes/memnodes.h>
 #include <nodes/primnodes.h>
 #include <executor/hashjoin.h>
 #include <access/relscan.h>
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 4cc34024a7..7ea2e7e142 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $
+ * $Id: makefuncs.h,v 1.19 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MAKEFUNC_H
 #define MAKEFUNC_H
 
-#include <nodes/primnodes.h>
 #include <nodes/parsenodes.h>
-#include <utils/fcache.h>
 
 extern Oper *makeOper(Oid opno,
 		 Oid opid,
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index da59725063..528924ad41 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.8 1999/02/13 23:21:38 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.9 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-#include <nodes/nodes.h>
 #include <nodes/primnodes.h>
 
 extern bool single_node(Node *node);
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 8415069f0f..322987c447 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.49 1999/05/26 12:56:33 momjian Exp $
+ * $Id: nodes.h,v 1.50 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,13 +262,7 @@ typedef struct Node
  */
 extern Node *newNode(Size size, NodeTag tag);
 
-/*
- * nodes/{outfuncs.c,print.c}
- */
-#define nodeDisplay		pprint
-
 extern char *nodeToString(void *obj);
-extern void print(void *obj);
 
 /*
  * nodes/{readfuncs.c,read.c}
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index 708394e0e1..8d5292e740 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -6,18 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: print.h,v 1.10 1999/02/13 23:21:41 momjian Exp $
+ * $Id: print.h,v 1.11 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
 #include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "executor/tuptable.h"
+#include "nodes/plannodes.h"
+
+/*
+ * nodes/{outfuncs.c,print.c}
+ */
+#define nodeDisplay		pprint
 
 extern void print(void *obj);
 extern void pprint(void *obj);
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 5f629dd0e6..c5d7d30840 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $
+ * $Id: relation.h,v 1.33 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RELATION_H
 
 #include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 
 /*
  * Relids
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h
similarity index 93%
rename from src/include/optimizer/xfunc.h
rename to src/include/optimizer/_deadcode/xfunc.h
index 41414dba4d..d925be5630 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $
+ * $Id: xfunc.h,v 1.1 1999/07/15 15:21:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,12 +33,6 @@
 
 extern int	XfuncMode;			/* defined in tcop/postgres.c */
 
-/* defaults for function attributes used for expensive function calculations */
-#define BYTE_PCT 100
-#define PERBYTE_CPU 0
-#define PERCALL_CPU 0
-#define OUTIN_RATIO 100
-
 /* default width assumed for variable length attributes */
 #define VARLEN_DEFAULT 128;
 
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 3cd74b1e25..1416cc2545 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.19 1999/06/19 03:41:44 tgl Exp $
+ * $Id: clauses.h,v 1.20 1999/07/15 15:21:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CLAUSES_H
 #define CLAUSES_H
 
-#include <nodes/primnodes.h>
 #include <nodes/relation.h>
 
 extern Expr *make_clause(int type, Node *oper, List *args);
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index e7f8452f24..b9fc710370 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,18 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $
+ * $Id: cost.h,v 1.21 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef COST_H
 #define COST_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
+/* defaults for function attributes used for expensive function calculations */
+#define BYTE_PCT 100
+#define PERBYTE_CPU 0
+#define PERCALL_CPU 0
+#define OUTIN_RATIO 100
+
 /*
  * prototypes for costsize.c
  *	  routines to compute costs and sizes
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index f02510e21e..1558bd6a99 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $
+ * $Id: geqo.h,v 1.17 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #ifndef GEQO_H
 #define GEQO_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 #include "optimizer/geqo_gene.h"
 
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 00b5b9385e..d8d4e8ff56 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_gene.h,v 1.7 1999/02/13 23:21:45 momjian Exp $
+ * $Id: geqo_gene.h,v 1.8 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,8 +23,6 @@
 #define GEQO_GENE_H
 
 #include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "optimizer/geqo_gene.h"
 
 /* we presume that int instead of Relid
    is o.k. for Gene; so don't change it! */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 9fadc318d4..abb6398a70 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $
+ * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 
-#include "nodes/parsenodes.h"
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo_recombination.h"
+#include "nodes/relation.h"
 
 extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
 extern void print_gen(FILE *fp, Pool *pool, int generation);
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index f8e047c888..3d6f2aa7df 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.h,v 1.7 1999/02/13 23:21:47 momjian Exp $
+ * $Id: geqo_pool.h,v 1.8 1999/07/15 15:21:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #define GEQO_POOL_H
 
 #include "optimizer/geqo_gene.h"
+#include "nodes/parsenodes.h"
 
 extern Pool *alloc_pool(int pool_size, int string_length);
 extern void free_pool(Pool *pool);
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 3812d421f9..faa573bbe7 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.21 1999/07/07 09:27:28 momjian Exp $
+ * $Id: internal.h,v 1.22 1999/07/15 15:21:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
+#include "catalog/pg_index.h"
+
 /*
  *		---------- SHARED MACROS
  *
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 3a4451dd35..ac72326184 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $
+ * $Id: joininfo.h,v 1.13 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef JOININFO_H
 #define JOININFO_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index 423b8e4216..67910c283f 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $
+ * $Id: keys.h,v 1.16 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef KEYS_H
 #define KEYS_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
 
 extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel);
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index d7019fc446..0860ab7f18 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $
+ * $Id: pathnode.h,v 1.18 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHNODE_H
 #define PATHNODE_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "nodes/parsenodes.h"
 
 /*
  * prototypes for pathnode.c
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index ee39919245..a26085d05e 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,15 +7,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.30 1999/05/26 12:56:35 momjian Exp $
+ * $Id: paths.h,v 1.31 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHS_H
 #define PATHS_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 /*
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 96bf3ebfc1..9e37617446 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.28 1999/06/06 17:38:09 tgl Exp $
+ * $Id: planmain.h,v 1.29 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANMAIN_H
 #define PLANMAIN_H
 
-#include "nodes/nodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 /*
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 6bad60b6ad..a8f85001e6 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.11 1999/05/13 07:29:11 tgl Exp $
+ * $Id: planner.h,v 1.12 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
-#include "parser/parse_node.h"
 
 extern Plan *planner(Query *parse);
 extern Plan *union_planner(Query *parse);
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index 0d1e741bc2..2f5c4dca20 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $
+ * $Id: restrictinfo.h,v 1.5 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RESTRICTINFO_H
 #define RESTRICTINFO_H
 
-#include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
 extern bool valid_or_clause(RestrictInfo *restrictinfo);
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 5e9e16e51d..d4970e4848 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -7,7 +7,6 @@
 #ifndef SUBSELECT_H
 #define SUBSELECT_H
 
-#include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
 
 extern int	PlannerQueryLevel;	/* level of current query */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index de57eb59dd..860b077de2 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $
+ * $Id: tlist.h,v 1.19 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TLIST_H
 #define TLIST_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index e903025bed..16f9f4f663 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.7 1999/02/13 23:21:54 momjian Exp $
+ * $Id: var.h,v 1.8 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VAR_H
 #define VAR_H
 
-#include "nodes/nodes.h"
 #include "nodes/primnodes.h"
 
 extern List *pull_varnos(Node *me);
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 0801592882..64a6e3a65e 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_agg.h,v 1.10 1999/05/25 22:43:16 momjian Exp $
+ * $Id: parse_agg.h,v 1.11 1999/07/15 15:21:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_AGG_H
 #define PARSE_AGG_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 extern void AddAggToParseState(ParseState *pstate, Aggref *aggref);
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 82cac2e233..2b3dddad5c 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_clause.h,v 1.9 1999/05/26 12:56:41 momjian Exp $
+ * $Id: parse_clause.h,v 1.10 1999/07/15 15:21:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_CLAUSE_H
 #define PARSE_CLAUSE_H
 
-#include <nodes/pg_list.h>
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList, Node **qual);
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index a8ce037d59..5976421735 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.13 1999/07/14 01:20:25 momjian Exp $
+ * $Id: parse_coerce.h,v 1.14 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_COERCE_H
 #define PARSE_COERCE_H
 
-#include "nodes/pg_list.h"
 #include "parser/parse_node.h"
+#include "catalog/pg_type.h"
 
 typedef enum CATEGORY
 {
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 285b00f3f7..0913ce3bba 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -6,17 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.11 1999/05/26 12:56:41 momjian Exp $
+ * $Id: parse_expr.h,v 1.12 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_EXPR_H
 #define PARSE_EXPR_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
+#include "parser/parse_type.h"
 
 extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
 extern Oid	exprType(Node *expr);
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index d3441a0ce8..de3487183a 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -6,18 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.16 1999/06/17 22:21:40 tgl Exp $
+ * $Id: parse_func.h,v 1.17 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSER_FUNC_H
 #define PARSER_FUNC_H
 
-#include <nodes/nodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
-#include <parser/parse_func.h>
 #include <parser/parse_node.h>
 
 
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 9bc4cf2b13..5a56b5fb75 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -5,18 +5,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_node.h,v 1.12 1999/05/13 07:29:19 tgl Exp $
+ * $Id: parse_node.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_NODE_H
 #define PARSE_NODE_H
 
-#include <nodes/nodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
 #include <nodes/parsenodes.h>
-#include <parser/parse_type.h>
 #include <utils/rel.h>
 
 /* state information used during parse analysis */
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 0c54a55326..82e241ef87 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_oper.h,v 1.7 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parse_oper.h,v 1.8 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_OPER_H
 #define PARSE_OPER_H
 
-#include <parser/parse_func.h>
-#include <parser/parse_node.h>
+#include "access/htup.h"
 
 typedef HeapTuple Operator;
 
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 5240dcc28d..12c47636b6 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -6,19 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.9 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parse_relation.h,v 1.10 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_QUERY_H
 #define PARSE_RANGE_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
-#include <utils/rel.h>
 
 extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname);
 extern int refnameRangeTablePosn(ParseState *pstate,
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index 2a70b5dde3..d54ce32d83 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_target.h,v 1.12 1999/05/17 17:03:46 momjian Exp $
+ * $Id: parse_target.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_TARGET_H
 #define PARSE_TARGET_H
 
-#include <nodes/pg_list.h>
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 #define EXPR_COLUMN_FIRST	1
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index a28520ff93..1f6767d662 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -7,13 +7,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsetree.h,v 1.6 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parsetree.h,v 1.7 1999/07/15 15:21:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSETREE_H
 #define PARSETREE_H				/* include once only */
 
+#include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+
 /* ----------------
  *		need pg_list.h for definitions of CAR(), etc. macros
  * ----------------
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 051d65cec0..63640e53db 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.23 1999/06/10 22:59:22 momjian Exp $
+ * $Id: postgres.h,v 1.24 1999/07/15 15:20:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,8 +40,9 @@
 #include "config.h"
 #endif
 #include "c.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
+#include "utils/mcxt.h"
+#include "utils/elog.h"
 
 /* ----------------------------------------------------------------
  *				Section 1:	simple type definitions
diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h
index 7527d0f5b6..69740a86eb 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.11 1999/02/13 23:21:59 momjian Exp $
+ * $Id: locks.h,v 1.12 1999/07/15 15:21:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LOCKS_H
 #define LOCKS_H
 
-#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "rewrite/prs2lock.h"
 
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index 2b5caebba4..6a59f8f224 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteHandler.h,v 1.10 1999/05/26 12:56:48 momjian Exp $
+ * $Id: rewriteHandler.h,v 1.11 1999/07/15 15:21:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEHANDLER_H
 #define REWRITEHANDLER_H
 
-#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 
 struct _rewrite_meta_knowledge
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index 389676daba..273b2fd499 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteManip.h,v 1.16 1999/05/26 12:56:50 momjian Exp $
+ * $Id: rewriteManip.h,v 1.17 1999/07/15 15:21:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEMANIP_H
 #define REWRITEMANIP_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "rewrite/rewriteHandler.h"
 
 /* RewriteManip.c */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 55b735a6a9..a0d08a2d78 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.26 1999/05/25 16:14:39 momjian Exp $
+ * $Id: bufmgr.h,v 1.27 1999/07/15 15:21:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,17 +54,6 @@ typedef bits16 BufferLock;
  */
 #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1)
 
-/*
- * BufferIsPinned
- *		True iff the buffer is pinned (and therefore valid)
- *
- * Note:
- *		Smenatics are identical to BufferIsValid
- *		XXX - need to remove either one eventually.
- */
-#define BufferIsPinned BufferIsValid
-
-
 extern int	ShowPinTrace;
 
 /*
@@ -101,6 +90,17 @@ extern int	ShowPinTrace;
 	) \
 )
 
+/*
+ * BufferIsPinned
+ *		True iff the buffer is pinned (and therefore valid)
+ *
+ * Note:
+ *		Smenatics are identical to BufferIsValid
+ *		XXX - need to remove either one eventually.
+ */
+#define BufferIsPinned BufferIsValid
+
+
 #define IncrBufferRefCount(buffer) \
 ( \
 	BufferIsLocal(buffer) ? \
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 74729eaddc..6921f97a08 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.23 1999/07/03 00:32:59 momjian Exp $
+ * $Id: bufpage.h,v 1.24 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <storage/item.h>
 #include <storage/buf.h>
 #include <storage/page.h>
+#include <storage/bufmgr.h>
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 6027785fab..c7e649f19c 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $
+ * $Id: lmgr.h,v 1.21 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <storage/lock.h>
 #include <utils/rel.h>
-#include <catalog/catname.h>
 
 #define AccessShareLock			1		/* SELECT */
 #define RowShareLock			2		/* SELECT FOR UPDATE */
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 63a3e1b54c..e05ceae862 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $
+ * $Id: off.h,v 1.8 1999/07/15 15:21:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef OFF_H
 #define OFF_H
 
+#include "storage/itemid.h"
 /*
  * OffsetNumber:
  *
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index 91d85c68c5..700e6afe5f 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $
+ * $Id: pos.h,v 1.8 1999/07/15 15:21:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef POS_H
 #define POS_H
 
+#include "storage/off.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/tcop/dest.h b/src/include/tcop/dest.h
index f46f9b3248..a694d435c7 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -44,7 +44,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $
+ * $Id: dest.h,v 1.21 1999/07/15 15:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,6 @@
 #define DEST_H
 
 #include <access/htup.h>
-#include <access/tupdesc.h>
 
 /* ----------------
  *		CommandDest is a simplistic means of identifying the desired
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 95e68fdf07..c0270b3a12 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.20 1999/07/09 03:28:53 momjian Exp $
+ * $Id: acl.h,v 1.21 1999/07/15 15:21:38 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -24,6 +24,7 @@
 
 #include <nodes/parsenodes.h>
 #include <utils/array.h>
+#include "utils/memutils.h"
 
 /*
  * AclId		system identifier for the user, group, etc.
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index e6c8c6c311..ed4705184d 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.18 1999/05/25 16:14:49 momjian Exp $
+ * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -23,6 +23,7 @@
 #define ARRAY_H
 
 #include <stdio.h>
+#include "utils/memutils.h"
 
 typedef struct
 {
@@ -97,11 +98,7 @@ typedef struct
  *------------------------------------------------------------------------
  */
 
-/* #if defined(irix5) */
-/* #define RETURN_NULL {*isNull = true; return(0); }*/
- /* #else *//* irix5 */
 #define RETURN_NULL {*isNull = true; return(0); }
- /* #endif *//* irix5 */
 #define NAME_LEN	30
 #define MAX_BUFF_SIZE BLCKSZ
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 1d8044ca54..f653068e20 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.81 1999/05/26 12:57:03 momjian Exp $
+ * $Id: builtins.h,v 1.82 1999/07/15 15:21:39 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -28,9 +28,7 @@
 #include <utils/datetime.h>
 #include <utils/nabstime.h>
 #include <utils/int8.h>
-#include <utils/cash.h>
 #include <utils/inet.h>
-#include <utils/rel.h>
 #include <utils/numeric.h>
 
 /*
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 5f583aded3..601e59596a 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.16 1999/07/14 01:20:26 momjian Exp $
+ * $Id: catcache.h,v 1.17 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,6 @@
 
 #include <access/htup.h>
 #include <lib/dllist.h>
-#include <nodes/memnodes.h>
-#include <utils/rel.h>
-#include <utils/mcxt.h>
 
 /*
  *		struct catctup:			tuples in the cache.
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index d217c8aa87..de6d81aafa 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.40 1999/05/25 16:14:53 momjian Exp $
+ * $Id: dt.h,v 1.41 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include <time.h>
 #include <math.h>
+#include <limits.h>
 
 /*
  * DateTime represents absolute time.
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index e2dbf4c59f..601c023387 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.10 1999/02/13 23:22:18 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.11 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/param.h>			/* For MAXPATHLEN */
 
+/* we need this include because port files use them */
 #include <postgres.h>
 
 #ifdef MIN
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 321c5deaf2..3ee354df11 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.11 1999/02/13 23:22:23 momjian Exp $
+ * $Id: inval.h,v 1.12 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define INVAL_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
 
 extern void InitLocalInvalidateData(void);
 
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index 981c368345..71154579f5 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.12 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,6 @@
 
 #include <stdio.h>
 
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/htup.h"
 #include "utils/syscache.h"
 
 struct leftist
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index e88f004004..6a985ac8c7 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.16 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lsyscache.h,v 1.17 1999/07/15 15:21:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
-#include <access/attnum.h>
 #include <access/htup.h>
 
 extern bool op_class(Oid oprno, int32 opclass, Oid amopid);
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 754d023d2e..7a3d12f605 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.29 1999/07/14 01:20:29 momjian Exp $
+ * $Id: memutils.h,v 1.30 1999/07/15 15:21:41 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -30,7 +30,6 @@
  *	This is not needed by this include file, but by almost every file
  *	that includes this file.
  */
-#include "utils/mcxt.h"
 
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 61e6976766..07186589a9 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.15 1999/06/12 14:07:32 momjian Exp $
+ * $Id: portal.h,v 1.16 1999/07/15 15:21:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,9 +26,7 @@
 #define PORTAL_H
 
 #include <executor/execdesc.h>
-#include <lib/fstack.h>
 #include <nodes/memnodes.h>
-#include <utils/memutils.h>
 
 typedef struct PortalBlockData
 {
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index b9590cef61..c3e0295302 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.19 1999/05/25 16:14:57 momjian Exp $
+ * $Id: psort.h,v 1.20 1999/07/15 15:21:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,6 @@ typedef struct Psortstate
 } Psortstate;
 
 #ifdef	EBUG
-#include "utils/elog.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index c6863746d1..22949b4434 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,17 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.13 1999/02/13 23:22:32 momjian Exp $
+ * $Id: syscache.h,v 1.14 1999/07/15 15:21:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SYSCACHE_H
 #define SYSCACHE_H
 
-#include <access/attnum.h>
 #include <access/htup.h>
-#include <storage/buf.h>
-#include <utils/rel.h>
 
  /* #define CACHEDEBUG *//* turns DEBUG elogs on */
 
diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h
index 1b83223510..ecfa17985e 100644
--- a/src/include/utils/temprel.h
+++ b/src/include/utils/temprel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: temprel.h,v 1.3 1999/05/25 16:14:57 momjian Exp $
+ * $Id: temprel.h,v 1.4 1999/07/15 15:21:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define TEMPREL_H
 
 #include "access/htup.h"
-#include "access/attnum.h"
 
 void		create_temp_relation(char *relname, HeapTuple pg_class_tuple);
 void		remove_all_temp_relations(void);
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 1bec1aff7b..acb3284c9a 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.22 1999/05/25 22:43:39 momjian Exp $
+ * $Id: tqual.h,v 1.23 1999/07/15 15:21:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define TQUAL_H
 
 #include <access/htup.h>
+#include <access/xact.h>
 
 typedef struct SnapshotData
 {
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 64fb7bc982..70865ff3ee 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.14 1999/07/13 21:17:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.15 1999/07/15 15:21:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "type.h"
 #include "preproc.h"
 #include "parser/keywords.h"
-#include "utils/elog.h"
 
 /*
  * List of (keyword-name, keyword-token-value) pairs.
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 7f244c7685..ff1f9907f9 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -8,6 +8,8 @@
 #include "access/htup.h"
 #include "catalog/catname.h"
 #include "utils/numeric.h"
+#include "utils/memutils.h"
+#include "storage/bufpage.h"
 
 #include "extern.h"
 
diff --git a/src/man/create_language.l b/src/man/create_language.l
index f8f0380b6d..ac09443cfa 100644
--- a/src/man/create_language.l
+++ b/src/man/create_language.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_language.l,v 1.3 1998/06/23 17:52:31 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_language.l,v 1.4 1999/07/15 15:21:45 momjian Exp $
 .TH "CREATE LANGUAGE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 create language - define a new language for functions
@@ -70,7 +70,6 @@ Following is a template for a PL handler written in 'C':
 
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "fmgr.h"		/* for FmgrValues struct */
 #include "access/heapam.h"
 #include "utils/syscache.h"
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index ea53442678..75aad7a821 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.7 1999/05/25 16:15:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.8 1999/07/15 15:21:46 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -48,7 +48,6 @@
 
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "fmgr.h"
 #include "access/heapam.h"
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 02bdf6caa1..5be7e55c2d 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.12 1999/07/04 01:03:01 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.13 1999/07/15 15:21:47 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -50,7 +50,6 @@
 #include "executor/spi.h"
 #include "executor/spi_priv.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "fmgr.h"
 #include "access/heapam.h"
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 8b2a0c8cba..0215eea6bb 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.2 1998/09/01 04:40:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.3 1999/07/15 15:21:48 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -47,7 +47,6 @@
 
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "fmgr.h"
 #include "access/heapam.h"
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 62f94ec0ae..0ec47d9f95 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -3,7 +3,7 @@
  *			  procedural language (PL)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.12 1999/05/26 12:57:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.13 1999/07/15 15:21:50 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -47,7 +47,6 @@
 
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "fmgr.h"
 #include "access/heapam.h"
diff --git a/src/tools/pginclude/pgdefine b/src/tools/pginclude/pgdefine
new file mode 100755
index 0000000000..3411c35856
--- /dev/null
+++ b/src/tools/pginclude/pgdefine
@@ -0,0 +1,13 @@
+:
+trap "rm -f /tmp/$$" 0 1 2 3 15
+for FILE
+do
+	cat "$FILE" | grep "^#define" >/tmp/$$
+	cat /tmp/$$ | sed -n 's/^#define[ 	][ 	]*\([a-zA-Z0-9_]*\)[ 	][ 	]*[^ 	].*$/(void)\1;/p'
+	cat /tmp/$$ | sed -n 's/^#define[ 	][ 	]*\([a-zA-Z0-9_]*([^)]*)\).*$/(=void)\1;/p' |
+	sed 's/([a-zA-Z0-9_ ][a-zA-Z0-9_ ]*)/(0)/g' |
+	sed 's/([a-zA-Z0-9_ ]*,/(0,/g' |
+	sed 's/,[a-zA-Z0-9_ ]*,/,0,/g' |
+	sed 's/,[a-zA-Z0-9_ ]*)/,0)/g' |
+	sed 's/(=void)/(void)/g'
+done
diff --git a/src/tools/pginclude/pginclude b/src/tools/pginclude/pginclude
new file mode 100755
index 0000000000..afaa6add79
--- /dev/null
+++ b/src/tools/pginclude/pginclude
@@ -0,0 +1,20 @@
+:
+trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15
+find . \( -name CVS -a -prune \) -o -name '*.[ch]' -type f -print | while read FILE
+do
+	sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a
+	echo "#include \"postgres.h\"" >/tmp/$$.c
+	echo "#include \"/tmp/$$a\"" >>/tmp/$$.c
+	echo "void main() {" >>/tmp/$$.c
+	pgdefine "$FILE" >>/tmp/$$.c
+	echo "}" >>/tmp/$$.c
+	cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
+	if [ "$?" -ne 0 ]
+	then	echo "$FILE"
+		if [ "$1" = "-v" ]
+		then	cat /tmp/$$
+			nl /tmp/$$.c
+			echo
+		fi
+	fi
+done
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
new file mode 100755
index 0000000000..41c3159165
--- /dev/null
+++ b/src/tools/pginclude/pgnoinclude
@@ -0,0 +1,28 @@
+:
+trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
+find . \( -name CVS -a -prune \) -o -type f -print | while read FILE
+do
+	cat "$FILE" | grep -v "^#if" | grep -v "^#else" | 
+		grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a
+	cat /tmp/$$a | grep "^#include" |
+	sed 's/#include[ 	]*[<"]\([^>"]*\).*$/\1/g' |
+	while read INCLUDE
+	do
+		[ -s /usr/include/$INCLUDE ] && continue
+		cat /tmp/$$a |
+		grep -v '^#include[ 	]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b
+		echo "#include \"postgres.h\"" >/tmp/$$.c
+		echo "#include \"/tmp/$$b\"" >>/tmp/$$.c
+		echo "void main() {" >>/tmp/$$.c
+		pgdefine "$FILE" >>/tmp/$$.c
+		echo "}" >>/tmp/$$.c
+		cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
+		if [ "$?" -eq 0 ]
+		then	echo "$FILE $INCLUDE"
+			if [ "$1" = "-v" ]
+			then	cat /tmp/$$
+				cat /tmp/$$.c
+			fi
+		fi
+	done
+done
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index 4931744821..b44bbc067d 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -8,7 +8,6 @@
 /* do not include libpq-fe.h for backend-loaded functions*/
 /* #include "libpq-fe.h"  */
 #include "postgres.h"
-#include "utils/mcxt.h"
 
 typedef struct Complex
 {
diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index bb0efacb64..8da815c2fe 100644
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <stdio.h>
 #include "postgres.h"			/* for variable length type */
-#include "utils/palloc.h"		/* for palloc */
 #include "executor/executor.h"	/* for GetAttributeByName() */
 #include "utils/geo_decls.h"	/* for point type */