diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 626ffd1457..ad1c7b252c 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.53 1999/06/12 14:07:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.54 1999/07/15 22:38:31 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -20,15 +20,9 @@
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <access/htup.h>
-#include <access/transam.h>
-#include <access/tupmacs.h>
 #include <catalog/pg_type.h>
-#include <storage/bufpage.h>
-#include <utils/memutils.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 5c779bcf6c..61b1ae483e 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.33 1999/02/13 23:14:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.34 1999/07/15 22:38:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,13 +16,10 @@
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <access/ibit.h>
 #include <access/itup.h>
-#include <access/tupmacs.h>
 #include <catalog/pg_type.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index c2387dae24..0d3f4bac42 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,18 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.21 1999/02/13 23:14:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.22 1999/07/15 22:38:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
-#include <fmgr.h>
 
-#include <access/htup.h>
 #include <access/iqual.h>
-#include <access/itup.h>
-#include <access/skey.h>
 #include <executor/execdebug.h>
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index d2d990421b..2313e3e6c9 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47 1999/05/25 22:40:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.48 1999/07/15 22:38:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,11 +17,9 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "access/heapam.h"
 #include "access/printtup.h"
 #include "catalog/pg_type.h"
-#include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 7dd9b6a920..ed95c0dfb8 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.14 1999/05/25 16:06:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.15 1999/07/15 22:38:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <fmgr.h>
 #include <access/skey.h>
 
 /*
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 5692129d9e..27ffc2aec3 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50 1999/05/25 22:40:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.51 1999/07/15 22:38:33 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -24,11 +24,9 @@
 #include <nodes/parsenodes.h>
 #include <parser/parse_type.h>
 #include <utils/builtins.h>
-#include <utils/fcache.h>
 #include <utils/syscache.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index bf2499fa05..2e905427d8 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -13,7 +13,6 @@
 
 #include <postgres.h>
 
-#include <fmgr.h>
 #include <catalog/pg_index.h>
 #include <access/genam.h>
 #include <access/gist.h>
@@ -21,14 +20,9 @@
 #include <access/heapam.h>
 #include <catalog/index.h>
 #include <executor/executor.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <storage/lmgr.h>
 #include <utils/syscache.h>
-#include <utils/tqual.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 665bc83035..07dbd26947 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -13,16 +13,10 @@
 
 #include <postgres.h>
 
-#include <access/relscan.h>
-#include <storage/bufpage.h>
-#include <access/sdir.h>
-#include <access/itup.h>
 #include <access/gist.h>
 #include <executor/execdebug.h>
-#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index d26387d828..2fe9222b2d 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -15,13 +15,8 @@
 #include <access/gist.h>
 #include <access/gistscan.h>
 #include <access/genam.h>
-#include <access/rtree.h>
-#include <storage/bufmgr.h>
-#include <access/giststrat.h>
-#include <storage/lmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 65d04658c5..525168b836 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.26 1999/05/25 16:06:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.27 1999/07/15 22:38:35 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -22,11 +22,9 @@
 #include <access/heapam.h>
 #include <access/genam.h>
 #include <catalog/index.h>
-#include <storage/bufmgr.h>
 #include <miscadmin.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 1f607dcb3f..7ccaf1ed75 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18 1999/05/25 22:40:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.19 1999/07/15 22:38:35 momjian Exp $
  *
  * NOTES
  *	  These functions are stored in pg_amproc.	For each operator class
@@ -19,7 +19,6 @@
 #include "postgres.h"
 
 #include "access/hash.h"
-#include "utils/int8.h"
 
 uint32
 hashint2(int16 key)
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index f1d5d56013..a4d51c2d1d 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.15 1999/02/13 23:14:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.16 1999/07/15 22:38:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
 
 static InsertIndexResult _hash_insertonpg(Relation rel, Buffer buf, int keysz, ScanKey scankey, HashItem hitem, Buffer metabuf);
 static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey itup_scankey, Size itemsize, HashItem hitem);
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index ab599abf05..3fb38df041 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.20 1999/02/13 23:14:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -17,11 +17,8 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index bcda5f85e7..0dec4c1fd8 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.20 1999/05/25 16:06:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -26,14 +26,10 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <storage/bufmgr.h>
 #include <miscadmin.h>
-#include <utils/memutils.h>
-#include <storage/lmgr.h>
 #include <access/genam.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 5e00180c60..9a868fed21 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.17 1999/02/13 23:14:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.18 1999/07/15 22:38:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,8 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 91c18729ff..72a29c1c19 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,15 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.13 1999/02/13 23:14:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.14 1999/07/15 22:38:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <access/hash.h>
-#include <access/istrat.h>
 
 /*
  *	only one valid strategy for hash tables: equality.
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3d420f8d2f..6948145b61 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.17 1999/07/15 15:18:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.18 1999/07/15 22:38:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,12 +15,9 @@
 #include <postgres.h>
 
 #include <access/hash.h>
-#include <fmgr.h>
-#include <utils/memutils.h>
 #include <access/iqual.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 6c5bfa3531..232149c71e 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.48 1999/07/15 15:18:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.49 1999/07/15 22:38:40 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -75,23 +75,17 @@
 
 #include <postgres.h>
 
-#include <storage/bufpage.h>
 #include <access/heapam.h>
 #include <miscadmin.h>
 #include <utils/relcache.h>
 #include <access/valid.h>
 #include <access/hio.h>
-#include <storage/lmgr.h>
 #include <storage/smgr.h>
 #include <catalog/catalog.h>
-#include <access/transam.h>
-#include <access/xact.h>
 #include <utils/inval.h>
-#include <utils/memutils.h>
 #include <utils/builtins.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index c71b71e6e1..1a680d8d70 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,19 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.22 1999/07/03 01:56:16 momjian Exp $
+ *	  $Id: hio.c,v 1.23 1999/07/15 22:38:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <storage/bufpage.h>
 #include <access/hio.h>
-#include <access/htup.h>
 #include <access/heapam.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
 
 /*
  * amputunique	- place tuple at tid
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 222af071dd..e9e87664dd 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.17 1999/07/15 15:18:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
  *
  * NOTES
  *	  initam should be moved someplace else.
@@ -23,7 +23,6 @@
 #include <access/heapam.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 70b9ae2a4b..517eb93357 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.17 1999/05/25 16:07:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -46,12 +46,9 @@
 
 #include <postgres.h>
 
-#include <utils/catcache.h>
 #include <access/genam.h>
-#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 59ebb29e2e..7d59e2b128 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.32 1999/07/15 15:18:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.33 1999/07/15 22:38:43 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -67,8 +67,6 @@
 
 #include <access/genam.h>
 #include <utils/relcache.h>
-#include <fmgr.h>
-#include <storage/lmgr.h>
 #include <access/heapam.h>
 
 /* ----------------
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 268df6946e..ad0215dfb4 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33 1999/06/19 04:54:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.34 1999/07/15 22:38:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,6 @@
 #include "catalog/pg_index.h"
 #include "catalog/pg_operator.h"
 #include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/memutils.h"		/* could have been access/itup.h */
 
 #ifdef USE_ASSERT_CHECKING
 static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 505d4ab55d..df164bd6ff 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24 1999/05/25 22:40:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.25 1999/07/15 22:38:45 momjian Exp $
  *
  *	NOTES
  *		These functions are stored in pg_amproc.  For each operator class
@@ -25,7 +25,6 @@
 #include <postgres.h>
 
 #include <utils/builtins.h>
-#include <utils/nabstime.h>
 
 int32
 btint2cmp(int16 a, int16 b)
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index d71cf12d4a..b4d3994550 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,24 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.44 1999/07/15 15:18:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.45 1999/07/15 22:38:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <utils/memutils.h>
-#include <storage/bufpage.h>
 #include <access/nbtree.h>
 #include <access/heapam.h>
-#include <access/xact.h>
-#include <storage/bufmgr.h>
-#include <access/transam.h>
-#include <fmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 436edadcf0..522692ba9f 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.26 1999/07/15 15:18:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.27 1999/07/15 22:38:46 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -24,14 +24,10 @@
 
 #include <postgres.h>
 
-#include <storage/bufpage.h>
 #include <access/nbtree.h>
 #include <miscadmin.h>
-#include <storage/lmgr.h>
-#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 59fa09094e..5961ebf4ec 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.41 1999/06/07 15:14:54 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.42 1999/07/15 22:38:47 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -19,8 +19,6 @@
 #include <postgres.h>
 
 #include <access/genam.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
 #include <access/nbtree.h>
 #include <executor/executor.h>
 #include <access/heapam.h>
@@ -28,14 +26,11 @@
 #include <miscadmin.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
 
 #ifdef BTREE_BUILD_STATS
-#include <tcop/tcopprot.h>
-#include <utils/trace.h>
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index eea869776d..fbb6046ff7 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.25 1999/07/15 15:18:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.26 1999/07/15 22:38:48 momjian Exp $
  *
  *
  * NOTES
@@ -29,8 +29,6 @@
 
 #include <postgres.h>
 
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
 #include <access/nbtree.h>
 
 typedef struct BTScanListData
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 17ac151acc..fd98e18fac 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.47 1999/07/15 15:18:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.48 1999/07/15 22:38:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,14 +15,9 @@
 #include <postgres.h>
 
 #include <access/genam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
 #include <access/nbtree.h>
-#include <catalog/pg_proc.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 30aca9e088..1a90f8322f 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.42 1999/07/15 15:18:41 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.43 1999/07/15 22:38:49 momjian Exp $
  *
  * NOTES
  *
@@ -52,19 +52,13 @@
 #include "postgres.h"
 
 #include "access/nbtree.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
-#include "utils/memutils.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
 
 #ifdef BTREE_BUILD_STATS
-#include "tcop/tcopprot.h"
-#include <utils/trace.h>
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index 902601a3ba..e1027215bb 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.8 1999/02/13 23:14:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.9 1999/07/15 22:38:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include <postgres.h>
 
 #include <access/istrat.h>
-#include <storage/bufpage.h>
 #include <access/nbtree.h>
 
 /*
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 5368c090f9..2a17881812 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.29 1999/07/15 15:18:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.30 1999/07/15 22:38:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,18 +15,14 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "access/iqual.h"
 #include "access/istrat.h"
 #include "access/nbtree.h"
 #include "executor/execdebug.h"
-#include "fmgr.h"
-#include "storage/bufpage.h"
 
 extern int	NIndexTupleProcessed;
 
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 7f2c4b9131..212ddf79b1 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,22 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.15 1999/07/15 15:18:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.16 1999/07/15 22:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <storage/bufmgr.h>
-#include <access/sdir.h>
-#include <access/relscan.h>
 #include <access/iqual.h>
 #include <access/rtree.h>
-#include <storage/bufpage.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 36e971dc67..cfae3bae75 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.20 1999/07/15 15:18:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.21 1999/07/15 22:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,8 @@
 #include <postgres.h>
 
 #include <utils/builtins.h>
-#include <utils/geo_decls.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index f62a4bf648..7c5f6f4243 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.32 1999/05/25 16:07:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.33 1999/07/15 22:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,18 +16,12 @@
 
 #include <access/genam.h>
 #include <catalog/index.h>
-#include <access/rtscan.h>
-#include <storage/lmgr.h>
 #include <access/rtree.h>
-#include <storage/bufmgr.h>
 #include <utils/geo_decls.h>
 #include <executor/executor.h>
 #include <access/heapam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 1e473ded8b..5a7e15b07d 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,22 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.25 1999/07/15 15:18:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.26 1999/07/15 22:38:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <storage/bufmgr.h>
 #include <access/genam.h>
-#include <storage/lmgr.h>
-#include <storage/bufpage.h>
 #include <access/rtree.h>
-#include <access/rtstrat.h>
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 6f838a4a4a..95c62a7ea6 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.11 1999/02/13 23:14:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.12 1999/07/15 22:38:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <utils/rel.h>
 #include <access/rtree.h>
 #include <access/istrat.h>
 
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 5cbf8123e7..020dd389dd 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.28 1999/07/15 15:18:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.29 1999/07/15 22:38:53 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -18,11 +18,8 @@
 
 #include <postgres.h>
 
-#include <access/transam.h>
-#include <access/xact.h>
 #include <access/heapam.h>
 #include <catalog/catname.h>
-#include <storage/spin.h>
 #include <commands/vacuum.h>
 
 static int	RecoveryCheckingEnabled(void);
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index a12b1ade28..c9788f1296 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21 1999/03/30 01:37:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.22 1999/07/15 22:38:54 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -18,10 +18,8 @@
 
 #include <postgres.h>
 
-#include <access/transam.h>
 #include <utils/bit.h>
 #include <access/xact.h>
-#include <storage/lmgr.h>
 
 static XidStatus TransBlockGetXidStatus(Block tblock,
 					   TransactionId transactionId);
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 0ec7ede4e7..0a95088cba 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,16 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.22 1999/06/06 20:19:33 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.23 1999/07/15 22:38:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <access/transam.h>
-#include <storage/spin.h>
-#include <access/xact.h>
 #include <access/heapam.h>
 #include <catalog/catname.h>
 #include <storage/proc.h>
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index add151c30e..6a7a8201cc 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.43 1999/07/15 15:18:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.44 1999/07/15 22:38:54 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -144,15 +144,11 @@
  */
 #include <postgres.h>
 
-#include <access/xact.h>
 #include <utils/inval.h>
 #include <utils/portal.h>
-#include <access/transam.h>
-#include <storage/fd.h>
 #include <storage/proc.h>
 #include <catalog/heap.h>
 #include <utils/relcache.h>
-#include <miscadmin.h>
 #include <commands/async.h>
 #include <commands/sequence.h>
 #include <libpq/be-fsstubs.h>
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 15c684f756..35da114e31 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.61 1999/07/15 15:18:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.62 1999/07/15 22:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include <setjmp.h>
 #include <string.h>
 #ifdef __CYGWIN32__
-#include <getopt.h>
 #endif
 
 #define BOOTSTRAP_INCLUDE		/* mask out stuff in tcop/tcopprot.h */
@@ -26,61 +25,20 @@
 #include "postgres.h"
 
 #include "miscadmin.h"
-#include "fmgr.h"
 
-#include "access/attnum.h"
-#include "access/funcindex.h"
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "access/tupdesc.h"
-#include "access/xact.h"
 #include "bootstrap/bootstrap.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
-#include "executor/execdesc.h"
-#include "executor/hashjoin.h"
-#include "executor/tuptable.h"
 #include "libpq/pqsignal.h"
-#include "nodes/execnodes.h"
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/params.h"
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "rewrite/prs2lock.h"
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-#include "storage/itemptr.h"
-#include "storage/lock.h"
-#include "storage/off.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "tcop/dest.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#include "utils/geo_decls.h"
-#include "utils/hsearch.h"
 #include "utils/lsyscache.h"
-#include "utils/nabstime.h"
 #include "utils/portal.h"
-#include "utils/rel.h"
 
 #ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
 #endif
 
 #define ALLOC(t, c)		(t *)calloc((unsigned)(c), sizeof(t))
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index a5f9bf9728..4f431fdfb4 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.22 1999/06/19 05:05:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.23 1999/07/15 22:38:57 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -19,8 +19,6 @@
 
 #include "utils/acl.h"			/* where declarations for this file go */
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/tupmacs.h"
 #include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
@@ -30,14 +28,9 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_func.h"
-#include "storage/bufmgr.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 #include "miscadmin.h"
 
 static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode);
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index e6486d336b..4e4354b4ef 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.90 1999/07/15 15:18:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.91 1999/07/15 22:38:58 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -40,30 +40,19 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_ipl.h"
 #include "catalog/pg_relcheck.h"
-#include "catalog/pg_type.h"
 #include "commands/trigger.h"
-#include "fmgr.h"
-#include "nodes/plannodes.h"
 #include "optimizer/tlist.h"
 #include "parser/parse_expr.h"
-#include "parser/parse_node.h"
-#include "parser/parse_target.h"
-#include "parser/parse_type.h"
 #include "parser/parse_coerce.h"
 #include "rewrite/rewriteRemove.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
-#include "utils/catcache.h"
 #include "utils/builtins.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 #include "utils/temprel.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 68abfc7b88..8e87a966d5 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.82 1999/07/15 15:18:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.83 1999/07/15 22:38:58 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -20,12 +20,9 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "access/htup.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
-#include "access/xact.h"
 #include "bootstrap/bootstrap.h"
-#include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
@@ -34,23 +31,17 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
-#include "fmgr.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
 #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/relcache.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 #include "utils/temprel.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index a7a1dda444..21ced7031b 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.38 1999/05/25 16:08:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.39 1999/07/15 22:38:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,12 +23,7 @@
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
-#include "fmgr.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
-#include "storage/bufmgr.h"
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "utils/temprel.h"
 
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index ef9b9c3afb..96863e8a3f 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.20 1999/02/13 23:14:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.21 1999/07/15 22:38:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,16 +15,13 @@
 
 #include <access/heapam.h>
 #include <utils/builtins.h>
-#include <fmgr.h>
 #include <catalog/catname.h>
 #include <utils/syscache.h>
-#include <catalog/pg_operator.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_type.h>
 #include <catalog/pg_aggregate.h>
 #include <miscadmin.h>
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index a8ce33d7bc..e45b8143a8 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.38 1999/07/15 15:18:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.39 1999/07/15 22:38:59 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -19,20 +19,14 @@
 #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"
-#include "storage/bufmgr.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 9c79eec956..a0fca3ec7d 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,23 +7,19 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.30 1999/07/15 15:18:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.31 1999/07/15 22:38:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/relscan.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "miscadmin.h"
-#include "optimizer/internal.h"
 #include "optimizer/planner.h"
-#include "parser/parse_node.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/fmgrtab.h"
@@ -33,7 +29,6 @@
 #include "parser/parse_type.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 54856d4b76..e1461bcb98 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,28 +7,22 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.37 1999/05/25 16:08:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.38 1999/07/15 22:38:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/relscan.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "miscadmin.h"
 #include "parser/parse_func.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index 6eddfdccfa..a07c1423d7 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -9,7 +9,7 @@
  *	doesn't work! - jolly 8/19/95
  *
  *
- *	$Id: version.c,v 1.19 1999/05/25 16:08:32 momjian Exp $
+ *	$Id: version.c,v 1.20 1999/07/15 22:39:03 momjian Exp $
  *
  * NOTES
  *	At the point the version is defined, 2 physical relations are created
@@ -25,12 +25,6 @@
 
 #include <postgres.h>
 
-#include <access/heapam.h>
-#include <utils/builtins.h>
-#include <commands/version.h>
-#include <access/xact.h>		/* for GetCurrentXactStartTime */
-#include <parser/parse_node.h>
-#include <tcop/tcopprot.h>
 
 #define MAX_QUERY_LEN 1024
 
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 0e3cb83aa9..ffb2998c35 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.47 1999/05/25 16:08:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.48 1999/07/15 22:38:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -87,18 +87,12 @@
 
 #include "commands/async.h"
 #include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/xact.h"
 #include "catalog/catname.h"
 #include "catalog/pg_listener.h"
-#include "fmgr.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
-#include "tcop/dest.h"
 #include "utils/syscache.h"
 #include <utils/trace.h>
 #include <utils/ps_status.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 7eab1d213a..a58cc85d15 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.40 1999/07/15 15:18:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.41 1999/07/15 22:39:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,30 +22,18 @@
 
 #include <postgres.h>
 
-#include <catalog/pg_index.h>
 #include <catalog/heap.h>
 #include <access/heapam.h>
 #include <access/genam.h>
-#include <access/xact.h>
-#include <catalog/catname.h>
 #include <utils/syscache.h>
 #include <catalog/index.h>
-#include <catalog/indexing.h>
 #include <catalog/pg_type.h>
-#include <commands/copy.h>
 #include <commands/cluster.h>
 #include <commands/rename.h>
-#include <storage/bufmgr.h>
-#include <miscadmin.h>
-#include <tcop/dest.h>
-#include <commands/command.h>
 #include <utils/builtins.h>
-#include <utils/excid.h>
 #include <catalog/pg_proc.h>
-#include <catalog/pg_class.h>
 #include <optimizer/internal.h>
 #ifndef NO_SECURITY
-#include <utils/acl.h>
 #endif	 /* !NO_SECURITY */
 
 static Relation copy_heap(Oid OIDOldHeap);
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 0ff886ded5..7b4936387c 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.48 1999/07/15 15:18:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.49 1999/07/15 22:39:00 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -23,7 +23,6 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/relscan.h"
 #include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
@@ -31,13 +30,9 @@
 #include "commands/command.h"
 #include "executor/execdefs.h"
 #include "executor/executor.h"
-#include "fmgr.h"
 #include "optimizer/prep.h"
 #include "utils/acl.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/portal.h"
-#include "utils/relcache.h"
 #include "utils/temprel.h"
 #include "utils/syscache.h"
 #include "miscadmin.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index d7dced4c16..b1d4901fc6 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.81 1999/07/03 00:32:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.82 1999/07/15 22:39:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,17 +17,13 @@
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <tcop/dest.h>
-#include <fmgr.h>
 #include <miscadmin.h>
 #include <utils/builtins.h>
 #include <utils/acl.h>
 #include <sys/stat.h>
 #include <catalog/pg_index.h>
 #include <utils/syscache.h>
-#include <utils/memutils.h>
 #include <executor/executor.h>
-#include <access/transam.h>
 #include <catalog/index.h>
 #include <access/genam.h>
 #include <catalog/pg_type.h>
@@ -35,11 +31,9 @@
 #include <catalog/pg_shadow.h>
 #include <commands/copy.h>
 #include "commands/trigger.h"
-#include <storage/fd.h>
 #include <libpq/libpq.h>
 
 #ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
 #endif
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index e9c5fdcd89..252763a48f 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.41 1999/05/25 16:08:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.42 1999/07/15 22:39:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,8 @@
 
 #include <postgres.h>
 
-#include <utils/rel.h>
-#include <nodes/parsenodes.h>
 #include <catalog/heap.h>
 #include <commands/creatinh.h>
-#include <access/xact.h>
 #include <access/heapam.h>
 #include <utils/syscache.h>
 #include <catalog/catname.h>
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 06f0a8115a..f3959bb403 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.35 1999/05/25 16:08:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.36 1999/07/15 22:39:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,19 +19,12 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
-#include "fmgr.h"
 #include "miscadmin.h"			/* for DataDir */
-#include "storage/bufmgr.h"
-#include "storage/fd.h"
-#include "storage/lmgr.h"
 #include "tcop/tcopprot.h"
 #include "commands/dbcommands.h"
-#include "utils/rel.h"
 #include "utils/syscache.h"
 
 
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index dd83129be4..5db5334f11 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- *	  $Id: explain.c,v 1.38 1999/06/17 23:45:32 tgl Exp $
+ *	  $Id: explain.c,v 1.39 1999/07/15 22:39:01 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -12,15 +12,11 @@
 
 #include <postgres.h>
 
-#include <nodes/plannodes.h>
 #include <nodes/print.h>
-#include <tcop/tcopprot.h>
 #include <lib/stringinfo.h>
 #include <commands/explain.h>
 #include <parser/parsetree.h>
-#include <parser/parse_node.h>
 #include <optimizer/planner.h>
-#include <access/xact.h>
 #include <utils/relcache.h>
 #include <rewrite/rewriteHandler.h>
 
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index e7f047477c..91abbaf332 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.4 1999/05/25 16:08:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.5 1999/07/15 22:39:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <postgres.h>
 
-#include <access/attnum.h>
 #include <access/genam.h>
 #include <access/heapam.h>
 #include <utils/builtins.h>
@@ -26,17 +25,10 @@
 #include <catalog/pg_proc.h>
 #include <catalog/pg_type.h>
 #include <catalog/pg_opclass.h>
-#include <nodes/plannodes.h>
-#include <nodes/primnodes.h>
-#include <nodes/relation.h>
-#include <utils/relcache.h>
-#include <utils/lsyscache.h>
 #include <commands/defrem.h>
 #include <parser/parsetree.h>	/* for getrelid() */
 #include <optimizer/prep.h>
 #include <optimizer/clauses.h>
-#include <storage/lmgr.h>
-#include <fmgr.h>
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 7ae4c2c176..e28156aaa8 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.33 1999/05/25 16:08:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.34 1999/07/15 22:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,22 +15,16 @@
 
 #include "access/heapam.h"
 #include "catalog/catname.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/pg_language.h"
-#include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
-#include "fmgr.h"
 #include "miscadmin.h"
 #include "parser/parse_func.h"
-#include "storage/bufmgr.h"
 #include "utils/acl.h"
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index f88d29b7a0..b5a3a5d307 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,38 +7,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.26 1999/07/15 15:18:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.27 1999/07/15 22:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <access/relscan.h>
-#include <utils/builtins.h>
 #include <catalog/catname.h>
 #include <utils/syscache.h>
 #include <catalog/heap.h>
 #include <catalog/indexing.h>
 #include <catalog/catalog.h>
-#include <commands/copy.h>
 #include <commands/rename.h>
-#include <executor/execdefs.h>	/* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */
 #include <miscadmin.h>
-#include <utils/portal.h>
-#include <tcop/dest.h>
-#include <commands/command.h>
-#include <storage/bufmgr.h>
-#include <utils/excid.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_class.h>
-#include <optimizer/internal.h>
 #include <optimizer/prep.h>		/* for find_all_inheritors */
 #ifndef NO_SECURITY
 #include <utils/acl.h>
 #endif	 /* !NO_SECURITY */
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index a6f18e01d3..f8fbf5f570 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -11,11 +11,7 @@
 #include <postgres.h>
 #include <miscadmin.h>
 
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <storage/lmgr.h>
 #include <access/heapam.h>
-#include <nodes/parsenodes.h>
 #include <commands/creatinh.h>
 #include <commands/sequence.h>
 #include <utils/builtins.h>
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index a710888d7f..6107c4bd6f 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -10,8 +10,6 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/valid.h"
-#include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
@@ -19,12 +17,6 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
 #include "commands/trigger.h"
-#include "fmgr.h"
-#include "nodes/memnodes.h"
-#include "nodes/parsenodes.h"
-#include "storage/lmgr.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
 #include "utils/inval.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 57ac35fb1f..0419cb527b 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.28 1999/05/25 16:08:27 momjian Exp $
+ * $Id: user.c,v 1.29 1999/07/15 22:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,12 +24,8 @@
 #include <catalog/pg_shadow.h>
 #include <libpq/crypt.h>
 #include <access/heapam.h>
-#include <access/xact.h>
-#include <storage/bufmgr.h>
-#include <storage/lmgr.h>
 #include <tcop/tcopprot.h>
 #include <utils/acl.h>
-#include <utils/rel.h>
 #include <utils/syscache.h>
 #include <commands/user.h>
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index e475fba1e2..2c8cf527ac 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.111 1999/07/15 15:18:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.112 1999/07/15 22:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,25 +23,15 @@
 #include "miscadmin.h"
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/transam.h"
-#include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_index.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "commands/vacuum.h"
-#include "fmgr.h"
 #include "parser/parse_oper.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/shmem.h"
 #include "storage/smgr.h"
-#include "storage/itemptr.h"
-#include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/inval.h"
 #include "utils/portal.h"
@@ -49,7 +39,6 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_GETRUSAGE
-#include <rusagestub.h>
 #else
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 1cea214613..2176f0b6ea 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.33 1999/05/25 16:08:28 momjian Exp $
+ *	$Id: view.c,v 1.34 1999/07/15 22:39:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,14 +15,10 @@
 #include <postgres.h>
 
 #include <catalog/heap.h>
-#include <access/heapam.h>
 #include <access/xact.h>
-#include <utils/builtins.h>
-#include <nodes/relation.h>
 #include <parser/parse_relation.h>
 #include <parser/parse_type.h>
 #include <rewrite/rewriteDefine.h>
-#include <rewrite/rewriteHandler.h>
 #include <rewrite/rewriteManip.h>
 #include <rewrite/rewriteRemove.h>
 #include <commands/creatinh.h>
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 2facc9096b..4423aeeea7 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.37 1999/07/15 15:18:56 momjian Exp $
+ *	$Id: execAmi.c,v 1.38 1999/07/15 22:39:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,6 @@
 #include "postgres.h"
 
 #include "executor/executor.h"
-#include "storage/smgr.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/nodeSort.h"
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index df1864c59a..8a8d049f31 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.9 1999/02/23 07:33:09 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.10 1999/07/15 22:39:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,9 +26,6 @@
  *	 node does the actual flattening work.
  */
 #include "postgres.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/execnodes.h"
 #include "executor/executor.h"
 #include "executor/execFlatten.h"
 
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index bef6874861..d541f34825 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.18 1999/07/15 15:18:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.19 1999/07/15 22:39:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "access/heapam.h"
 #include "executor/executor.h"
-#include "nodes/relation.h"
 #include "nodes/makefuncs.h"
 
 /*-------------------------------------------------------------------------
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index d6cd6b1f84..cd411a0ede 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.89 1999/07/15 15:18:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.90 1999/07/15 22:39:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,23 +37,15 @@
 #include "executor/executor.h"
 #include "executor/execdefs.h"
 #include "executor/execdebug.h"
-#include "executor/nodeIndexscan.h"
 #include "utils/builtins.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
-#include "utils/tqual.h"
 #include "parser/parsetree.h"	/* rt_fetch() */
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
-#include "storage/smgr.h"
-#include "commands/async.h"
 /* #include "access/localam.h" */
 #include "optimizer/var.h"
 #include "access/heapam.h"
-#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 b6af1fe683..d5a218a7ce 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.54 1999/07/15 15:18:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.55 1999/07/15 22:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,16 +40,8 @@
 #include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "executor/nodeSubplan.h"
-#include "fmgr.h"
-#include "nodes/memnodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "optimizer/clauses.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/fcache.h"
 #include "utils/fcache2.h"
-#include "utils/memutils.h"
 
 
 /*
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index a41c4ff456..33d7f0bd63 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.26 1999/07/15 15:18:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.27 1999/07/15 22:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -124,11 +124,7 @@
 #include "executor/executor.h"
 #undef ExecStoreTuple
 
-#include "access/tupdesc.h"
 #include "catalog/pg_type.h"
-#include "parser/parse_type.h"
-#include "storage/bufmgr.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 0b7c220acc..6d2fb86f45 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.46 1999/07/15 15:18:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.47 1999/07/15 22:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,17 +44,10 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/itup.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
-#include "catalog/pg_type.h"
-#include "commands/command.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "fmgr.h"
-#include "optimizer/clauses.h"
-#include "parser/parsetree.h"
-#include "utils/lsyscache.h"
 #include "catalog/pg_index.h"
 
 static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 00fc00182d..1fbd578da8 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,30 +8,19 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.27 1999/07/15 15:18:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
 
-#include "catalog/pg_proc.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
-#include "nodes/params.h"
-#include "fmgr.h"
-#include "utils/fcache.h"
 #include "utils/datum.h"
-#include "utils/syscache.h"
-#include "catalog/pg_language.h"
 #include "access/heapam.h"
-#include "access/xact.h"
 #include "executor/executor.h"
 #include "executor/execdefs.h"
 #include "executor/functions.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 44a14391b4..a8535b5a98 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -18,15 +18,12 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "fmgr.h"
 
 #include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
-#include "catalog/catalog.h"
 #include "parser/parse_type.h"
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
-#include "storage/bufmgr.h"
 #include "utils/syscache.h"
 #include "optimizer/clauses.h"
 
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 745269e071..c51b92bf4f 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.20 1999/07/15 15:19:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.21 1999/07/15 22:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,6 @@
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeAppend.h"
-#include "executor/nodeIndexscan.h"
 #include "parser/parsetree.h"	/* for rt_store() macro */
 
 static bool exec_append_initialize_next(Append *node);
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index c5cb1d3523..3c25447e24 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,17 +13,15 @@
  *	  columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.27 1999/07/11 01:57:32 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
 #include "postgres.h"
-#include "fmgr.h"
 
 #include "access/heapam.h"
-#include "catalog/catalog.h"
 #include "access/printtup.h"
 #include "executor/executor.h"
 #include "executor/nodeGroup.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 3a76ef8c5d..71da86f9c5 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  *
- *	$Id: nodeHash.c,v 1.36 1999/05/25 16:08:41 momjian Exp $
+ *	$Id: nodeHash.c,v 1.37 1999/07/15 22:39:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,12 +24,10 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
-#include "utils/hsearch.h"
 #include "utils/portal.h"
 
 extern int	SortMem;
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index e494c62026..4796e118af 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.22 1999/05/25 22:41:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.23 1999/07/15 22:39:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "postgres.h"
 
-#include "executor/execdebug.h"
 #include "executor/executor.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 57f2bb9d4d..ade2a91302 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.37 1999/07/15 15:19:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.38 1999/07/15 22:39:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,12 +37,8 @@
 #include "optimizer/clauses.h"	/* for get_op, get_leftop, get_rightop */
 #include "parser/parsetree.h"	/* for rt_fetch() */
 
-#include "access/skey.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "catalog/index.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
 #include "nodes/nodeFuncs.h"
 
 /* ----------------
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index b8cd808dc0..485b527cbe 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.22 1999/05/25 16:08:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.23 1999/07/15 22:39:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,6 @@
 
 #include "executor/executor.h"
 #include "executor/nodeMaterial.h"
-#include "catalog/catalog.h"
 #include "catalog/heap.h"
 #include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
 #include "access/heapam.h"
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index bd1fe24242..6ee64a6063 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.11 1999/02/13 23:15:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.12 1999/07/15 22:39:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeNestloop.h"
-#include "executor/nodeIndexscan.h"
 
 /* ----------------------------------------------------------------
  *		ExecNestLoop(node)
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 04a1493413..a45b7f347c 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.18 1999/05/25 16:08:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.19 1999/07/15 22:39:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,6 @@
 #include "executor/nodeSeqscan.h"
 #include "access/heapam.h"
 #include "parser/parsetree.h"
-#include "nodes/print.h"
 
 static Oid InitScanRelation(SeqScan *node, EState *estate,
 				 CommonScanState *scanstate, Plan *outerPlan);
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 3f118e90cf..a198b8914a 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.20 1999/07/15 15:19:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.21 1999/07/15 22:39:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,12 +17,7 @@
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
-#include "access/heapam.h"
 #include "utils/psort.h"
-#include "catalog/catalog.h"
-#include "catalog/heap.h"
-#include "storage/bufmgr.h"
-#include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
 
 /* ----------------------------------------------------------------
  *		FormSortKeys(node)
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index ef65a7afb5..6c88bbe85e 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -16,7 +16,6 @@
 #include "access/heapam.h"
 #include "tcop/pquery.h"
 #include "executor/executor.h"
-#include "executor/execdebug.h"
 #include "executor/nodeSubplan.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 84d3238457..3693489a0d 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.20 1999/02/13 23:15:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.21 1999/07/15 22:39:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,14 +25,11 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "fmgr.h"
 
 #include "executor/executor.h"
 #include "executor/nodeUnique.h"
-#include "optimizer/clauses.h"
 #include "access/heapam.h"
 #include "access/printtup.h"	/* for getTypeOutAndElem() */
-#include "utils/builtins.h"		/* for namecpy() */
 
 /* ----------------------------------------------------------------
  *		ExecIdenticalTuples
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index bda75d6497..b54fc62b42 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,15 +3,12 @@
  * spi.c
  *				Server Programming Interface
  *
- * $Id: spi.c,v 1.39 1999/05/25 22:41:02 momjian Exp $
+ * $Id: spi.c,v 1.40 1999/07/15 22:39:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "executor/spi.h"
 #include "executor/spi_priv.h"
-#include "catalog/pg_type.h"
 #include "access/printtup.h"
-#include "fmgr.h"
 
 static Portal _SPI_portal = (Portal) NULL;
 static _SPI_connection *_SPI_stack = NULL;
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index 92fdf3340f..8dabbc658c 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.6 1999/02/13 23:15:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.7 1999/07/15 22:39:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include <postgres.h>
 
 #include <utils/bit.h>
-#include <utils/memutils.h>
 
 void
 BitArraySetBit(BitArray bitArray, BitIndex bitIndex)
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index fc904fa3e9..c57b43be8e 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.8 1999/02/13 23:15:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.9 1999/07/15 22:39:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <postgres.h>
 
 #include <utils/memutils.h>
-#include <utils/hsearch.h>
 #include <lib/hasht.h>
 
 /* -----------------------------------
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index b2b62795bc..f4522aaa85 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.10 1999/02/13 23:15:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.11 1999/07/15 22:39:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,12 +15,6 @@
 
 #include <postgres.h>
 
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
-#include <nodes/plannodes.h>
-#include <nodes/relation.h>
-#include <lib/lispsort.h>
-#include <lib/qsort.h>
 
 #ifdef NOT_USED
 /*
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 9b232e705d..326948faf0 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.26 1999/07/15 15:19:03 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.27 1999/07/15 22:39:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,13 +34,6 @@
 #include <lib/dllist.h>
 #include <libpq/libpq.h>
 #include <access/heapam.h>
-#include <access/htup.h>
-#include <storage/buf.h>
-#include <utils/memutils.h>
-#include <fmgr.h>
-#include <utils/exc.h>
-#include <utils/syscache.h>
-#include <catalog/pg_type.h>
 #include <catalog/catalog.h>
 #include <access/printtup.h>
 
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 871a7923a3..25e87aae64 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.36 1999/07/15 15:19:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.37 1999/07/15 22:39:13 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -37,14 +37,8 @@
 
 #include <postgres.h>
 
-#include <lib/dllist.h>
-#include <libpq/libpq.h>
 #include <libpq/libpq-fs.h>
-#include <nodes/nodes.h>
-#include <utils/memutils.h>
-#include <lib/fstack.h>
 #include <catalog/pg_shadow.h>	/* for superuser() */
-#include <storage/fd.h>			/* for O_ */
 #include <storage/large_object.h>
 #include <libpq/be-fsstubs.h>
 
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 4b035311c3..ea48d6ff62 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.20 1999/02/13 23:15:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,17 +22,11 @@
  */
 #include <postgres.h>
 
-#include <nodes/pg_list.h>
-#include <tcop/dest.h>
 #include <tcop/fastpath.h>
 #include <tcop/tcopprot.h>
-#include <lib/dllist.h>
 #include <libpq/libpq.h>
-#include <fmgr.h>
-#include <utils/exc.h>
 #include <utils/builtins.h>
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 86f5ef2a99..a1073fa357 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.20 1999/07/15 15:19:05 momjian Exp $
+ * $Id: crypt.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include "libpq/crypt.h"
 
 #ifdef HAVE_CRYPT_H
-#include <crypt.h>
 #endif
 
 char	  **pwd_cache = NULL;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index dd64971c99..b6fa91e626 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,7 +5,7 @@
  *	  wherein you authenticate a user by seeing what IP address the system
  *	  says he comes from and possibly using ident).
  *
- *	$Id: hba.c,v 1.43 1999/05/25 16:08:59 momjian Exp $
+ *	$Id: hba.c,v 1.44 1999/07/15 22:39:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,10 +23,6 @@
 #include <postgres.h>
 #include <miscadmin.h>
 #include <libpq/libpq.h>
-#include <libpq/pqcomm.h>
-#include <libpq/hba.h>
-#include <port/inet_aton.h>		/* For inet_aton() */
-#include <storage/fd.h>
 
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 98c05d3074..1dd9382998 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.21 1999/05/25 16:09:00 momjian Exp $
+ * $Id: password.c,v 1.22 1999/07/15 22:39:14 momjian Exp $
  *
  */
 
@@ -9,11 +9,9 @@
 #include <miscadmin.h>
 #include <libpq/password.h>
 #include <libpq/libpq.h>
-#include <storage/fd.h>
 #include <string.h>
 #include <unistd.h>
 #ifdef HAVE_CRYPT_H
-#include <crypt.h>
 #endif
 
 int
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 6f7dca5cb5..7a7f1dbfc9 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.22 1999/05/25 16:09:01 momjian Exp $
+ *	$Id: portal.c,v 1.23 1999/07/15 22:39:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,9 +55,7 @@
 
 #include <postgres.h>
 
-#include <lib/dllist.h>
 #include <libpq/libpq.h>		/* where the declarations go */
-#include <utils/exc.h>
 
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 19e4b2dc63..81e1fea503 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.16 1999/06/19 05:00:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.17 1999/07/15 22:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,6 @@
 #include <postgres.h>
 
 #include <libpq/libpq.h>		/* where the declarations go */
-#include <utils/exc.h>
 
 PortalEntry **portals = (PortalEntry **) NULL;
 size_t		portals_array_size = 0;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 1c9f7c2945..5bff53e54f 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.73 1999/07/07 17:17:47 momjian Exp $
+ *	$Id: pqcomm.c,v 1.74 1999/07/15 22:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,10 +81,6 @@
 
 #include "libpq/libpq.h"		/* where my declarations go */
 #include "miscadmin.h"
-#include "libpq/pqsignal.h"
-#include "libpq/auth.h"
-#include "storage/ipc.h"
-#include "utils/trace.h"
 
 #ifndef SOMAXCONN
 #define SOMAXCONN 5				/* from Linux listen(2) man page */
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 529b3115bd..16112bfdf0 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.4 1999/05/25 16:09:02 momjian Exp $
+ *	$Id: pqformat.c,v 1.5 1999/07/15 22:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,11 +48,9 @@
 #include "libpq/pqformat.h"
 #include "libpq/libpq.h"
 #ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
 #endif
 #include <string.h>
 #ifdef HAVE_ENDIAN_H
-#include <endian.h>
 #endif
 
 #ifndef BYTE_ORDER
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index 159ebd9f4b..ec516026bf 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.19 1999/02/13 23:15:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.20 1999/07/15 22:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,6 @@
 #include <errno.h>
 
 #include <postgres.h>
-#include <miscadmin.h>
-#include <storage/ipc.h>
 #include <libpq/libpq.h>
 
 
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 50c2846815..9c46209f43 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: util.c,v 1.9 1999/05/25 16:09:03 momjian Exp $
+ *	$Id: util.c,v 1.10 1999/07/15 22:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,9 +21,7 @@
 #include <string.h>
 
 #include <postgres.h>
-#include <lib/dllist.h>
 #include <libpq/libpq.h>		/* where the declarations go */
-#include <utils/exc.h>
 
 
 /* ----------------
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 0f0ad4df29..4794c3d752 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.83 1999/07/15 15:19:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.84 1999/07/15 22:39:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,17 +16,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 
 #include "utils/syscache.h"
-#include "utils/builtins.h"		/* for namecpy */
 #include "catalog/pg_type.h"
-#include "storage/lmgr.h"
 #include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
 
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 6062857937..9eebf5cbeb 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.40 1999/07/15 15:19:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.41 1999/07/15 22:39:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,15 +15,10 @@
 
 #include "postgres.h"
 
-#include "nodes/nodes.h"
-#include "nodes/primnodes.h"
 #include "nodes/relation.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
-#include "utils/builtins.h"		/* for namestrcmp() */
 #include "utils/datum.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 4711d9b6fe..457072150b 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.20 1999/07/15 15:19:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.21 1999/07/15 22:39:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,17 +16,7 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 
-#include "utils/syscache.h"
-#include "utils/builtins.h"		/* for namecpy */
-#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 e58149d111..623d34d7b2 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.23 1999/07/15 15:19:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.24 1999/07/15 22:39:17 momjian Exp $
  *
  * NOTES
  *	  XXX a few of the following functions are duplicated to handle
@@ -23,9 +23,7 @@
  */
 #include <stdarg.h>
 #include "postgres.h"
-#include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
-#include "utils/builtins.h"		/* for namecpy */
 
 /*
  *	makeList
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 3d0e59329a..d64fdd8c46 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.15 1999/05/17 17:03:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.16 1999/07/15 22:39:17 momjian Exp $
  *
  * NOTES
  *	  Creator functions in POSTGRES 4.2 are generated automatically. Most of
@@ -19,9 +19,6 @@
  *	  Andrew Yu			Oct 20, 1994	file creation
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/makefuncs.h"
 
 /*
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 04c0f0f77b..4c7d25a52f 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.9 1999/02/13 23:15:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.10 1999/07/15 22:39:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,10 +16,6 @@
 
 #include "postgres.h"
 
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "nodes/nodeFuncs.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 4e8f767bbf..2dd2a5a574 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.28 1999/05/25 16:09:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.29 1999/07/15 22:39:18 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -21,16 +21,9 @@
 #include "postgres.h"
 
 #include "access/printtup.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/print.h"
 #include "parser/parsetree.h"
-#include "access/heapam.h"
 #include "utils/lsyscache.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parse_relation.h"
 #include "optimizer/clauses.h"
 
 static char *plannode_type(Plan *p);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index de226c0118..e479384e93 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.66 1999/07/15 15:19:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.67 1999/07/15 22:39:18 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -28,20 +28,11 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
 
 #include "utils/lsyscache.h"
-#include "utils/syscache.h"
 #include "catalog/pg_index.h"
-#include "catalog/pg_type.h"
 
-#include "nodes/primnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/execnodes.h"
 #include "nodes/relation.h"
 #include "nodes/readfuncs.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 721671e702..276a6cba44 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.6 1999/07/15 15:19:09 momjian Exp $
+ * $Id: geqo_copy.c,v 1.7 1999/07/15 22:39:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,16 +34,7 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo_copy.h"
 
 /* geqo_copy
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index cf0c1027ed..85cdcab638 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.7 1999/07/15 15:19:10 momjian Exp $
+* $Id: geqo_cx.c,v 1.8 1999/07/15 22:39:19 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -36,19 +36,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index c58556f739..5509775731 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.13 1999/07/15 15:19:11 momjian Exp $
+* $Id: geqo_erx.c,v 1.14 1999/07/15 22:39:19 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -33,19 +33,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index a3652e2d0b..b1250a3ef8 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.40 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_eval.c,v 1.41 1999/07/15 22:39:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,21 +30,12 @@
 #include <values.h>
 #endif
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 #include "utils/portal.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
 #include "optimizer/cost.h"
-#include "optimizer/tlist.h"
-#include "optimizer/joininfo.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
 
 /*
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index 2b821b168d..b909e59d52 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.17 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_main.c,v 1.18 1999/07/15 22:39:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,24 +23,12 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
 #include "optimizer/geqo_pool.h"
 #include "optimizer/geqo_selection.h"
-#include "optimizer/geqo_recombination.h"
-#include "optimizer/geqo_mutation.h"
 #include "optimizer/geqo_misc.h"
 
 
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 5c4079b12d..3be437ffa9 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.20 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_misc.c,v 1.21 1999/07/15 22:39:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,20 +23,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo_pool.h"
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_misc.h"
 
 static float avg_pool(Pool *pool);
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index bb007a259d..17dd57be42 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.6 1999/07/15 15:19:11 momjian Exp $
+* $Id: geqo_mutation.c,v 1.7 1999/07/15 22:39:20 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -33,18 +33,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_mutation.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 955379c270..1c054b1de0 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.6 1999/07/15 15:19:12 momjian Exp $
+* $Id: geqo_ox1.c,v 1.7 1999/07/15 22:39:20 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -35,19 +35,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index ef3b03649d..c2cb2bf355 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.6 1999/07/15 15:19:12 momjian Exp $
+* $Id: geqo_ox2.c,v 1.7 1999/07/15 22:39:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -35,19 +35,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index 330732b814..f63474c9b6 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.7 1999/07/15 15:19:13 momjian Exp $
+* $Id: geqo_pmx.c,v 1.8 1999/07/15 22:39:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -35,19 +35,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 79e237dc88..e44b282460 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.14 1999/07/15 15:19:14 momjian Exp $
+ * $Id: geqo_pool.c,v 1.15 1999/07/15 22:39:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,18 +22,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
 #include "optimizer/geqo_pool.h"
 #include "optimizer/geqo_copy.h"
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 983c01cfcc..2f04e7736a 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.7 1999/07/15 15:19:14 momjian Exp $
+* $Id: geqo_px.c,v 1.8 1999/07/15 22:39:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -35,19 +35,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index f01b59a899..d9a2a9d9f9 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.9 1999/07/15 15:19:15 momjian Exp $
+* $Id: geqo_recombination.c,v 1.10 1999/07/15 22:39:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -20,19 +20,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index 8c5301f10b..092d7164b5 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.8 1999/07/15 15:19:15 momjian Exp $
+ * $Id: geqo_selection.c,v 1.9 1999/07/15 22:39:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,18 +37,9 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo_selection.h"
 #include "optimizer/geqo_copy.h"
 #include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 15c94a112f..12a403dcd4 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.47 1999/07/15 15:19:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.48 1999/07/15 22:39:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,20 +16,14 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 #include "optimizer/internal.h"
 
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 
-#include "commands/creatinh.h"
 
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
 
 #ifdef GEQO
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index bbc9e3547e..aa70ca3a3b 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -7,17 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.20 1999/05/25 16:09:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.21 1999/07/15 22:39:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "catalog/pg_operator.h"
-#include "fmgr.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 067cfffcc9..863e1927ec 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.41 1999/07/07 09:36:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.42 1999/07/15 22:39:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,10 +27,8 @@
 #endif
 #endif
 
-#include "nodes/relation.h"
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
-#include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index 0d4b2326ba..d875931fda 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -7,15 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.16 1999/05/25 16:09:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.17 1999/07/15 22:39:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/paths.h"
 #include "optimizer/clauses.h"
 
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index b5666ffb7d..aef2fcd3df 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.58 1999/07/15 15:19:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.59 1999/07/15 22:39:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,22 +16,16 @@
 
 #include "postgres.h"
 
-#include "access/attnum.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "catalog/catname.h"
 #include "catalog/pg_amop.h"
-#include "catalog/pg_type.h"
 #include "executor/executor.h"
-#include "fmgr.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
-#include "optimizer/internal.h"
 #include "optimizer/keys.h"
 #include "optimizer/ordering.h"
 #include "optimizer/paths.h"
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 3dade2c632..51faaf228f 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38 1999/05/25 22:41:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.39 1999/07/15 22:39:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,16 +16,10 @@
 
 #include "postgres.h"
 
-#include "storage/buf_internals.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/keys.h"
 #include "optimizer/cost.h"		/* for _enable_{hashjoin,
 								 * _enable_mergejoin} */
 
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 3c6c2888ff..aa558fef1d 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,16 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.35 1999/05/26 12:55:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.36 1999/07/15 22:39:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
 #include "optimizer/paths.h"
 #include "optimizer/tlist.h"
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 8d8255cabb..64f7ddd5db 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -7,16 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.22 1999/05/25 16:09:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.23 1999/07/15 22:39:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/paths.h"
 #include "optimizer/clauses.h"
 #include "optimizer/ordering.h"
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index bbcb9e99da..80f60d33bc 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,17 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.26 1999/07/15 15:19:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.27 1999/07/15 22:39:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
-#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 
 #include "optimizer/internal.h"
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index eee8a027a8..89755d8a5c 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -7,19 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.10 1999/05/25 16:09:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.11 1999/07/15 22:39:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/paths.h"
-#include "optimizer/var.h"
 #include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index f004bb0c90..a405ffeb5e 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,16 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.40 1999/07/15 15:19:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.41 1999/07/15 22:39:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
 #include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 17ab7e85c5..e96554885c 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.58 1999/07/15 15:19:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.59 1999/07/15 22:39:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,25 +17,18 @@
 #include "postgres.h"
 
 #include <utils/syscache.h>
-#include <catalog/pg_index.h>
 
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 #include "nodes/nodeFuncs.h"
 
 #include "nodes/makefuncs.h"
 
 #include "utils/lsyscache.h"
-#include "utils/builtins.h"
 
 #include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
-#include "optimizer/planner.h"
 #include "optimizer/internal.h"
 
 
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 947ec23da6..14fe6865cf 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.32 1999/07/15 15:19:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.33 1999/07/15 22:39:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,19 +15,13 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 #include "nodes/makefuncs.h"
 
-#include "access/htup.h"
 
 #include "catalog/pg_type.h"
 
 #include "utils/lsyscache.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/planmain.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 924cb35062..35949ec953 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.38 1999/07/15 15:19:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.39 1999/07/15 22:39:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,27 +15,14 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/print.h"
-#include "nodes/relation.h"
-#include "nodes/makefuncs.h"
 
 #include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
-#include "optimizer/internal.h"
 #include "optimizer/prep.h"
 #include "optimizer/paths.h"
 #include "optimizer/clauses.h"
-#include "optimizer/keys.h"
 #include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/cost.h"
 
-#include "tcop/dest.h"
-#include "nodes/memnodes.h"
-#include "utils/lsyscache.h"
 
 static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
 static Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index ac145b5e17..7655bbf5d3 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.58 1999/07/15 15:19:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.59 1999/07/15 22:39:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,10 +16,6 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 #include "nodes/makefuncs.h"
 #include "catalog/pg_type.h"
 #include "parser/parse_expr.h"
@@ -29,20 +25,11 @@
 
 #include "optimizer/internal.h"
 #include "optimizer/planner.h"
-#include "optimizer/plancat.h"
 #include "optimizer/prep.h"
 #include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
-#include "optimizer/paths.h"
-#include "optimizer/cost.h"
 
 /* DATA STRUCTURE CREATION/MANIPULATION ROUTINES */
-#include "nodes/relation.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/joininfo.h"
-#include "optimizer/keys.h"
-#include "optimizer/ordering.h"
-#include "optimizer/pathnode.h"
 #include "optimizer/clauses.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 9d11dc4908..daa26533ae 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.51 1999/07/15 15:19:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.52 1999/07/15 22:39:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,18 +15,11 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 
 #include "nodes/nodeFuncs.h"
 #include "nodes/makefuncs.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/keys.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 2eab2d3d6d..9f1455eb9b 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -6,29 +6,18 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.19 1999/07/15 01:52:09 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.20 1999/07/15 22:39:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/subselect.h"
 #include "optimizer/planner.h"
-#include "optimizer/planmain.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/cost.h"
 
 int			PlannerQueryLevel;	/* level of current query */
 List	   *PlannerInitPlan;	/* init subplans for current query */
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index aed7372704..d7ee69f855 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.15 1999/05/25 16:09:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.16 1999/07/15 22:39:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,8 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
 #include "nodes/makefuncs.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
 
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 7c132ec447..f3a16dcb73 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.23 1999/07/15 15:19:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.24 1999/07/15 22:39:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,24 +15,16 @@
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
 
 #include "nodes/makefuncs.h"
 
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "parser/parse_type.h"
 
 #include "parser/parsetree.h"	/* for getrelid() */
 
-#include "optimizer/internal.h"
 #include "optimizer/prep.h"
 #include "optimizer/clauses.h"
-#include "optimizer/tlist.h"
 
 static List *expand_targetlist(List *tlist, Oid relid, int command_type,
 				  Index result_relation);
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index fae22f3262..b9dd4e39db 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.34 1999/07/15 15:19:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.35 1999/07/15 22:39:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,18 +16,12 @@
 
 #include "postgres.h"
 
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 #include "parser/parsetree.h"
 #include "parser/parse_clause.h"
 
 #include "utils/lsyscache.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/prep.h"
 #include "optimizer/plancat.h"
 #include "optimizer/planner.h"
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index ad320dcd04..d9aee84717 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.37 1999/06/21 01:18:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.38 1999/07/15 22:39:29 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -19,16 +19,11 @@
 #include "postgres.h"
 
 #include <catalog/pg_operator.h>
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 
-#include "catalog/pg_aggregate.h"
 
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
 
 #include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 4fe91eb865..7ae1790278 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.16 1999/05/25 22:41:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.17 1999/07/15 22:39:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,7 @@
 
 #include "postgres.h"
 
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/plancat.h"
 #include "optimizer/pathnode.h" /* where the decls go */
 
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 82602c13aa..1df8113144 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,17 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.21 1999/05/25 22:41:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.22 1999/07/15 22:39:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/joininfo.h"
-#include "optimizer/var.h"
 #include "optimizer/clauses.h"
 
 
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 34d73bad80..c9a5a9b5ea 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,18 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.22 1999/07/15 15:19:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.23 1999/07/15 22:39:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodes.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/keys.h"
-#include "optimizer/tlist.h"
 
 
 static Expr *matching2_tlvar(int var, List *tlist, bool (*test) ());
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index 46948609f1..19d9b59453 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.16 1999/05/25 16:09:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.17 1999/07/15 22:39:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include "postgres.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/ordering.h"
 
 static bool sortops_order_match(Oid *ordering1, Oid *ordering2,
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 3712db3d71..10283aa250 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.43 1999/07/15 15:19:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.44 1999/07/15 22:39:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,7 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/plancat.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 46dfb07a69..0d7c91556f 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.31 1999/07/07 16:09:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.32 1999/07/15 22:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,24 +18,18 @@
 
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "access/htup.h"
-#include "access/itup.h"
 
 #include "catalog/catname.h"
 #include "catalog/pg_amop.h"
-#include "catalog/pg_index.h"
 #include "catalog/pg_inherits.h"
-#include "catalog/pg_version.h"
 
 #include "parser/parsetree.h"	/* for getrelid() */
-#include "fmgr.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/plancat.h"
 
 #include "utils/syscache.h"
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 5346a1c72a..19dadd7717 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.16 1999/05/25 16:10:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.17 1999/07/15 22:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/pathnode.h" /* where the decls go */
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 504652db8e..e91057057a 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.4 1999/05/25 22:41:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.5 1999/07/15 22:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
 #include "nodes/nodeFuncs.h"
 
 #include "optimizer/internal.h"
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index a133e7a552..fe4a68abea 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,19 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.34 1999/07/15 15:19:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.35 1999/07/15 22:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/nodeFuncs.h"
-#include "utils/lsyscache.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/var.h"
 #include "optimizer/tlist.h"
 #include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index d31f13d56d..5e3ea9e492 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.20 1999/06/19 03:41:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.21 1999/07/15 22:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,16 +15,10 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/nodeFuncs.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
 #include "optimizer/var.h"
 
-#include "parser/parsetree.h"
 
 
 static bool pull_varnos_walker(Node *node, List **listptr);
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 59ae795f3a..68b38f1712 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.112 1999/07/15 15:19:29 momjian Exp $
+ *	$Id: analyze.c,v 1.113 1999/07/15 22:39:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,15 +18,11 @@
 #include "postgres.h"
 #include "access/heapam.h"
 #include "nodes/makefuncs.h"
-#include "nodes/memnodes.h"
-#include "nodes/pg_list.h"
 #include "parser/analyze.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_clause.h"
-#include "parser/parse_node.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_expr.h"
 #include "catalog/pg_type.h"
 #include "parse.h"
 
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 80662278f7..e5b5ece549 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.23 1999/06/21 01:18:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.24 1999/07/15 22:39:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,17 +16,10 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
-#include "catalog/pg_type.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_expr.h"
-#include "parser/parse_node.h"
-#include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index a2bf9f080a..7f0e1509bf 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.38 1999/07/15 15:19:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.39 1999/07/15 22:39:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,16 +17,12 @@
 
 #include "postgres.h"
 #include "access/heapam.h"
-#include "catalog/pg_type.h"
-#include "parser/analyze.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_expr.h"
-#include "parser/parse_node.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #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_coerce.c b/src/backend/parser/parse_coerce.c
index 1563a0eef7..610dfa232d 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,21 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.18 1999/06/17 22:21:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.19 1999/07/15 22:39:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 #include "utils/builtins.h"
-#include "fmgr.h"
-#include "nodes/makefuncs.h"
 
 #include "parser/parse_expr.h"
 
-#include "catalog/pg_type.h"
 #include "parser/parse_func.h"
-#include "parser/parse_type.h"
 #include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
 #include "utils/syscache.h"
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 4aecd1f048..bccad445b5 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.50 1999/07/11 02:04:19 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.51 1999/07/15 22:39:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,9 +16,7 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
 #include "nodes/params.h"
 #include "nodes/relation.h"
 #include "parse.h"
@@ -26,7 +24,6 @@
 #include "parser/gramparse.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
-#include "parser/parse_node.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 6f67661847..083e1c070b 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.47 1999/06/17 22:21:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.48 1999/07/15 22:39:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,17 +17,11 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
 #include "catalog/catname.h"
-#include "catalog/heap.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_aggregate.h"
-#include "fmgr.h"
 #include "lib/dllist.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
@@ -35,13 +29,9 @@
 #include "parser/parse_agg.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
-#include "parser/parse_node.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_type.h"
 #include "parser/parse_coerce.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index f1db135955..672ff26974 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.26 1999/07/15 15:19:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.27 1999/07/15 22:39:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,15 +16,11 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/relscan.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
 #include "parser/parse_coerce.h"
-#include "storage/bufmgr.h"
 #include "utils/syscache.h"
 #include "parser/parse_func.h"
 
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 09f624fc76..7c8e824858 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.42 1999/06/17 22:21:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.43 1999/07/15 22:39:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,13 +16,9 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
-#include "nodes/primnodes.h"
-#include "nodes/print.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
-#include "parser/parse_node.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_coerce.h"
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7ced7111cb..6e8529ee78 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,21 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.22 1999/05/29 03:17:19 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.23 1999/07/15 22:39:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
-#include "fmgr.h"
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
 
 #include "catalog/pg_type.h"
-#include "parser/parse_target.h"
 #include "parser/parse_type.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 48c9860159..bce28bd5af 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.39 1999/05/25 16:10:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.40 1999/07/15 22:39:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,10 +14,8 @@
 #include <stdio.h>
 
 #include "postgres.h"
-#include "nodes/pg_list.h"
 #include "parser/analyze.h"
 #include "parser/gramparse.h"
-#include "parser/parse_node.h"
 #include "parser/parser.h"
 
 #if defined(FLEX_SCANNER)
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index 88e8c0e0f8..caf5bea95f 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -16,10 +16,7 @@
  */
 #ifdef PRE_BSDI_2_1
 #include <stdio.h>
-#include <dld.h>
 #include "postgres.h"
-#include "dynloader.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 2d81ce9025..8639318223 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.12 1999/07/15 15:19:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.13 1999/07/15 22:39:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,10 +19,7 @@
 
 #include "postgres.h"
 #ifdef HAVE_DLD_H
-#include <dld.h>
 #endif
-#include "dynloader.h"
-#include "fmgr.h"
 
 #ifdef NOT_USED
 extern char *pg_pathname;
diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c
index 1980578cd8..a704c39bf4 100644
--- a/src/backend/port/isinf.c
+++ b/src/backend/port/isinf.c
@@ -1,7 +1,6 @@
-/* $Id: isinf.c,v 1.6 1998/09/01 03:24:29 momjian Exp $ */
+/* $Id: isinf.c,v 1.7 1999/07/15 22:39:38 momjian Exp $ */
 
 #include <math.h>
-#include "config.h"
 
 #if HAVE_FPCLASS
 #if HAVE_IEEEFP_H
@@ -27,7 +26,6 @@ isinf(double d)
 
 #if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D)
 #if HAVE_FP_CLASS_H
-#include <fp_class.h>
 #endif
 int
 isinf(x)
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 0f9ed9cbc2..8f41ece45b 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -32,13 +32,10 @@
  * SUCH DAMAGE.
  */
 #ifdef NOT_USED
-#include "sendmail.h"
-#include "pathnames.h"
 #endif
 
 #include "postgres.h"
 
-#include "regex/cdefs.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -82,7 +79,7 @@ typedef unsigned long ulong_long;
  * causing nast effects.
  **************************************************************/
 
-/*static char _id[] = "$Id: snprintf.c,v 1.22 1999/05/25 16:10:28 momjian Exp $";*/
+/*static char _id[] = "$Id: snprintf.c,v 1.23 1999/07/15 22:39:39 momjian Exp $";*/
 static char *end;
 static int	SnprfOverflow;
 
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index 609810ba5c..ccf1d6223d 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,14 +6,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.18 1999/07/15 15:19:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.19 1999/07/15 22:39:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"			/* for oid defs */
-#include "nodes/pg_list.h"		/* lisp support package */
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"	/* Var node def */
 #include "utils/syscache.h"		/* for SearchSysCache */
 #include "rewrite/locks.h"		/* for rewrite specific lock defns */
 
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 27eef692d5..333e18ed61 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.31 1999/07/15 15:19:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.32 1999/07/15 22:39:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,21 +16,13 @@
 
 #include "postgres.h"
 
-#include "access/htup.h"
 #include "access/heapam.h"		/* access methods like amopenr */
 #include "catalog/pg_rewrite.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
 #include "parser/parse_relation.h"
-#include "rewrite/locks.h"
 #include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteRemove.h"
 #include "rewrite/rewriteSupport.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#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 eafed074ad..55dc617fd9 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,41 +6,30 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.50 1999/07/15 15:19:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.51 1999/07/15 22:39:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 #include "miscadmin.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"
 
-#include "parser/parse_node.h"
 #include "parser/parse_target.h"
 
 #include "parser/analyze.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
 
-#include "rewrite/rewriteSupport.h"
-#include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
 #include "rewrite/locks.h"
 
-#include "commands/creatinh.h"
 #include "access/heapam.h"
 
 #include "utils/lsyscache.h"
-#include "utils/syscache.h"
 #include "utils/acl.h"
-#include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
 
 
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index feee3055c3..b2fd0eb8f2 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,25 +6,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.34 1999/07/15 15:19:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.35 1999/07/15 22:39:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
 #include "parser/parsetree.h"	/* for getrelid() */
 #include "utils/lsyscache.h"
 #include "utils/builtins.h"
-#include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
-#include "rewrite/rewriteSupport.h"
-#include "rewrite/locks.h"
 
-#include "nodes/plannodes.h"
 #include "optimizer/clauses.h"
 
 static void ResolveNew(RewriteInfo *info, List *targetlist,
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 10cce0262b..cf4c309f59 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.24 1999/05/25 16:10:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.25 1999/07/15 22:39:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,10 +16,8 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"				/* for F_NAMEEQ */
 
 #include "access/heapam.h"		/* heap AM calls defined here */
-#include "access/skey.h"
 #include "catalog/catname.h"	/* for RewriteRelationName */
 #include "catalog/pg_rewrite.h"
 #include "utils/syscache.h"
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 305d2e49ac..cbffc679f1 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.33 1999/07/15 15:19:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.34 1999/07/15 22:39:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,16 +16,7 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_rewrite.h"
-#include "fmgr.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "storage/buf.h"		/* for InvalidBuffer */
-#include "storage/bufmgr.h"
-#include "utils/builtins.h"		/* for textout */
 #include "utils/catcache.h"		/* for CacheContext */
-#include "utils/rel.h"			/* for Relation, RelationData ... */
 #include "utils/syscache.h"		/* for SearchSysCache */
 
 #include "rewrite/rewriteSupport.h"
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index 0b4e0ea58f..5cab2e4e24 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.14 1999/02/13 23:17:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.15 1999/07/15 22:39:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,10 +29,6 @@
 #include "postgres.h"
 
 #include "storage/bufmgr.h"
-#include "storage/buf_internals.h"		/* where the declarations go */
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "utils/hsearch.h"
 
 static HTAB *SharedBufHash;
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index fa3914b61c..6acccfb287 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.57 1999/07/15 15:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.58 1999/07/15 22:39:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,24 +50,12 @@
 #include "postgres.h"
 
 /* declarations split between these three files */
-#include "storage/buf.h"
-#include "storage/buf_internals.h"
-#include "storage/bufmgr.h"
 
-#include "storage/fd.h"
-#include "storage/ipc.h"
 #include "storage/s_lock.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/smgr.h"
-#include "storage/lmgr.h"
 #include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "executor/execdebug.h" /* for NDirectFileRead */
-#include "catalog/catalog.h"
 
 extern SPINLOCK BufMgrLock;
 extern long int ReadBufferCount;
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 2b007b85e0..13f79377b5 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.15 1999/05/25 16:10:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.16 1999/07/15 22:39:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,8 +28,6 @@
 #include "postgres.h"
 
 #include "storage/bufmgr.h"
-#include "storage/buf_internals.h"		/* where declarations go */
-#include "storage/spin.h"
 
 
 static BufferDesc *SharedFreeList;
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index c9fcf506bc..6162052f8f 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.22 1999/05/10 00:45:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.23 1999/07/15 22:39:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,23 +29,10 @@
 #include "postgres.h"
 
 /* declarations split between these three files */
-#include "storage/buf.h"
-#include "storage/buf_internals.h"
-#include "storage/bufmgr.h"
 
-#include "storage/fd.h"
-#include "storage/ipc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/smgr.h"
-#include "storage/lmgr.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "executor/execdebug.h" /* for NDirectFileRead */
-#include "catalog/catalog.h"
 
 extern long int LocalBufferFlushCount;
 
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index b32c7f91ea..89af501ff9 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.26 1999/05/31 18:28:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.27 1999/07/15 22:39:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,12 +16,8 @@
 
 #include "postgres.h"
 
-#include "storage/ipc.h"
 #include "storage/sinval.h"
 #include "storage/bufmgr.h"
-#include "storage/proc.h"
-#include "storage/smgr.h"
-#include "storage/lock.h"
 #include "miscadmin.h"			/* for DebugLvl */
 
 /*
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 8213a84c14..2b785251c5 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.43 1999/07/15 15:19:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.44 1999/07/15 22:39:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,15 +61,8 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "storage/ipc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/proc.h"
-#include "utils/hsearch.h"
-#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/sinval.c b/src/backend/storage/ipc/sinval.c
index 220607ac05..21585cc240 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.15 1999/05/28 17:03:29 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.16 1999/07/15 22:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "storage/backendid.h"
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
-#include "storage/spin.h"
 
 extern SISeg *shmInvalBuffer;	/* the shared buffer segment, set by */
 
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 8a47ecaa42..fb6170faf4 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.21 1999/07/15 15:19:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.22 1999/07/15 22:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,11 +17,8 @@
 
 #include "postgres.h"
 
-#include "storage/ipc.h"
 #include "storage/backendid.h"
-#include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
-#include "utils/memutils.h"
 #include "utils/trace.h"
 
 /* ----------------
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 3fe692ff08..c49ebc9194 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.18 1999/02/13 23:18:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.19 1999/07/15 22:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,12 +26,8 @@
  */
 #include <errno.h>
 #include "postgres.h"
-#include "storage/ipc.h"
 #include "storage/s_lock.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/proc.h"
-#include "utils/trace.h"
 
 #ifndef HAS_TEST_AND_SET
 #include <sys/sem.h>
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 57d03568c7..641dab0393 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.53 1999/05/25 16:11:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.54 1999/07/15 22:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,30 +22,16 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/tupdesc.h"
-#include "access/transam.h"
-#include "access/xact.h"
 #include "access/nbtree.h"
-#include "access/tupdesc.h"
 #include "catalog/catalog.h"	/* for newoid() */
 #include "catalog/heap.h"
 #include "catalog/index.h"		/* for index_create() */
-#include "catalog/pg_am.h"		/* for BTREE_AM_OID */
 #include "catalog/pg_type.h"	/* for INT4OID */
 #include "catalog/pg_opclass.h" /* for INT4_OPS_OID */
-#include "fmgr.h"
 #include "libpq/libpq-fs.h"
 #include "miscadmin.h"
-#include "nodes/pg_list.h"
-#include "storage/itemptr.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
 #include "storage/large_object.h"
-#include "storage/lmgr.h"
 #include "storage/smgr.h"
-#include "utils/builtins.h"		/* for namestrcpy() */
-#include "utils/rel.h"
 #include "utils/relcache.h"
 
 /*
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index cf7a1c8682..9ad92c8a75 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.29 1999/07/15 20:32:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.30 1999/07/15 22:39:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,27 +22,11 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
-#include "access/xact.h"
 
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/itemptr.h"
-#include "storage/bufpage.h"
-#include "storage/multilev.h"
-#include "storage/lmgr.h"
 
-#include "utils/rel.h"
 
-#include "catalog/catname.h"
 #include "catalog/catalog.h"
-#include "catalog/pg_class.h"
 
-#include "nodes/memnodes.h"
-#include "storage/bufmgr.h"
 #include "access/transam.h"		/* for AmiTransactionId */
 
 extern Oid	MyDatabaseId;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 74845dbcf8..bdf6bb9860 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.57 1999/07/15 20:32:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.58 1999/07/15 22:39:51 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -37,15 +37,8 @@
 
 #include "postgres.h"
 #include "miscadmin.h"
-#include "storage/shmem.h"
-#include "storage/sinvaladt.h"
-#include "storage/spin.h"
 #include "storage/proc.h"
-#include "storage/lock.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
 #include "access/xact.h"
-#include "access/transam.h"
 #include "utils/trace.h"
 #include "utils/ps_status.h"
 
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index d88ded9a7a..5822ca4e06 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -63,17 +63,10 @@
 #include "miscadmin.h"
 #include "libpq/pqsignal.h"
 
-#include "access/xact.h"
-#include "utils/hsearch.h"
 
-#include "storage/ipc.h"
 /* In Ultrix, sem.h must be included after ipc.h */
 #include <sys/sem.h>
-#include "storage/buf.h"
-#include "storage/lock.h"
 #include "storage/lmgr.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/proc.h"
 #include "utils/trace.h"
 
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index d33bd8c437..cb3d2f8dce 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.24 1999/07/15 15:19:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.25 1999/07/15 22:39:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,10 +17,6 @@
 
 #include "postgres.h"
 
-#include "storage/item.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "utils/memutils.h"
 #include "storage/bufpage.h"
 
 static void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr,
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index 1ac32fd545..e8bee1026f 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -7,15 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.6 1999/05/25 16:11:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.7 1999/07/15 22:39:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
 #include "storage/bufpage.h"
 
 /*
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index d94c0ef3f4..33cf5da88a 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.47 1999/07/15 15:19:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.48 1999/07/15 22:39:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,10 +21,7 @@
 #include "miscadmin.h"			/* for DataDir */
 
 #include "catalog/catalog.h"
-#include "storage/block.h"
-#include "storage/fd.h"
 #include "storage/smgr.h"		/* where the declarations go */
-#include "utils/rel.h"
 
 #undef DIAGNOSTIC
 
diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c
index 5bce97f93a..6b8cc7f14c 100644
--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.16 1999/05/25 16:11:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.17 1999/07/15 22:39:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,15 +19,7 @@
 #ifdef STABLE_MEMORY_STORAGE
 
 #include <math.h>
-#include "storage/ipc.h"
-#include "storage/smgr.h"		/* where the declarations go */
-#include "storage/block.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 
-#include "utils/hsearch.h"
-#include "utils/rel.h"
-#include "utils/memutils.h"
 
 /*
  *	MMCacheTag -- Unique triplet for blocks stored by the main memory
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 5ed9e4965b..2eeb0a0eae 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,17 +10,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.27 1999/07/15 22:39:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 
-#include "storage/ipc.h"
-#include "storage/block.h"
 #include "storage/smgr.h"
-#include "utils/rel.h"
 
 static void smgrshutdown(int dummy);
 
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index 496346462c..a695903a54 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.14 1999/07/15 22:39:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 
-#include "utils/builtins.h"		/* where the declarations go */
 #include "storage/smgr.h"
 
 typedef struct smgrid
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 967237bec2..7b2e759df9 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.32 1999/07/15 15:19:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.33 1999/07/15 22:39:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,19 +37,13 @@
 
 #include "postgres.h"
 
-#include "access/htup.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "access/printtup.h"
-#include "utils/portal.h"
 
-#include "executor/executor.h"
 
-#include "tcop/dest.h"
 
-#include "catalog/pg_type.h"
 
-#include "commands/async.h"
 
 static char CommandInfo[32] = {0};
 
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 05b4ef9054..df1641d8b7 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.25 1999/07/15 15:19:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.26 1999/07/15 22:39:56 momjian Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -61,9 +61,7 @@
 
 #include "postgres.h"
 
-#include "tcop/tcopdebug.h"
 
-#include "fmgr.h"
 #include "utils/builtins.h"		/* for oideq */
 #include "tcop/fastpath.h"
 #include "libpq/libpq.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a17f0ebd43..871aa7bedd 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.120 1999/07/15 15:19:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.121 1999/07/15 22:39:56 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -39,58 +39,40 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #ifdef __CYGWIN32__
-#include <getopt.h>
 #endif
 
 #include "postgres.h"
 #include "miscadmin.h"
-#include "fmgr.h"
 
-#include "access/xact.h"
-#include "catalog/catname.h"
 #include "commands/async.h"
-#include "executor/execdebug.h"
-#include "executor/executor.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
-#include "libpq/libpq-be.h"
 #include "libpq/pqsignal.h"
-#include "nodes/pg_list.h"
 #include "nodes/print.h"
 #include "optimizer/cost.h"
 #include "optimizer/planner.h"
-#include "optimizer/prep.h"
 #include "parser/parser.h"
 #include "rewrite/rewriteHandler.h"		/* for QueryRewrite() */
-#include "storage/bufmgr.h"
-#include "tcop/dest.h"
 #include "tcop/fastpath.h"
 #include "tcop/pquery.h"
-#include "tcop/tcopdebug.h"
 #include "tcop/tcopprot.h"		/* where declarations for this file go */
 #include "tcop/utility.h"
-#include "utils/rel.h"
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
-#include "nodes/parsenodes.h"
 #include "../backend/parser/parse.h"
 
 #ifdef NOT_USED
-#include "nodes/relation.h"
 #endif
 
 #ifdef NOT_USED
-#include "nodes/plannodes.h"
 #endif
 
 #ifdef NOT_USED
-#include "nodes/memnodes.h"
 #endif
 
 #include "utils/trace.h"
 
 #ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
 #endif
 
 /*
@@ -1520,7 +1502,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.120 $ $Date: 1999/07/15 15:19:59 $\n");
+		puts("$Revision: 1.121 $ $Date: 1999/07/15 22:39:56 $\n");
 	}
 
 	/* ----------------
@@ -1685,7 +1667,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 }
 
 #ifndef HAVE_GETRUSAGE
-#include "rusagestub.h"
 #else							/* HAVE_GETRUSAGE */
 #include <sys/resource.h>
 #endif	 /* HAVE_GETRUSAGE */
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index e73de6d9bd..57d897d3de 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.24 1999/07/15 15:20:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.25 1999/07/15 22:39:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,22 +15,11 @@
 
 #include "postgres.h"
 
-#include "tcop/tcopdebug.h"
 
-#include "nodes/nodes.h"
-#include "miscadmin.h"
-#include "utils/portal.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/memnodes.h"
 
-#include "tcop/dest.h"
 
 #include "executor/execdefs.h"
-#include "executor/execdesc.h"
 #include "executor/executor.h"
 #include "tcop/pquery.h"
 #include "utils/ps_status.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 970e47db3b..e690148de9 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,12 +9,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.62 1999/07/15 15:20:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.63 1999/07/15 22:39:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "access/xact.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
@@ -29,24 +28,17 @@
 #include "commands/defrem.h"
 #include "commands/rename.h"
 #include "commands/view.h"
-#include "commands/version.h"
 #include "commands/vacuum.h"
 #include "commands/explain.h"
 #include "commands/trigger.h"
 #include "commands/proclang.h"
 #include "commands/variable.h"
 
-#include "nodes/parsenodes.h"
 #include "../backend/parser/parse.h"
-#include "utils/builtins.h"
 #include "utils/acl.h"
 #include "rewrite/rewriteRemove.h"
 #include "rewrite/rewriteDefine.h"
-#include "tcop/tcopdebug.h"
-#include "tcop/dest.h"
 #include "tcop/utility.h"
-#include "fmgr.h"				/* For load_file() */
-#include "storage/fd.h"
 #include "utils/ps_status.h"
 
 #ifndef NO_SECURITY
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 0c87ce5a64..0a60e98a9f 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.35 1999/07/15 15:20:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.36 1999/07/15 22:39:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,9 +21,6 @@
 #endif
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/nabstime.h"
-#include "utils/datetime.h"
-#include "access/xact.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 1c774616d5..84d33049c5 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.14 1999/07/15 15:20:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.15 1999/07/15 22:39:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,6 @@
 #include <string.h>
 #include "postgres.h"
 #include "utils/datum.h"
-#include "catalog/pg_type.h"
 
 /*-------------------------------------------------------------------------
  * datumGetSize
diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
index 4a246d705f..ea81ebb23a 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.10 1999/07/15 15:20:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.11 1999/07/15 22:39:59 momjian Exp $
  *
  *		XXX These are totally bogus.
  *
@@ -16,8 +16,6 @@
  */
 #include "postgres.h"
 
-#include "access/attnum.h"
-#include "utils/geo_decls.h"	/* where function declarations go */
 #include "utils/builtins.h"
 
 float64
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index f26dc35a8a..39776901af 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.23 1999/07/15 15:20:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.24 1999/07/15 22:39:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,6 @@
 #endif
 
 #include "postgres.h"
-#include "fmgr.h"
 #include "utils/builtins.h"		/* where the declarations go */
 
 #ifndef SHRT_MAX
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 03a7a4e479..ed2a86a954 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.10 1999/07/15 15:20:18 momjian Exp $
+ *	$Id: mac.c,v 1.11 1999/07/15 22:39:59 momjian Exp $
  */
 
 #include <stdio.h>
@@ -9,7 +9,6 @@
 
 #include <postgres.h>
 #include <utils/builtins.h>
-#include <utils/inet.h>
 
 manufacturer manufacturers[] = {
 	{0x00, 0x00, 0x0C, "Cisco"},
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d7651355cf..dd26023b35 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.16 1999/02/13 23:19:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.17 1999/07/15 22:39:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #include <sys/file.h>
 #include <time.h>
 #include "postgres.h"
-#include "utils/datum.h"
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 
 /*-------------------------------------------------------------------------
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 1b56dfa4cb..70ecd3d5c2 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.12 1999/07/15 15:20:18 momjian Exp $
+ *	$Id: network.c,v 1.13 1999/07/15 22:40:00 momjian Exp $
  *	Jon Postel RIP 16 Oct 1998
  */
 
@@ -19,7 +19,6 @@
 
 #include <postgres.h>
 #include <utils/builtins.h>
-#include <utils/inet.h>
 
 static int	v4bitncmp(unsigned int a1, unsigned int a2, int bits);
 
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 7082b0d007..2d26096634 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.16 1999/05/25 16:12:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.17 1999/07/15 22:40:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include <string.h>
 #include "postgres.h"
 #include "access/heapam.h"
-#include "access/relscan.h"
 #include "utils/builtins.h"		/* where function decls go */
 
 static int	my_varattno(Relation rd, char *a);
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 5faaa5ddab..fd09f386e8 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.34 1999/07/10 17:03:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.35 1999/07/15 22:40:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,6 @@
 #include "postgres.h"
 #include "utils/builtins.h"		/* where the declarations go */
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 3a2a032364..c0337b93fe 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.38 1999/07/15 15:20:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.39 1999/07/15 22:40:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,10 +16,6 @@
 #include "miscadmin.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "storage/bufmgr.h"
-#include "fmgr.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 928705ef22..53763414f4 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.19 1999/07/15 15:20:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.20 1999/07/15 22:40:00 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -43,18 +43,10 @@
 #include <string.h>
 
 #include "executor/spi.h"
-#include "commands/trigger.h"
-#include "utils/builtins.h"
-#include "nodes/nodes.h"
 #include "optimizer/clauses.h"
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_index.h"
-#include "catalog/pg_opclass.h"
-#include "fmgr.h"
 
 #define BUFSIZE 8192
 
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 359267653b..ade43a2be2 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.31 1999/07/15 15:20:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.32 1999/07/15 22:40:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "fmgr.h"
 #include "utils/builtins.h"		/* for textout() prototype and where the
 								 * declarations go */
 
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 94b6a1157b..20ec4921bf 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.21 1999/02/13 23:19:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.22 1999/07/15 22:40:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,17 +19,11 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/xact.h"
 #include "catalog/pg_proc.h"	/* for Form_pg_proc */
 #include "catalog/catname.h"	/* for ProcedureRelationName */
 #include "catalog/indexing.h"	/* for Num_pg_proc_indices */
-#include "fmgr.h"
-#include "storage/lmgr.h"
-#include "tcop/dest.h"
 #include "utils/sets.h"			/* for GENERICSETNAME	   */
 #include "utils/syscache.h"		/* for PROOID */
-#include "utils/tqual.h"
 
 extern CommandDest whereToSendOutput;	/* defined in tcop/postgres.c */
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 5a9bae512e..621dcc53d0 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.8 1999/07/15 15:20:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.9 1999/07/15 22:40:01 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -17,7 +17,6 @@
 #include <stdio.h>				/* for sprintf() */
 #include <string.h>
 #include "postgres.h"
-#include "storage/bufpage.h"
 
 #include "utils/builtins.h"		/* where function declarations go */
 
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 868412f46f..0d746a3c64 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.49 1999/07/15 15:20:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.50 1999/07/15 22:40:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,17 +15,13 @@
 #include <string.h>
 #include "postgres.h"
 #include "access/htup.h"
-#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"
 
 /*
  * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c4044158ea..663eeb5f77 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.44 1999/07/15 15:20:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.45 1999/07/15 22:40:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,17 +15,11 @@
 #include "postgres.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/tqual.h"
 #include "utils/builtins.h"
-#include "utils/portal.h"
 #include "utils/catcache.h"
-#include "utils/rel.h"
-#include "storage/bufpage.h"
 #include "access/valid.h"
 #include "miscadmin.h"
-#include "fmgr.h"				/* for F_BOOLEQ, etc.  DANGER */
 #include "catalog/pg_type.h"	/* for OID of int28 type */
-#include "lib/dllist.h"
 
 static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
 static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index c298de0a9e..0e1eb945cb 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,30 +7,21 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.22 1999/05/10 00:46:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.23 1999/07/15 22:40:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <nodes/parsenodes.h>
-#include <fmgr.h>
 
-#include "access/htup.h"
-#include "utils/catcache.h"
 #include "utils/syscache.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
-#include "catalog/pg_class.h"
 #include "parser/parsetree.h"	/* for getrelname() */
 #include "utils/builtins.h"
-#include "utils/fcache.h"
 #include "utils/fcache2.h"
-#include "nodes/primnodes.h"
-#include "nodes/execnodes.h"
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 7cf66e2280..a356bb8cdd 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.23 1999/05/25 16:12:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.24 1999/07/15 22:40:03 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -17,20 +17,13 @@
 
 #include <miscadmin.h>
 
-#include "access/heapam.h"		/* XXX to support hacks below */
-#include "access/htup.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
-#include "storage/bufpage.h"
-#include "storage/buf.h"		/* XXX for InvalidBuffer */
-#include "storage/ipc.h"
 #include "storage/sinval.h"
 #include "utils/catcache.h"
 #include "utils/inval.h"
-#include "utils/rel.h"
 #include "utils/relcache.h"
 #include "catalog/catname.h"	/* XXX to support hacks below */
-#include "utils/syscache.h"		/* XXX to support the hacks below */
 
 static InvalidationEntry InvalidationEntryAllocate(uint16 size);
 static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index cb99900ea6..61d96bc2f9 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.28 1999/07/15 15:20:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -16,15 +16,9 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "access/tupmacs.h"
-#include "utils/rel.h"
-#include "access/attnum.h"
-#include "access/heapam.h"
 
-#include "catalog/pg_amop.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
 
diff --git a/src/backend/utils/cache/rel.c b/src/backend/utils/cache/rel.c
index f37a97b34f..340562f05d 100644
--- a/src/backend/utils/cache/rel.c
+++ b/src/backend/utils/cache/rel.c
@@ -7,18 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.5 1999/05/25 16:12:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.6 1999/07/15 22:40:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 /* #define RELREFDEBUG	1 */
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "access/istrat.h"
-#include "access/tupdesc.h"
-#include "utils/rel.h"
-#include "storage/fd.h"
 
 
 /*
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 7184f76985..b2bfdf14f3 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.63 1999/07/15 15:20:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.64 1999/07/15 22:40:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,43 +40,24 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "access/istrat.h"
-#include "access/itup.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/tupmacs.h"
-#include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/pg_attrdef.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_log.h"
 #include "catalog/pg_relcheck.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_variable.h"
-#include "fmgr.h"
 #include "lib/hasht.h"
 #include "miscadmin.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "storage/fd.h"			/* for SEEK_ */
-#include "storage/lmgr.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
 #include "utils/relcache.h"
-#include "utils/syscache.h"
 
 
 static void RelationFlushRelation(Relation *relationPtr,
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index d302a33d85..fa57b86daf 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.28 1999/07/07 16:09:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -20,7 +20,6 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/catname.h"
 #include "utils/catcache.h"
 #include <string.h>
@@ -30,9 +29,7 @@
  *		hardwired attribute information comes from system catalog files.
  * ----------------
  */
-#include "catalog/pg_am.h"
 #include "catalog/pg_amop.h"
-#include "catalog/pg_attribute.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_inherits.h"
@@ -40,12 +37,10 @@
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
 #include "catalog/pg_listener.h"
 
 extern bool AMI_OVERRIDE;		/* XXX style */
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 0d817ec012..9dfe2289d9 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.7 1999/07/15 15:20:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.8 1999/07/15 22:40:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,15 +26,10 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "utils/temprel.h"
-#include "access/xact.h"
-#include "access/htup.h"
 #include "access/heapam.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
-#include "catalog/pg_class.h"
 
 GlobalMemory CacheCxt;
 
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 794b59bd7b..0bb6785d62 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.13 1999/02/13 23:19:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.14 1999/07/15 22:40:05 momjian Exp $
  *
  * NOTE
  *	  This should eventually work with elog(), dlog(), etc.
@@ -18,7 +18,6 @@
 #include <unistd.h>
 
 #include "postgres.h"			/* where the declaration goes */
-#include "utils/module.h"
 
 #include "utils/exc.h"
 #include "utils/trace.h"
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index b5cf429e7f..566a11aca8 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.27 1999/07/15 15:20:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.28 1999/07/15 22:40:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,17 +18,12 @@
 
 #include "postgres.h"
 
-#include "config.h"				/* for MAXPATHLEN */
-#include "fmgr.h"				/* generated by Gen_fmgrtab.sh */
-#include "utils/dynamic_loader.h"
 #include "utils/builtins.h"
 #include "access/heapam.h"
-#include "nodes/pg_list.h"
 
 #include "dynloader.h"
 
 #ifdef __ultrix
-#include <dl.h>
 #endif
 
 #include "catalog/catname.h"
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 8658da21a4..fa3e2a6fd2 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.29 1999/07/15 15:20:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.30 1999/07/15 22:40:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,18 +18,14 @@
 #include "postgres.h"
 
 /* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */
-#include "fmgr.h"
 #include "utils/fmgrtab.h"
 
-#include "nodes/pg_list.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
 #include "utils/syscache.h"
-#include "nodes/params.h"
 
 #include "utils/builtins.h"
 
-#include "nodes/parsenodes.h"
 #include "commands/trigger.h"
 
 
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 1ef5a00fe4..97dee13053 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.31 1999/07/15 15:20:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.32 1999/07/15 22:40:08 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -27,9 +27,6 @@
 #include "miscadmin.h"			/* where the declarations go */
 
 #include <storage/backendid.h>
-#include "access/heapam.h"
-#include "storage/sinval.h"
-#include "storage/sinvaladt.h"
 #include "storage/lmgr.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 53e98f3211..55a6905707 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.30 1999/07/15 15:20:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.31 1999/07/15 22:40:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,19 +23,13 @@
 
 #include "postgres.h"
 
-#include "utils/portal.h"		/* for EnablePortalManager, etc. */
-#include "utils/exc.h"			/* for EnableExceptionHandling, etc. */
-#include "utils/builtins.h"
 
 #include "miscadmin.h"			/* where the declarations go */
 
 #include "catalog/catname.h"
 #include "catalog/pg_shadow.h"
-#include "catalog/pg_proc.h"
 #include "utils/syscache.h"
 
-#include "storage/fd.h"			/* for O_ */
-#include "storage/ipc.h"		/* for proc_exit */
 
 /*
  * EnableAbortEnvVarName
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 6a304ec3d1..92532c9bad 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.41 1999/07/15 15:20:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.42 1999/07/15 22:40:09 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -37,34 +37,24 @@
 #include "postgres.h"
 #include "version.h"
 
-#include <storage/ipc.h>
 #include <storage/backendid.h>
-#include <storage/buf_internals.h>
 #include <storage/smgr.h>
 #include <storage/proc.h>
 #include <utils/relcache.h>
 
 #include "access/heapam.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h"		/* XXX dependency problem */
 #include "utils/syscache.h"
 #include "storage/bufpage.h"	/* for page layout, for
 								 * InitMyDatabaseInfo() */
 #include "storage/sinval.h"
-#include "storage/sinvaladt.h"
-#include "storage/lmgr.h"
 
 #include "miscadmin.h"			/* for global decls */
 #include "utils/portal.h"		/* for EnablePortalManager, etc. */
 
-#include "utils/exc.h"			/* for EnableExceptionHandling, etc. */
-#include "fmgr.h"				/* for EnableDynamicFunctionManager, etc. */
 #include "utils/inval.h"
 
 #include "catalog/catname.h"
 #ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
 #endif
 
 #include "libpq/libpq.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 607dfcf46a..397cc766fc 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.25 1999/07/15 15:20:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.26 1999/07/15 22:40:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,20 +19,12 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/transam.h"
 #include "access/xact.h"
-#include "catalog/catname.h"
 #include "catalog/pg_database.h"
-#include "fmgr.h"
 #include "miscadmin.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
 #endif
 
 #ifdef NOT_USED
diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c
index 9676ca570a..229e373382 100644
--- a/src/backend/utils/misc/trace.c
+++ b/src/backend/utils/misc/trace.c
@@ -26,7 +26,6 @@
 #include "postgres.h"
 #include "miscadmin.h"
 #include "utils/trace.h"
-#include "libpq/pqsignal.h"
 
 #ifdef USE_SYSLOG
 /*
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 1060f7b6de..5f8e4b4def 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.16 1999/05/25 16:12:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.17 1999/07/15 22:40:12 momjian Exp $
  *
  * NOTE:
  *	This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -23,10 +23,8 @@
  */
 #include <stdio.h>
 #include "postgres.h"
-#include "utils/excid.h"		/* for ExhaustedMemory */
 #include "utils/memutils.h"		/* where funnction declarations go */
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 8143bc2c3e..c3d272029b 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.15 1999/07/15 15:20:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.16 1999/07/15 22:40:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,12 +15,10 @@
 
 #include "postgres.h"
 
-#include "utils/memutils.h"
 #include "utils/module.h"
 #include "utils/excid.h"
 
 #include "nodes/memnodes.h"
-#include "nodes/nodes.h"
 
 
 
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 55512b1c95..a576823715 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.24 1999/07/15 15:20:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.25 1999/07/15 22:40:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,13 +80,7 @@
 
 #include "lib/hasht.h"
 #include "utils/module.h"
-#include "utils/excid.h"		/* for Unimplemented */
-#include "utils/hsearch.h"
 
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"	/* for EState */
 
 #include "utils/portal.h"
 
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index ae10049b96..2b349f3686 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.16 1999/07/10 18:21:59 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.17 1999/07/15 22:40:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,13 +17,8 @@
 
 #include "postgres.h"
 
-#include "storage/buf.h"
-#include "access/skey.h"
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "utils/rel.h"
 
-#include "utils/psort.h"
 #include "utils/lselect.h"
 
 /*
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index d26785a940..b0c6db7717 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $
+ *	  $Id: psort.c,v 1.54 1999/07/15 22:40:14 momjian Exp $
  *
  * NOTES
  *		Sorts the first relation into the second relation.
@@ -40,19 +40,9 @@
 #include "miscadmin.h"
 
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "storage/buf.h"
-#include "storage/fd.h"
-#include "utils/lselect.h"
-#include "utils/portal.h"		/* for {Start,End}PortalAllocMode */
 #include "utils/psort.h"
-#include "utils/rel.h"
 
 static bool createfirstrun(Sort *node);
 static bool createrun(Sort *node, BufFile *file);
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index b89706638a..3c2a9c71e8 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.30 1999/07/15 15:20:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.31 1999/07/15 22:40:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,10 +16,6 @@
 
 #include "postgres.h"
 
-#include "access/htup.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h"
 #include "utils/tqual.h"
 
 extern bool PostgresIsInitialized;
diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude
index f48c96a536..b3ebb2df42 100755
--- a/src/tools/pginclude/pgfixinclude
+++ b/src/tools/pginclude/pgfixinclude
@@ -3,15 +3,15 @@ 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 /tmp/$$a | grep "^#include" |
+	cat "$FILE" | grep "^#include" |
 	sed 's/^#include[ 	]*[<"]\([^>"]*\).*$/\1/g' |
 	while read INCLUDE
 	do
 		if [ -s /usr/include/"$INCLUDE" ]
 		then	cat "$FILE" |
-			sed 's/^#include[ 	]*[<"]'"$INCLUDE"'[>"]$/#include <'"$INCLUDE"'>/g' >/tmp/$$
+			sed 's;^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]$;#include <'"$INCLUDE"'>;g' >/tmp/$$
 		else	cat "$FILE" |
-			sed 's/^#include[ 	]*[<"]'"$INCLUDE"'[>"]$/#include "'"$INCLUDE"'"/g' >/tmp/$$
+			sed 's;^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]$;#include "'"$INCLUDE"'";g' >/tmp/$$
 		fi
 		cat /tmp/$$ > "$FILE"
 	done
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
index 5fbf553a11..35f191fa6a 100755
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgnoinclude
@@ -36,8 +36,14 @@ do
 		if [ "$?" -eq 0 ]
 		then	echo "$FILE $INCLUDE"
 			if [ "$IS_INCLUDE" = "N" ]
-			then	grep -v '^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]' $FILE >/tmp/$$b
+			then	grep -v '^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]' "$FILE" >/tmp/$$b
 				mv /tmp/$$b "$FILE"
+				# reload after #include removal
+				if [ "$IS_INCLUDE" = "Y" ]
+				then	cat "$FILE" | grep -v "^#if" | grep -v "^#else" | 
+					grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a
+				else	cat "$FILE" >/tmp/$$a
+				fi
 			fi
 			if [ "$1" = "-v" ]
 			then	cat /tmp/$$