Remove unused #includes in *.c files.

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

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

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>
 
 /* ----------------------------------------------------------------

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"
 

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>
 
 /*

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

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

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

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

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

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)

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);

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

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

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

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.

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

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

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

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

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

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>
 
 /* ----------------

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);

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)

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

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

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
 

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

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

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
 

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>
 
 /*

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

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

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

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

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

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>
 

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);

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);

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>

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>

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))

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);

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

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

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"
 

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

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

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

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

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
 

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>

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);

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"

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'))

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>

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"
 
 

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>
 

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)
 

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

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

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>

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"

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>
 

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>

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>

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"

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"
 

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"
 
 /*-------------------------------------------------------------------------

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);

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"
 
 
 /*

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);
 

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,

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"

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"
 

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);

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"

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;

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"

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"
 
 /* ----------------

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"

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)

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);

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)

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"
 
 /* ----------------------------------------------------------------

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

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;

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)

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>
 
 /* -----------------------------------

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
 /*

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>
 

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>
 

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

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;

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.

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

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>
 
 
 /* ----------------------------------------------------------------

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;

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 */

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