From 0cf1b79528aa98fa7e0acfd60371251bd691cf5a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 14 Jul 1999 01:20:30 +0000
Subject: [PATCH] Cleanup of /include #include's, for 6.6 only.

---
 src/backend/access/hash/hashscan.c              |  3 ++-
 src/backend/access/hash/hashutil.c              |  3 ++-
 src/backend/access/heap/heapam.c                |  4 +++-
 src/backend/access/index/indexam.c              |  3 ++-
 src/backend/access/nbtree/nbtinsert.c           |  3 ++-
 src/backend/access/nbtree/nbtpage.c             |  3 ++-
 src/backend/access/nbtree/nbtscan.c             |  3 ++-
 src/backend/access/nbtree/nbtsearch.c           |  3 ++-
 src/backend/access/nbtree/nbtsort.c             |  3 ++-
 src/backend/access/nbtree/nbtutils.c            |  3 ++-
 src/backend/access/rtree/rtget.c                |  4 +++-
 src/backend/access/rtree/rtproc.c               |  4 +++-
 src/backend/access/rtree/rtscan.c               |  4 +++-
 src/backend/access/transam/xid.c                |  3 ++-
 src/backend/lib/stringinfo.c                    |  3 ++-
 src/backend/libpq/crypt.c                       |  3 ++-
 src/backend/nodes/list.c                        |  3 ++-
 src/backend/nodes/nodes.c                       |  6 +++---
 src/backend/optimizer/geqo/geqo_erx.c           |  3 ++-
 src/backend/optimizer/geqo/geqo_params.c        |  4 +++-
 src/backend/optimizer/geqo/geqo_pmx.c           |  3 ++-
 src/backend/optimizer/geqo/geqo_pool.c          |  3 ++-
 src/backend/optimizer/geqo/geqo_recombination.c |  3 ++-
 src/backend/storage/file/fd.c                   |  3 ++-
 src/backend/storage/smgr/smgr.c                 |  3 ++-
 src/backend/storage/smgr/smgrtype.c             |  3 ++-
 src/backend/utils/adt/bool.c                    |  3 ++-
 src/backend/utils/adt/cash.c                    |  3 ++-
 src/backend/utils/adt/char.c                    |  3 ++-
 src/backend/utils/adt/date.c                    |  3 ++-
 src/backend/utils/adt/datetime.c                |  3 ++-
 src/backend/utils/adt/datum.c                   |  3 ++-
 src/backend/utils/adt/dt.c                      |  4 ++--
 src/backend/utils/adt/filename.c                |  3 ++-
 src/backend/utils/adt/float.c                   |  3 ++-
 src/backend/utils/adt/geo_ops.c                 |  3 ++-
 src/backend/utils/adt/geo_selfuncs.c            |  3 ++-
 src/backend/utils/adt/int.c                     |  3 ++-
 src/backend/utils/adt/int8.c                    |  1 +
 src/backend/utils/adt/like.c                    |  3 ++-
 src/backend/utils/adt/mac.c                     |  3 ++-
 src/backend/utils/adt/nabstime.c                |  3 ++-
 src/backend/utils/adt/name.c                    |  3 ++-
 src/backend/utils/adt/network.c                 |  3 ++-
 src/backend/utils/adt/numeric.c                 |  4 ++--
 src/backend/utils/adt/oid.c                     |  3 ++-
 src/backend/utils/adt/oracle_compat.c           |  4 ++--
 src/backend/utils/adt/regexp.c                  |  3 ++-
 src/backend/utils/adt/tid.c                     |  4 ++--
 src/backend/utils/adt/timestamp.c               |  1 +
 src/backend/utils/adt/varlena.c                 |  3 ++-
 src/backend/utils/adt/version.c                 |  3 ++-
 src/include/access/valid.h                      | 16 +---------------
 src/include/catalog/pg_type.h                   |  4 +---
 src/include/commands/async.h                    |  4 +---
 src/include/commands/dbcommands.h               |  3 ++-
 src/include/commands/user.h                     |  3 +++
 src/include/commands/vacuum.h                   |  4 +++-
 src/include/executor/execdebug.h                |  6 +-----
 src/include/executor/spi_priv.h                 |  3 ++-
 src/include/libpq/hba.h                         |  5 ++---
 src/include/mb/pg_wchar.h                       |  4 +---
 src/include/optimizer/subselect.h               |  3 +++
 src/include/parser/parse_coerce.h               |  5 ++++-
 src/include/utils/catcache.h                    |  3 ++-
 src/include/utils/datetime.h                    |  4 +---
 src/include/utils/memutils.h                    |  7 ++++++-
 src/include/utils/numeric.h                     |  5 +----
 src/include/utils/palloc.h                      |  6 +-----
 src/include/utils/ps_status.h                   |  1 -
 src/include/utils/trace.h                       |  2 --
 71 files changed, 143 insertions(+), 109 deletions(-)

diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index 418788d472..fb52d42902 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.17 1999/02/13 23:14:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.18 1999/07/14 01:19:36 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -30,6 +30,7 @@
 #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 304ae236cb..73f6e350de 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.15 1999/02/13 23:14:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.16 1999/07/14 01:19:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #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 a0d03f6927..75303fd37f 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.46 1999/07/09 04:51:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.47 1999/07/14 01:19:37 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -88,6 +88,8 @@
 #include <access/xact.h>
 #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/index/indexam.c b/src/backend/access/index/indexam.c
index 73019ce8b2..293a32bfa8 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.30 1999/02/13 23:14:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.31 1999/07/14 01:19:38 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -70,6 +70,7 @@
 #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 cd3de2e26b..07a72e131e 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.42 1999/05/25 22:04:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.43 1999/07/14 01:19:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include <access/heapam.h>
 #include <access/xact.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 d5ac5c3ea2..474b1593a8 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.24 1999/06/07 14:28:22 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.25 1999/07/14 01:19:41 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -28,6 +28,7 @@
 #include <access/nbtree.h>
 #include <miscadmin.h>
 #include <storage/lmgr.h>
+#include <utils/mcxt.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 e250c99b02..577c2a4eeb 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.23 1999/05/25 22:04:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.24 1999/07/14 01:19:41 momjian Exp $
  *
  *
  * NOTES
@@ -31,6 +31,7 @@
 
 #include <storage/bufpage.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 5563110105..61dde4b9f0 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.45 1999/05/25 18:20:30 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.46 1999/07/14 01:19:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #include <storage/bufpage.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 3c09175949..6927f7e3c6 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.40 1999/05/25 18:20:31 vadim Exp $
+ *	  $Id: nbtsort.c,v 1.41 1999/07/14 01:19:42 momjian Exp $
  *
  * NOTES
  *
@@ -54,6 +54,7 @@
 #include "access/nbtree.h"
 #include "storage/bufpage.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 42666c431e..c682462ddd 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.27 1999/05/25 18:20:31 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.28 1999/07/14 01:19:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #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 70b1f172a9..1bfe10d325 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.13 1999/02/13 23:14:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.14 1999/07/14 01:19:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,8 @@
 #include <access/iqual.h>
 #include <access/rtree.h>
 #include <storage/bufpage.h>
+#include <utils/mcxt.h>
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index f7772de64c..a685f692d0 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.18 1999/02/13 23:14:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.19 1999/07/14 01:19:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,8 @@
 
 #include <utils/builtins.h>
 #include <utils/geo_decls.h>
+#include <utils/mcxt.h>
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index b74a341304..6c3dba0056 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.23 1999/05/25 16:07:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.24 1999/07/14 01:19:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,8 @@
 #include <storage/bufpage.h>
 #include <access/rtree.h>
 #include <access/rtstrat.h>
+#include <utils/mcxt.h>
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 2b15fec1bf..58dfbecd22 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.22 1999/05/25 16:07:52 momjian Exp $
+ *	$Id: xid.c,v 1.23 1999/07/14 01:19:45 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -22,6 +22,7 @@
 
 #include <postgres.h>
 #include <access/xact.h>
+#include <utils/mcxt.h>
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index d5e44ba0f1..995dd5237a 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.17 1999/05/26 12:55:14 momjian Exp $
+ *	  $Id: stringinfo.c,v 1.18 1999/07/14 01:19:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 
 #include "postgres.h"
 #include "lib/stringinfo.h"
+#include "utils/mcxt.h"
 
 #ifdef NOT_USED
 /*
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 86990863a7..2fad684400 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.18 1999/05/27 04:09:45 momjian Exp $
+ * $Id: crypt.c,v 1.19 1999/07/14 01:19:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #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/list.c b/src/backend/nodes/list.c
index 48c15f1802..256e041966 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.21 1999/05/25 16:09:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.22 1999/07/14 01:19:49 momjian Exp $
  *
  * NOTES
  *	  XXX a few of the following functions are duplicated to handle
@@ -28,6 +28,7 @@
 #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 392e3444ed..38220edd5d 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.7 1999/02/13 23:15:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.8 1999/07/14 01:19:50 momjian Exp $
  *
  * HISTORY
  *	  Andrew Yu			Oct 20, 1994	file creation
@@ -19,8 +19,8 @@
 #include "postgres.h"
 #include "utils/palloc.h"
 #include "utils/elog.h"
-#include "nodes/nodes.h"		/* where func declarations of this file
-								 * goes */
+#include "nodes/nodes.h"
+#include "utils/mcxt.h"
 
 /*
  * newNode -
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index f667b7208b..a5ab77202b 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.11 1999/02/13 23:16:06 momjian Exp $
+* $Id: geqo_erx.c,v 1.12 1999/07/14 01:19:51 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -51,6 +51,7 @@
 #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_params.c b/src/backend/optimizer/geqo/geqo_params.c
index fb4356c30f..76cbc45f07 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.17 1999/05/22 23:27:19 tgl Exp $
+* $Id: geqo_params.c,v 1.18 1999/07/14 01:19:51 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -45,6 +45,8 @@
 
 #include "storage/fd.h"
 
+#include "utils/mcxt.h"
+
 /*
  * Parameter values read from the config file (or defaulted) are stored here
  * by geqo_params().
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index d8e32f49ce..692ba09eab 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.5 1999/02/13 23:16:11 momjian Exp $
+* $Id: geqo_pmx.c,v 1.6 1999/07/14 01:19:52 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -53,6 +53,7 @@
 #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 c01073e614..3a1b1030f6 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.12 1999/05/25 16:09:18 momjian Exp $
+ * $Id: geqo_pool.c,v 1.13 1999/07/14 01:19:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,6 +41,7 @@
 #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_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index 1ee5029d55..7afa5e41f3 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.7 1999/02/13 23:16:12 momjian Exp $
+* $Id: geqo_recombination.c,v 1.8 1999/07/14 01:19:53 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -38,6 +38,7 @@
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
+#include "utils/mcxt.h"
 
 /*
  * init_tour
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 223b25646d..f39f55918f 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.43 1999/07/08 02:46:39 momjian Exp $
+ *	  $Id: fd.c,v 1.44 1999/07/14 01:19:53 momjian Exp $
  *
  * NOTES:
  *
@@ -52,6 +52,7 @@
 #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/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 25644d088b..f97a054130 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.24 1999/05/25 16:11:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.25 1999/07/14 01:19:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #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 5f981c3b30..aa5eb72945 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.11 1999/02/13 23:18:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.12 1999/07/14 01:19:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #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/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index 57bb7c3272..d0ac12f4f2 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.16 1999/02/13 23:19:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.17 1999/07/14 01:19:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #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 9f74645d38..dd363ee083 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.28 1999/05/25 16:11:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.29 1999/07/14 01:19:57 momjian Exp $
  */
 
 #include <stdio.h>
@@ -22,6 +22,7 @@
 #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 4c6e371106..9eaa721b49 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.22 1999/05/25 16:11:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.23 1999/07/14 01:19:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #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 7ad18a067e..b4a2519831 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.32 1999/05/25 16:11:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.33 1999/07/14 01:19:59 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -42,6 +42,7 @@
 #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 84163583ef..5962460280 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.33 1999/05/25 16:11:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.34 1999/07/14 01:19:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #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 79a9d205eb..bfdd61271a 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.12 1999/02/13 23:19:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.13 1999/07/14 01:20:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,7 @@
 #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 74028c439a..3040cf0b31 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.72 1999/07/08 03:22:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.73 1999/07/14 01:20:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@
 #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 bb06213232..be224f1bf7 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.17 1999/02/13 23:19:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.18 1999/07/14 01:20:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #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 55c9da6419..6b4eb7af61 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.43 1999/07/13 20:12:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.44 1999/07/14 01:20:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,6 +62,7 @@
 #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 72166c5a54..1b3fc643e1 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.41 1999/02/21 03:49:30 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.42 1999/07/14 01:20:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 
 #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 5c55dcdaac..083f3e2e40 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.8 1999/03/28 01:56:12 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.9 1999/07/14 01:20:04 momjian Exp $
  *
  *		XXX These are totally bogus.
  *
@@ -20,6 +20,7 @@
 #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 636b6ae5ce..d66f9240bd 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.21 1999/07/09 15:09:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.22 1999/07/14 01:20:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,6 +37,7 @@
 #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 ba609865db..d8170dcd2e 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -17,6 +17,7 @@
 #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 2d35bfabac..7586b63769 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -22,6 +22,7 @@
 #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);
 
@@ -111,7 +112,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }
 
 
-/*	$Revision: 1.25 $
+/*	$Revision: 1.26 $
 **	"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 48dd19db94..96588d9711 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,7 +1,7 @@
 /*
  *	PostgreSQL type definitions for MAC addresses.
  *
- *	$Id: mac.c,v 1.8 1999/05/25 16:12:08 momjian Exp $
+ *	$Id: mac.c,v 1.9 1999/07/14 01:20:05 momjian Exp $
  */
 
 #include <stdio.h>
@@ -11,6 +11,7 @@
 #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 dbbc54c3f8..4af6f1216c 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.55 1999/05/25 16:12:09 momjian Exp $
+ *	  $Id: nabstime.c,v 1.56 1999/07/14 01:20:05 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -25,6 +25,7 @@
 #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 1780df2c42..c0b403099a 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.18 1999/05/25 16:12:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.19 1999/07/14 01:20:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #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 7c1aa24dbc..0bbc185f90 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.10 1999/06/02 03:37:15 momjian Exp $
+ *	$Id: network.c,v 1.11 1999/07/14 01:20:06 momjian Exp $
  *	Jon Postel RIP 16 Oct 1998
  */
 
@@ -21,6 +21,7 @@
 #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 da720f0f19..e1063adf67 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.16 1999/05/25 22:42:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.17 1999/07/14 01:20:06 momjian Exp $
  *
  * ----------
  */
@@ -23,7 +23,7 @@
 #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 8cee64521a..3ddc4534ec 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.23 1999/05/10 00:45:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.24 1999/07/14 01:20:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #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 ce5aefee6b..205477ce47 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,14 +1,14 @@
 /*
  *	Edmund Mergl <E.Mergl@bawue.de>
  *
- *	$Id: oracle_compat.c,v 1.18 1999/05/26 12:56:00 momjian Exp $
+ *	$Id: oracle_compat.c,v 1.19 1999/07/14 01:20:06 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 f2f2ca8c00..daf8cb1e69 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.22 1999/02/13 23:19:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.23 1999/07/14 01:20:07 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -33,6 +33,7 @@
 #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/tid.c b/src/backend/utils/adt/tid.c
index 8de800ca24..60c368502b 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.6 1999/02/13 23:19:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.7 1999/07/14 01:20:07 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -21,7 +21,7 @@
 
 #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 3c67ab854e..6e1da178da 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -6,6 +6,7 @@
 #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/varlena.c b/src/backend/utils/adt/varlena.c
index b649ef225a..e31d5f4d3d 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.48 1999/05/25 16:12:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.49 1999/07/14 01:20:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #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 cdacd6dbce..98e76f78a5 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.6 1999/04/06 15:35:36 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.7 1999/07/14 01:20:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #include "postgres.h"
 #include "version.h"
 
+#include "utils/mcxt.h"
 
 text	   *version(void);
 
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 7728eadc0d..14970ecdb4 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,27 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.18 1999/05/26 12:56:15 momjian Exp $
+ * $Id: valid.h,v 1.19 1999/07/14 01:20:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VALID_H
 #define VALID_H
 
-#include <fmgr.h>
-#include <access/heapam.h>
-#include <access/valid.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <utils/rel.h>
-#include <utils/builtins.h>
-#include <utils/tqual.h>
-
-/* ----------------
- *		extern decl's
- * ----------------
- */
-
 /* ----------------
  *		HeapKeyTest
  *
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index d60bc86201..5c43691e24 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.63 1999/07/09 03:28:52 momjian Exp $
+ * $Id: pg_type.h,v 1.64 1999/07/14 01:20:09 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -18,8 +18,6 @@
 #ifndef PG_TYPE_H
 #define PG_TYPE_H
 
-#include <utils/rel.h>
-
 /* ----------------
  *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index c6cd74aec4..f84464e049 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -5,15 +5,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.11 1999/02/13 23:21:17 momjian Exp $
+ * $Id: async.h,v 1.12 1999/07/14 01:20:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ASYNC_H
 #define ASYNC_H
 
-#include <postgres.h>
-
 /* notify-related SQL statements */
 extern void Async_Notify(char *relname);
 extern void Async_Listen(char *relname, int pid);
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 48cec93bd7..61f40cbff3 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.8 1999/03/16 03:24:18 momjian Exp $
+ * $Id: dbcommands.h,v 1.9 1999/07/14 01:20:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DBCOMMANDS_H
 #define DBCOMMANDS_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/user.h b/src/include/commands/user.h
index edf836e5bb..3830c11045 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -10,6 +10,9 @@
 #ifndef USER_H
 #define USER_H
 
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"
+
 extern void DefineUser(CreateUserStmt *stmt, CommandDest);
 extern void AlterUser(AlterUserStmt *stmt, CommandDest);
 extern void RemoveUser(char *user, CommandDest);
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index f946188567..b456003f00 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,18 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.20 1999/05/25 22:42:43 momjian Exp $
+ * $Id: vacuum.h,v 1.21 1999/07/14 01:20:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VACUUM_H
 #define VACUUM_H
 
+#include "fmgr.h"
 #include "access/funcindex.h"
 #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"
 
 
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 0613a976e6..14aacc8bd3 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.8 1999/02/23 07:39:40 thomas Exp $
+ * $Id: execdebug.h,v 1.9 1999/07/14 01:20:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
-#include "access/printtup.h"
-
 /* ----------------------------------------------------------------
  *		debugging defines.
  *
@@ -319,8 +317,6 @@ extern int	NIndexTupleInserted;
  */
 #ifdef EXEC_MERGEJOINDEBUG
 
-#include "nodes/print.h"
-
 #define MJ_nodeDisplay(l)				nodeDisplay(l)
 #define MJ_printf(s)					printf(s)
 #define MJ1_printf(s, p)				printf(s, p)
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 2046dd45cb..3e7988aa09 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -3,13 +3,14 @@
  * spi.c
  *				Server Programming Interface private declarations
  *
- * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.4 1999/05/25 16:13:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.5 1999/07/14 01:20:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SPI_PRIV_H
 #define SPI_PRIV_H
 
+#include "executor/spi.h"
 #include "catalog/pg_type.h"
 #include "access/printtup.h"
 
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index ea603556c2..b4e03c08e0 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.13 1999/05/10 15:17:17 momjian Exp $
+ * $Id: hba.h,v 1.14 1999/07/14 01:20:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -13,8 +13,7 @@
 
 #include <netinet/in.h>
 
-#include "libpq/libpq-be.h"
-
+#include "libpq/pqcomm.h"
 
 #define CONF_FILE "pg_hba.conf"
  /* Name of the config file  */
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index c007560f41..a30e985a90 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -1,11 +1,9 @@
-/* $Id: pg_wchar.h,v 1.9 1999/07/11 22:47:19 ishii Exp $ */
+/* $Id: pg_wchar.h,v 1.10 1999/07/14 01:20:20 momjian Exp $ */
 
 #ifndef PG_WCHAR_H
 #define PG_WCHAR_H
 
 #include <sys/types.h>
-#include "postgres.h"
-#include "miscadmin.h"			/* for getdatabaseencoding() */
 
 #define SQL_ASCII 0				/* SQL/ASCII */
 #define EUC_JP 1				/* EUC for Japanese */
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 0efab4755f..5e9e16e51d 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -7,6 +7,9 @@
 #ifndef SUBSELECT_H
 #define SUBSELECT_H
 
+#include "nodes/pg_list.h"
+#include "nodes/plannodes.h"
+
 extern int	PlannerQueryLevel;	/* level of current query */
 extern List *PlannerInitPlan;	/* init subplans for current query */
 extern List *PlannerParamVar;	/* to get Var from Param->paramid */
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 6b634f13d9..a8ce037d59 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.12 1999/05/25 22:43:17 momjian Exp $
+ * $Id: parse_coerce.h,v 1.13 1999/07/14 01:20:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_COERCE_H
 #define PARSE_COERCE_H
 
+#include "nodes/pg_list.h"
+#include "parser/parse_node.h"
+
 typedef enum CATEGORY
 {
 	INVALID_TYPE,
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 240deeb65f..5f583aded3 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.15 1999/06/04 02:19:44 tgl Exp $
+ * $Id: catcache.h,v 1.16 1999/07/14 01:20:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #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/datetime.h b/src/include/utils/datetime.h
index a291c2eee6..fd87896b52 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.7 1999/02/13 23:22:16 momjian Exp $
+ * $Id: datetime.h,v 1.8 1999/07/14 01:20:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DATETIME_H
 #define DATETIME_H
 
-#include "utils/dt.h"
-
 typedef int32 DateADT;
 
 typedef float8 TimeADT;
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 20294073f1..754d023d2e 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.28 1999/06/17 15:15:59 momjian Exp $
+ * $Id: memutils.h,v 1.29 1999/07/14 01:20:29 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -26,6 +26,11 @@
 #ifndef MEMUTILS_H
 #define MEMUTILS_H
 
+/*
+ *	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/numeric.h b/src/include/utils/numeric.h
index 2cbf5f0c72..42daf5e4a5 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6 1999/05/25 22:43:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.7 1999/07/14 01:20:30 momjian Exp $
  *
  * ----------
  */
@@ -13,9 +13,6 @@
 #ifndef _PG_NUMERIC_H_
 #define _PG_NUMERIC_H_
 
-#include "postgres.h"
-
-
 /* ----------
  * The hardcoded limits and defaults of the numeric data type
  * ----------
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 69ad079bb2..5ea3d9bb84 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.9 1999/05/25 16:14:56 momjian Exp $
+ * $Id: palloc.h,v 1.10 1999/07/14 01:20:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PALLOC_H
 #define PALLOC_H
 
-#include "c.h"
-
 #ifdef PALLOC_IS_MALLOC
 
 #define palloc(s)	  malloc(s)
@@ -27,8 +25,6 @@
  * In the case we use memory contexts, use macro's for palloc() etc.
  * ----------
  */
-#include "utils/mcxt.h"
-
 #define palloc(s)	  ((void *)MemoryContextAlloc(CurrentMemoryContext,(Size)(s)))
 #define pfree(p)	  MemoryContextFree(CurrentMemoryContext,(Pointer)(p))
 #define repalloc(p,s) ((void *)MemoryContextRealloc(CurrentMemoryContext,(Pointer)(p),(Size)(s)))
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index c68020ac08..43941fd648 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "utils/trace.h"
 
 extern char *ps_status_buffer;
 
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 3174026ca5..dcfaf16e95 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -17,8 +17,6 @@
 #include <time.h>
 #include <stdarg.h>
 
-#include "postgres.h"
-
 #ifdef ELOG_TIMESTAMPS
 char	   *tprintf_timestamp(void);