16 files changed, 14 insertions, 121 deletions
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index 6eddfdccfaf..a07c1423d77 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 0e3cb83aa93..ffb2998c358 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 7eab1d213a1..a58cc85d153 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 0ff886ded54..7b4936387ce 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 d7dced4c168..b1d4901fc6b 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 e9c5fdcd894..252763a48f3 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 06f0a8115a5..f3959bb403c 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 dd83129be4b..5db5334f118 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 e7f047477ca..91abbaf3321 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 7ae4c2c176d..e28156aaa8a 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 f88d29b7a06..b5a3a5d307c 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 a6f18e01d3d..f8fbf5f570f 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 a710888d7f0..6107c4bd6fa 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 57ac35fb1f4..0419cb527b8 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 e475fba1e2c..2c8cf527ac5 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 1cea214613b..2176f0b6ea1 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>