From 510ebf75a189db52bfaac0a74b078fa58611ed03 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sun, 3 Nov 1996 23:57:43 +0000
Subject: [PATCH] Another first pass at cleaning up the #includes

---
 src/backend/commands/Makefile            |  3 +-
 src/backend/commands/_deadcode/version.c |  6 ++--
 src/backend/commands/async.c             | 32 ++------------------
 src/backend/commands/cluster.c           | 13 +--------
 src/backend/commands/command.c           | 29 +------------------
 src/backend/commands/copy.c              | 37 ++----------------------
 src/backend/commands/creatinh.c          | 26 +----------------
 src/backend/commands/defind.c            |  8 ++---
 src/backend/commands/define.c            |  7 ++---
 src/backend/commands/explain.c           |  4 +--
 src/backend/commands/purge.c             |  7 ++---
 src/backend/commands/recipe.c            |  5 +---
 src/backend/commands/remove.c            | 12 ++------
 src/backend/commands/rename.c            | 10 +------
 src/backend/commands/vacuum.c            | 11 +++----
 src/backend/commands/view.c              |  5 +---
 16 files changed, 30 insertions(+), 185 deletions(-)

diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index ccf0f8451f..2886af835d 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.1 1996/10/27 09:47:14 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.2 1996/11/03 23:57:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,7 +13,6 @@ include ../../Makefile.global
 
 INCLUDE_OPT = -I.. \
               -I../port/$(PORTNAME) \
-              -I../include \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index 6dd311cee7..9d178e877c 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -10,7 +10,7 @@
  *  
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.1.1.1 1996/07/09 06:21:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.2 1996/11/03 23:57:42 scrappy Exp $
  *
  * NOTES
  *    At the point the version is defined, 2 physical relations are created
@@ -22,14 +22,12 @@
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
+#include <string.h>
 
 #include "postgres.h"
 
-#include "utils/rel.h"
 #include "access/heapam.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "nodes/pg_list.h"
 #include "commands/version.h"
 #include "access/xact.h"		/* for GetCurrentXactStartTime */
 #include "tcop/tcopprot.h"
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 351c7196a6..cb02d50104 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.4 1996/10/21 09:37:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.5 1996/11/03 23:57:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,34 +61,10 @@
 
 #include "postgres.h"
 
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h" 
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"  
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "utils/rel.h"
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include <time.h>
-#include "utils/nabstime.h"
-#include "access/htup.h" 
-
-#include "utils/tqual.h"
-#include "storage/buf.h"  
+#include "utils/syscache.h"
 #include "access/relscan.h"
-
 #include "access/xact.h"
-
 #include "lib/dllist.h"
-
 #include "utils/palloc.h"
 
 #include "tcop/dest.h"
@@ -98,8 +74,6 @@
 
 #include "access/heapam.h" 
 
-#include <stdio.h>
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "nodes/memnodes.h"
@@ -112,10 +86,8 @@
 #include <errno.h>
 
 #include <netinet/in.h>
-#include "libpq/pqcomm.h"
 #include "libpq/libpq.h"
 
-#include "utils/syscache.h"
 
 static int notifyFrontEndPending = 0;
 static int notifyIssued = 0;
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 40625f0e55..1736993460 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.6 1996/09/26 16:29:05 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.7 1996/11/03 23:57:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,17 +23,11 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-
-#include "access/attnum.h"
 #include "access/heapam.h"
 #include "access/genam.h"
 #include "access/htup.h"
-#include "access/itup.h"
-#include "access/relscan.h"
 #include "access/skey.h"
 #include "access/xact.h"
-#include "utils/tqual.h"
 
 #include "catalog/catname.h"
 #include "utils/syscache.h"
@@ -45,9 +39,7 @@
 #include "commands/cluster.h"
 #include "commands/rename.h"
 
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/itemptr.h"
 
 #include "miscadmin.h"
 #include "tcop/dest.h"
@@ -55,12 +47,9 @@
 
 #include "utils/builtins.h"
 #include "utils/excid.h"
-#include "utils/elog.h"
 #include "utils/mcxt.h"
 #include "utils/palloc.h"
-#include "utils/rel.h"
 
-#include "catalog/pg_attribute.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_class.h"
 
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index ac1900d3e3..13c56d888c 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.3 1996/10/21 09:37:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4 1996/11/03 23:57:21 scrappy Exp $
  *
  * NOTES
  *    The PortalExecutorHeapMemory crap needs to be eliminated
@@ -22,32 +22,9 @@
  */
 #include "postgres.h"
 
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"  
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "utils/rel.h"  
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include <time.h>
-#include "utils/nabstime.h"
-#include "access/htup.h"
-
-#include "utils/tqual.h"
-#include "storage/buf.h"  
 #include "access/relscan.h"
 
 #include "nodes/memnodes.h"
-#include "nodes/primnodes.h"
 #include "nodes/parsenodes.h"
 #include "nodes/params.h"
 #include "access/sdir.h"
@@ -64,9 +41,6 @@
 
 #include "utils/mcxt.h"
 
-#include <stdio.h>
-#include "catalog/pg_index.h"
-#include "access/itup.h" 
 #include "executor/executor.h"
 
 #include "executor/execdefs.h"
@@ -92,7 +66,6 @@
 
 #include "catalog/pg_type.h"
 
-#include "utils/geo-decls.h"
 #include "utils/builtins.h"
 
 /* ----------------
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 601cb82fbd..ca05430e01 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,40 +6,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.11 1996/11/02 02:01:47 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.12 1996/11/03 23:57:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <postgres.h>
 
-#include <catalog/pg_attribute.h>
-#include <access/attnum.h>   
-#include <nodes/pg_list.h>
-#include <access/tupdesc.h>  
-#include <storage/fd.h>
-#include <catalog/pg_am.h>
-#include <catalog/pg_class.h>
-#include <nodes/nodes.h>
-#include <rewrite/prs2lock.h>
-#include <access/skey.h>
-#include <access/strat.h>
-#include <utils/rel.h>
- 
-#include <storage/block.h>
-#include <storage/off.h>
-#include <storage/itemptr.h>
-#include <time.h>
-#include <utils/nabstime.h>
-#include <access/htup.h>
-
-#include <utils/tqual.h>
-#include <storage/buf.h> 
-#include <access/relscan.h>
 #include <access/heapam.h>
 
-#include <access/itup.h> 
-
 #include <stdio.h>
 
 #include <tcop/dest.h>
@@ -50,19 +25,15 @@
 
 #include <miscadmin.h>
 
-#include <utils/geo-decls.h>
 #include <utils/builtins.h>
 
 #include <sys/stat.h>
 
-#include <access/funcindex.h>
-
 #include <catalog/pg_index.h>
 
 #include <utils/syscache.h>
 
 #include <nodes/params.h>
-#include <access/sdir.h> 
 #include <executor/hashjoin.h>
 #include <nodes/primnodes.h>  
 #include <nodes/memnodes.h>
@@ -71,13 +42,8 @@
 
 #include <utils/memutils.h>
 
-#include <nodes/plannodes.h>
-#include <nodes/parsenodes.h>
-#include <executor/execdesc.h>
 #include <executor/executor.h>
 
-#include <storage/ipc.h>
-#include <storage/bufmgr.h>
 #include <access/transam.h>
 
 #include <catalog/index.h>
@@ -88,6 +54,7 @@
 
 #include <catalog/catname.h>
 
+#include <catalog/pg_user.h>
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
 #define VALUE(c) ((c) - '0')
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index f7573efb65..c8242ba036 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,33 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.2 1996/10/21 09:37:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.3 1996/11/03 23:57:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h" 
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"  
-#include "storage/fd.h" 
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h" 
-#include "rewrite/prs2lock.h" 
-#include "access/skey.h"
-#include "access/strat.h"  
 #include "utils/rel.h"
-
-#include "nodes/primnodes.h"
-#include <time.h>
-#include "utils/nabstime.h"
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "access/htup.h"
-#include "utils/tqual.h"
 #include "nodes/parsenodes.h"
 
 #include "catalog/heap.h"
@@ -44,10 +24,6 @@
 
 #include "access/xact.h"
 
-#include "access/htup.h"
-#include "utils/tqual.h"
-#include "storage/buf.h"
-#include "access/relscan.h"
 #include "access/heapam.h"
 
 #include "utils/syscache.h"
diff --git a/src/backend/commands/defind.c b/src/backend/commands/defind.c
index fb92db6e67..131197a37e 100644
--- a/src/backend/commands/defind.c
+++ b/src/backend/commands/defind.c
@@ -7,28 +7,26 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.5 1996/10/23 07:39:57 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.6 1996/11/03 23:57:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include "postgres.h"
 
 #include "access/attnum.h"
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/funcindex.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "catalog/index.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_opclass.h"
-#include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/relcache.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 74e32625b6..f0bf15e027 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.4 1996/11/02 02:01:48 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.5 1996/11/03 23:57:30 scrappy Exp $
  *
  * DESCRIPTION
  *    The "DefineFoo" routines take the parse tree and pick out the
@@ -38,25 +38,24 @@
 #include <postgres.h>
 
 #include <access/heapam.h>
-#include <utils/tqual.h>
 #include <catalog/catname.h>
 #include <catalog/pg_aggregate.h>
 #include <catalog/pg_operator.h>
 #include <catalog/pg_proc.h>
 #include <catalog/pg_type.h>
 #include <utils/syscache.h>
-#include <nodes/pg_list.h>
 #include <nodes/parsenodes.h>
 #include <fmgr.h>               /* for fmgr */
 
 #include <utils/builtins.h>     /* prototype for textin() */
 
-#include <utils/elog.h>
 #include <utils/palloc.h>
 #include <commands/defrem.h>
 #include <optimizer/xfunc.h>
 #include <tcop/dest.h>
 
+#include "catalog/pg_user.h"
+
 static char *defGetString(DefElem *def);
 static int  defGetTypeLength(DefElem *def);
 
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 6116f4b46b..d72b40033a 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -7,18 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.2 1996/10/23 07:40:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.3 1996/11/03 23:57:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
+#include <string.h>
 
 #include "postgres.h"
 #include "parser/catalog_utils.h"
 #include "parser/parse_query.h"	    /* for MakeTimeRange() */
 #include "nodes/plannodes.h"
 #include "tcop/tcopprot.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "lib/stringinfo.h"
 #include "commands/explain.h"
diff --git a/src/backend/commands/purge.c b/src/backend/commands/purge.c
index b8b8317ab9..7b29dbc852 100644
--- a/src/backend/commands/purge.c
+++ b/src/backend/commands/purge.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.1.1.1 1996/07/09 06:21:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.2 1996/11/03 23:57:35 scrappy Exp $
  *
  * Note:
  *	XXX There are many instances of int32 instead of ...Time.  These
@@ -15,7 +15,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 
 #include "access/heapam.h"
 #include "access/xact.h"
@@ -23,11 +23,8 @@
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
-#include "utils/nabstime.h"
 
-#include "catalog/pg_class.h"
 #include "commands/purge.h"
 #include "utils/builtins.h"	/* for isreltime() */
 
diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c
index 0e14edfb78..4e679d1709 100644
--- a/src/backend/commands/recipe.c
+++ b/src/backend/commands/recipe.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.3 1996/10/30 02:01:45 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.4 1996/11/03 23:57:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,14 +17,11 @@
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/execnodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/makefuncs.h"
 #include "catalog/pg_type.h"
 #include "commands/recipe.h"
 #include "libpq/libpq-be.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/geo-decls.h"
 #include "utils/relcache.h" /* for RelationNameGetRelation*/
 #include "parser/parse_query.h"
 #include "rewrite/rewriteHandler.h"
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 4f34b97f24..c9e765501a 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,31 +7,25 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.3 1996/10/23 07:40:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.4 1996/11/03 23:57:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
-#include "c.h"
 
-#include "access/attnum.h"
+#include "postgres.h"
+
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/skey.h"
 #include "utils/builtins.h"
 #include "utils/tqual.h"	/* for NowTimeQual */
 #include "catalog/catname.h"
 #include "commands/defrem.h"
-#include "utils/elog.h"
 
 #include "miscadmin.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 "utils/syscache.h"
 #include "parser/catalog_utils.h"
 #include "storage/bufmgr.h"
 #include "fmgr.h"
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 83dc8944ea..22078181ef 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.1.1.1 1996/07/09 06:21:22 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.2 1996/11/03 23:57:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,12 +15,8 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "access/attnum.h"
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "access/relscan.h"
-#include "access/skey.h"
 #include "utils/builtins.h"
 #include "utils/tqual.h"
 
@@ -33,7 +29,6 @@
 
 #include "executor/execdefs.h"	/* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */
 
-#include "storage/buf.h"
 #include "storage/itemptr.h"
 
 #include "miscadmin.h"
@@ -42,10 +37,8 @@
 #include "commands/command.h"
 
 #include "utils/excid.h"
-#include "utils/elog.h"
 #include "utils/mcxt.h"
 #include "utils/palloc.h"
-#include "utils/rel.h"
 
 #include "catalog/pg_attribute.h"
 #include "catalog/pg_proc.h"
@@ -56,7 +49,6 @@
 
 #ifndef NO_SECURITY
 #include "utils/acl.h"
-#include "utils/syscache.h"
 #endif /* !NO_SECURITY */
 
 /*
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index e46a5f9ec4..b322f85525 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.5 1996/10/23 07:40:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.6 1996/11/03 23:57:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <sys/file.h>
+#include <string.h>
 
 #include "postgres.h"
 #include "utils/portal.h"
@@ -22,26 +23,22 @@
 #include "storage/bufmgr.h"
 #include "access/transam.h"
 #include "utils/tqual.h"
-#include "access/htup.h"
 
 #include "catalog/pg_index.h"
 #include "catalog/catname.h"
 #include "catalog/pg_class.h"
 #include "catalog/pg_proc.h"
 
-#include "storage/fd.h"		/* for O_ */
-#include "storage/itemid.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
 #include "storage/smgr.h"
 #include "storage/lmgr.h"
 
-#include "utils/elog.h"
 #include "utils/mcxt.h"
 #include "utils/palloc.h"
 
 #include "commands/vacuum.h"
 
+#include "storage/bufpage.h"
+
 #ifdef NEED_RUSAGE
 #include "rusagestub.h"
 #else /* NEED_RUSAGE */
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 26c1db8884..c5f0a7fade 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.2 1996/10/30 02:01:47 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.3 1996/11/03 23:57:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,8 @@
 #include "access/heapam.h"
 #include "access/xact.h"
 #include "utils/builtins.h"
-#include "utils/syscache.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "nodes/relation.h"
-#include "nodes/primnodes.h"
 #include "nodes/parsenodes.h"
 #include "parser/catalog_utils.h"
 #include "parser/parse_query.h"