First pass at fixing my own mistakes

Mainly...fix up the includes I removed, as well as prototypes

Pointed out by D'Arcy

22 files changed, 583 insertions, 19 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index deabe9aaaf9..eb8589a3698 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.6 1996/10/19 04:51:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.7 1996/10/20 08:31:26 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -19,9 +19,30 @@
 
 #include "postgres.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 "storage/buf.h"
+
+#include "storage/itemid.h"
+#include "storage/item.h"
 #include "storage/bufpage.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"
 
 /* this is so the sparcstation debugger works */
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index 2f256971520..53e0787197e 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,19 +7,42 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.3 1996/10/19 04:51:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.4 1996/10/20 08:31:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.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 "access/attnum.h"
 #include "access/skey.h"
+
 #include "storage/buf.h"
+
 #include "storage/itemid.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/strat.h"
 #include "utils/rel.h"
+
+#include "storage/item.h"
 #include "storage/bufpage.h"
+
 #include "utils/tqual.h"
 
 /* ----------------
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index c7f136bf686..d0696aa70ec 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,16 +8,27 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.3 1996/10/19 04:51:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.4 1996/10/20 08:31:29 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "storage/block.h"
+#include "storage/off.h"
+#include "catalog/pg_attribute.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
+#include "storage/itemptr.h"
+#include "access/tupdesc.h"
 #include "access/itup.h"
+
+#include "utils/memutils.h"
 #include "access/ibit.h"
 
+#include "access/tupmacs.h"
+
 static Size IndexInfoFindDataOffset(unsigned short t_info);
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index 6f1fc8815b0..d9ddbaab50f 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,15 +7,26 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.3 1996/10/19 04:51:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.4 1996/10/20 08:31:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "catalog/pg_attribute.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
+#include "access/tupdesc.h"
 #include "access/itup.h"
+
 #include "access/skey.h"
+
+#include <time.h>
+#include "utils/nabstime.h"
 #include "access/htup.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 72985cafa18..99bc5c25c52 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,18 +8,40 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.3 1996/10/19 04:51:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.4 1996/10/20 08:31:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.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 "access/attnum.h"
 #include "utils/syscache.h"
+
+#include "catalog/pg_attribute.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 "catalog/pg_type.h"
+
 #include "storage/buf.h"
 
+#include "access/heaptuple.h" /* Prototypes */
+#include "fmgr.h" /* Prototypes */
 
 /* ----------------------------------------------------------------
  *	printtup / debugtup support
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 6e7d91b626b..04867b2a330 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,16 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.2 1996/10/19 04:51:42 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.3 1996/10/20 08:31:34 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "access/attnum.h"
 #include "access/skey.h"
 
-
 /*
  * ScanKeyEntryIsLegal --
  *	True iff the scan key entry is legal.
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index aba6ed8e77d..7e3a721448d 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.2 1996/10/19 04:51:44 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.3 1996/10/20 08:31:35 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,13 +18,38 @@
 
 #include "postgres.h"
 
+#include "catalog/pg_attribute.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
 #include "access/tupdesc.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 "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 "catalog/pg_type.h"
+
 #include "utils/syscache.h"
+
 #include "parser/catalog_utils.h"
+
+#include "nodes/primnodes.h"
+#include "utils/tqual.h"
 #include "nodes/parsenodes.h"
 
+#include "utils/palloc.h"
+
 /* ----------------------------------------------------------------
  *	CreateTemplateTupleDesc
  *
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 4e103de8694..d8e10db50cb 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -13,18 +13,63 @@
 
 #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 "access/itup.h"
+ 
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
 #include "access/gist.h"
+
 #include "access/funcindex.h"
+
+#include <time.h>
+#include "utils/nabstime.h"
 #include "access/htup.h"
+
 #include "executor/tuptable.h"
+
+#include "utils/tqual.h"
 #include "access/relscan.h"
+
+#include "nodes/params.h"
+#include "access/sdir.h"
+#include "executor/hashjoin.h"
+#include "nodes/primnodes.h"
+#include "nodes/memnodes.h"  
 #include "nodes/execnodes.h"
+
 #include "storage/bufmgr.h"
+
 #include "catalog/pg_index.h"
+
 #include "utils/syscache.h"
 
+#include "nodes/plannodes.h"
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"  
+#include "executor/execdesc.h"
+#include <stdio.h>
+#include "executor/executor.h"
+
+#include "access/heapam.h"
 
 /* non-export function prototypes */
 static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 290638eea13..819d2ec4f06 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -13,12 +13,38 @@
 
 #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 "storage/itemid.h"
+#include "storage/item.h" 
 #include "storage/bufpage.h"
+
 #include "access/sdir.h"
+ 
 #include "access/itup.h"
+ 
 #include "access/gist.h"
 
 static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, 
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 2889369bd4e..3ca5af106fe 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -12,11 +12,40 @@
 
 #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 "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/bufpage.h"
 #include "access/gist.h"
 
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "access/sdir.h"
+#include "access/genam.h"
+
 /* routines defined and used here */
 static void gistregscan(IndexScanDesc s);
 static void gistdropscan(IndexScanDesc s);
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index 440fdc2ef19..462eb824707 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -13,9 +13,28 @@
  */
 
 #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/off.h"
+
 #include "storage/block.h"
+ 
+#include "storage/itemid.h"
+#include "storage/item.h"  
+#include "storage/buf.h" 
+#include "storage/bufpage.h"
 #include "access/gist.h"
 
 /*
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index e3d8c3f4138..d511e078c5a 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.3 1996/10/20 06:34:11 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.4 1996/10/20 08:31:39 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -16,10 +16,56 @@
  */
 
 #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 "access/itup.h"
+#include "storage/itemid.h" 
+#include "storage/item.h"   
+#include "storage/buf.h"  
+#include "storage/bufpage.h"
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"  
+#include "access/relscan.h"
 #include "access/hash.h"
+ 
+#include "nodes/params.h"
+#include "executor/hashjoin.h"
+#include "nodes/primnodes.h"
+#include "nodes/memnodes.h"
+#include "executor/tuptable.h"
 #include "nodes/execnodes.h"
 
+#include "nodes/plannodes.h" 
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"
+#include "executor/execdesc.h"
+#include <stdio.h>
+#include "catalog/pg_index.h"
+#include "executor/executor.h"
+
+#include "access/heapam.h"
+
+#include "access/genam.h"
+
 bool	BuildingHash = false;
 
 /*
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 79cc04accd9..2d399797164 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,13 +7,42 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.2 1996/10/20 06:34:16 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.3 1996/10/20 08:31:41 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 "access/itup.h"
+#include "storage/itemid.h"
+#include "storage/item.h"  
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
 #include "access/hash.h"
 
 
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index c5264472901..8a9d88b2479 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.2 1996/10/20 06:34:19 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.3 1996/10/20 08:31:44 scrappy Exp $
  *
  * NOTES
  *    Overflow pages look like ordinary relation pages.
@@ -16,7 +16,36 @@
  */
 
 #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 "access/itup.h"  
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
 #include "access/hash.h"
 
 
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 1902cf2a807..06a9f4d00fb 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.2 1996/10/20 06:34:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.3 1996/10/20 08:31:46 scrappy Exp $
  *
  * NOTES
  *    Postgres hash pages look like ordinary relation pages.  The opaque
@@ -24,8 +24,38 @@
  */
 
 #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 "access/itup.h"   
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
 #include "access/hash.h"
+
 #include "storage/bufmgr.h"
 
 static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index 7cab38c84da..cf701e340c1 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.2 1996/10/20 06:34:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.3 1996/10/20 08:31:48 scrappy Exp $
  *
  * NOTES
  *    Because we can be doing an index scan on a relation while we
@@ -28,7 +28,36 @@
  */
 
 #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 "access/itup.h"   
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
 #include "access/hash.h"
 
 static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 4a2d498aec8..80ca30efd15 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,13 +7,42 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.2 1996/10/20 06:34:26 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.3 1996/10/20 08:31:49 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 "access/itup.h"   
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"   
+#include "storage/bufpage.h" 
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h" 
+#include "access/relscan.h"
 #include "access/hash.h"
 
 /*
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index c38fc069ad9..6cabd8fb803 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,13 +7,42 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.2 1996/10/20 06:34:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.3 1996/10/20 08:31:51 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 "access/itup.h"   
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"   
+#include "storage/bufpage.h" 
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h" 
+#include "access/relscan.h"
 #include "access/hash.h"
 
 /* 
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index fd035ee2a98..43f2b350fad 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,13 +7,42 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.2 1996/10/20 06:34:30 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.3 1996/10/20 08:31:52 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 "access/itup.h"   
+#include "storage/itemid.h"  
+#include "storage/item.h"
+#include "storage/buf.h"  
+#include "storage/bufpage.h" 
+#include "access/sdir.h" 
+#include "access/funcindex.h"
+#include "utils/tqual.h"
+#include "storage/buf.h" 
+#include "access/relscan.h"
 #include "access/hash.h"
 
 ScanKey
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index bdb21f41983..c4ce2dbb511 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.3 1996/10/20 06:55:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.4 1996/10/20 08:31:57 scrappy Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -74,14 +74,45 @@
  */
 
 #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 "storage/itemid.h"
+
+#include "storage/item.h"
 #include "storage/bufpage.h"
+
 #include "access/heapam.h"
+
+#include <sys/types.h>
+#include "storage/backendid.h"
 #include "miscadmin.h"
 
+#include "access/valid.h"
+#include "utils/relcache.h"
+
 static bool	ImmediateInvalidation;
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 9db1d416629..03d1c918e29 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,18 +7,46 @@
  *
  *
  * IDENTIFICATION
- *    $Id: hio.c,v 1.3 1996/10/20 06:56:02 scrappy Exp $
+ *    $Id: hio.c,v 1.4 1996/10/20 08:31:59 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 "storage/buf.h"
+
+#include "storage/itemid.h"
+#include "storage/item.h"
 #include "storage/buf.h"
+#include "storage/off.h"
 #include "storage/bufpage.h"
+
+#include "utils/tqual.h"
 #include "access/relscan.h"
+
 #include "access/heapam.h"
+
 #include "storage/bufmgr.h"
 
 /*
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index ea00a971b8f..1ec4b8bfc9f 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.2 1996/10/20 06:56:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.3 1996/10/20 08:32:01 scrappy Exp $
  *
  * NOTES
  *    initam should be moved someplace else.
@@ -16,10 +16,33 @@
  */
 
 #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 "nodes/memnodes.h"
 
 #include "utils/mcxt.h"