diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index aa7bfc2862ed6ed4e592cabb640f2c98d8013e6a..d4d9523eaa5169826b465b4a4b7cc16705579d48 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -14,7 +14,6 @@
 
 #include "postgres.h"
  
-#include "utils/rel.h"
 #include "access/gist.h"
 #include "access/istrat.h"
 
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 5c4d115108eb910a7e3d0dda994627481aaaeb05..f5b5ab0975f7ed288b0ce80aab08a0634771deb0 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Id: hio.c,v 1.7 1996/11/03 12:34:52 scrappy Exp $
+ *    $Id: hio.c,v 1.8 1996/11/03 22:57:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "storage/buf.h"
 #include "storage/bufpage.h"
 #include "access/relscan.h"
 #include "access/heapam.h"
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index e8c485c51aeb5a95195fa340351e22fcc321c8e0..716ad2d77823d1ac2b8c4b0e281306534d2832a2 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.5 1996/10/31 08:32:22 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.6 1996/11/03 22:57:36 scrappy Exp $
  *
  * INTERFACE ROUTINES
  *	index_open 	- open an index relation by relationId
@@ -65,35 +65,6 @@
 
 #include "postgres.h"
  
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.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 <time.h>
-#include "utils/nabstime.h"
-#include "access/htup.h"
-#include "utils/tqual.h"
-#include "storage/buf.h"
-#include "access/relscan.h"   
-
-#include "access/sdir.h"
- 
-#include "access/funcindex.h"
 #include "access/genam.h"  
 
 #include "utils/relcache.h"
@@ -102,12 +73,6 @@
 
 #include "utils/palloc.h"
 
-#include <sys/types.h>
-#include "storage/ipc.h"
-#include "storage/spin.h"
-#include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/lock.h"
 #include "storage/lmgr.h"
 
 #include "access/heaptuple.h"
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 46dd441ce4045bda291a1e0d7b0cf5b7b23d22ba..f66795b926e8fc0400b9d1eb88c9388cd1c9f134 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,38 +8,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.5 1996/10/31 08:32:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.6 1996/11/03 22:57:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
  
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.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 "tcop/dest.h"
 #include "catalog/pg_proc.h"
 
 #include "catalog/pg_operator.h"
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 516e4cd678aca087a2d06f79d54f4f08240348dd..cde150d3539f29deebe34a80eb010216cbe0fec7 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.3 1996/10/23 07:38:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.4 1996/11/03 22:57:48 scrappy Exp $
  *
  *  NOTES
  *	These functions are stored in pg_amproc.  For each operator class
@@ -21,7 +21,6 @@
  */
 
 #include <string.h>
-#include <time.h>
 
 #include "postgres.h"
 #include "utils/nabstime.h"
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 7d0f96493403c97a5dbea46778546ff80161e4d5..1a7016a4bc20321a33d9902f148d7e40a0070f76 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.4 1996/11/03 12:35:17 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.5 1996/11/03 22:57:52 scrappy Exp $
  *
  *  NOTES
  *     Postgres btree pages look like ordinary relation pages.  The opaque
@@ -26,24 +26,14 @@
 
 #include "utils/rel.h"
 
-#include "storage/buf.h"
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
 #include "access/itup.h"
 #include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
 #include "storage/bufpage.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "access/relscan.h"
 #include "access/sdir.h"
 #include "access/nbtree.h"
 
-#include "storage/ipc.h"
-#include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 
 #ifndef HAVE_MEMMOVE
@@ -54,6 +44,8 @@
 
 #include "miscadmin.h"
 
+#include "storage/bufmgr.h"
+
 #define BTREE_METAPAGE	0
 #define BTREE_MAGIC	0x053162
 #define BTREE_VERSION	0
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index c80bb03bfdabf61cb8411c80504ac58170795e6d..ce99b6d0389fee9c3411521fc3cd1980a422796d 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.7 1996/11/03 12:35:19 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.8 1996/11/03 22:57:54 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -21,31 +21,18 @@
 #include "postgres.h"
 
 #include "utils/rel.h"
+#include "access/genam.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
 #include "storage/bufmgr.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
 #include "access/nbtree.h"
 
 #include "executor/executor.h"
 
 #include "access/heapam.h"
 
-#include "access/genam.h"
-
 #include "catalog/index.h"
 
 #include "miscadmin.h"
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 088430bf5f4da56387890ca28438dccd01c35b1b..2002089ba9ecfdc9d11acc57bbfa79b92ca2d0a2 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.3 1996/10/23 07:39:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.4 1996/11/03 22:57:55 scrappy Exp $
  *
  *
  * NOTES
@@ -29,32 +29,12 @@
 
 #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 "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
 #include "access/relscan.h"
 #include "access/sdir.h"
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index cb73ffe282547ef4a3cb2c1cbb2a1549a5e51b47..34c5d06a03b960353d3b0e253bddd9ad2bc95ad2 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,46 +7,21 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.6 1996/11/03 12:35:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.7 1996/11/03 22:57:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <time.h>
-
 #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 "access/genam.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
 #include "storage/bufmgr.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
 #include "access/nbtree.h"
-#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index dc7e7bf87b924ca1fb0e7a72bd29b40385223a12..1f328ef38f29f36bf22696102c1cb669af216c4e 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *    $Id: nbtsort.c,v 1.6 1996/11/03 12:35:22 scrappy Exp $
+ *    $Id: nbtsort.c,v 1.7 1996/11/03 22:57:57 scrappy Exp $
  *
  * NOTES
  *
@@ -48,25 +48,16 @@
  */
 
 #include <stdio.h>
-#include <time.h>
 #include <fcntl.h>
 
 #include "postgres.h"
 
 #include "utils/rel.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
 #include "access/itup.h"
 #include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
 #include "access/relscan.h"
 #include "access/sdir.h"
@@ -78,7 +69,6 @@
 # include <string.h>
 #endif
 
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #ifdef FASTBUILD
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index efbb2fdc64d723ddadaba7f246a0179232e93de7..152f0efd72aabdbd3dc8dc787cdca8bd74319d55 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,39 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.2 1996/10/20 10:53:16 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.3 1996/11/03 22:57: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 "access/itup.h"
 #include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "access/relscan.h"
 #include "access/sdir.h"
 #include "access/nbtree.h"
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 8f029ff0a007af458171c2329bdd31bb4e5ada34..b88524df7d5e4a5a718c10f6cc7d40c6630913ff 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.5 1996/11/03 12:35:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.6 1996/11/03 22:57:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,25 +17,13 @@
 #include "postgres.h"
 
 #include "utils/rel.h"
+#include "access/genam.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
 #include "access/nbtree.h"
 #include "access/istrat.h"
-#include "access/genam.h"
 #include "access/iqual.h"
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index aec1416f43ef4746bc07ec9dc09a67d4b8548c1c..e70f8ee368ec9533b1a1999f42c97291f1696f21 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.4 1996/10/31 08:52:51 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.5 1996/11/03 22:58:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,48 +17,20 @@
 
 #include "postgres.h"
  
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.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/bufmgr.h"
 
 #include "access/sdir.h"
  
-#include "storage/block.h" 
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "utils/palloc.h"
-#include "storage/buf.h"
 #include "access/relscan.h"
-#include "storage/block.h"
 #include "access/itup.h"
 #include "access/iqual.h"
  
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/page.h"
-#include "storage/bufpage.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include "storage/ipc.h"
-#include "storage/bufmgr.h"
- 
-#include "access/itup.h"
-
 #include "access/rtree.h"
 
+#include "storage/bufpage.h"
+
 static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
 			     ScanDirection dir);
 static RetrieveIndexResult rtscancache(IndexScanDesc s, ScanDirection dir);
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 293155741469d33726e22d4817c502821b549e03..21ee69243dd0d226047b438c27f05e9bd3003535 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,30 +7,25 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.7 1996/11/03 12:35:27 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.8 1996/11/03 22:58:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdio.h>
-#include <time.h>
 
 #include "postgres.h"
+#include "access/genam.h"
 
 #include "utils/palloc.h"
 #include "catalog/index.h"
 
-#include "access/relscan.h"  
 #include "access/rtscan.h"
 
 #include "storage/lmgr.h"
 
-#include "access/genam.h"
-
 #include "access/rtree.h"
-#include "access/funcindex.h"
  
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "utils/geo-decls.h"
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 7f278b8c8f1e1924ccbcfbefe4756751f5ebbf8e..d0b02db08861557f04adcba81abc894e5799d958 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,61 +7,27 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.6 1996/10/31 08:52:53 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.7 1996/11/03 22:58:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <string.h>
-#include <time.h>
 
 #include "postgres.h"
  
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.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/bufmgr.h"
+#include "access/genam.h"
  
-#include "storage/block.h" 
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "utils/nabstime.h"
 #include "utils/palloc.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
-#include "storage/buf.h"
-#include <sys/types.h>
-#include "storage/ipc.h"
-#include "storage/spin.h"
-#include "utils/hsearch.h" 
-#include "storage/shmem.h"
-#include "storage/lock.h"
 #include "storage/lmgr.h"
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/page.h"
 #include "storage/bufpage.h"
 #include <stdio.h>
-#include "storage/bufmgr.h"
-#include "access/relscan.h"
 
 #include "access/rtree.h"
 #include "access/rtstrat.h"
  
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "access/sdir.h"  
-#include "access/genam.h"
-
 /* routines defined and used here */
 static void rtregscan(IndexScanDesc s);
 static void rtdropscan(IndexScanDesc s);
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index e9b3275246fbfeeb4f556e8808e38c89caa3b0d0..868152a09a5eaf95be861fcf68c9c5169bd5cd90 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,25 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.3 1996/10/31 08:52:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.4 1996/11/03 22:58:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
  
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.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"
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 9e8f498a3e464a3f634047b11224a11ef1ad5886..d52c66b9128fbb847e342b699be2c3a2201f5dfc 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.3 1996/10/21 07:15:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.4 1996/11/03 22:58:18 scrappy Exp $
  *
  * NOTES
  *    This file contains the high level access-method interface to the
@@ -18,37 +18,13 @@
 
 #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 <stdio.h>
-#include "storage/ipc.h" 
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/transam.h"
-
 #include "access/xact.h"
 
 #include "nodes/memnodes.h"
 
-#include "storage/off.h"
-#include "storage/itemptr.h"  
 #include "access/htup.h"
-#include "utils/tqual.h"
-#include "access/relscan.h"
 #include "access/heapam.h"
 
 #include "utils/mcxt.h"
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index c0082450c60bd12b8c99205e22e26b09164ff06e..61ac7ce62dbd6aec1b6a503471a9f10df42fc0e6 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.4 1996/10/23 07:39:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.5 1996/11/03 22:58:20 scrappy Exp $
  *
  * NOTES
  *    This file contains support functions for the high
@@ -18,38 +18,13 @@
 
 #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 <stdio.h>
-#include "storage/ipc.h"  
-#include "storage/block.h" 
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/transam.h"
 
 #include "utils/bit.h"
 
 #include "access/xact.h"
 
-#include "storage/spin.h"
-#include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/off.h" 
-#include "storage/itemptr.h"
-#include "storage/lock.h"
 #include "storage/lmgr.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 27147fa98d8f27579ce26a1b3b8daf58b0fc4cd0..25277a15fca61869eab6302a8540f5e36b0b0bb6 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,31 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.4 1996/10/21 07:15:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.5 1996/11/03 22:58:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include "storage/ipc.h"
-#include "storage/block.h"
-#include "storage/buf.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/bufmgr.h"
-#include <time.h>
 #include "utils/nabstime.h"
 #include "access/transam.h"
 
@@ -42,7 +27,6 @@
 #include "storage/off.h"
 #include "storage/itemptr.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "access/relscan.h"
 #include "access/heapam.h"
 
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 1accb319b6a96f680b2b6e5ba743c404d71c5d2d..07d0981c663baaedbecd64c59a738955fc504d2d 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.2 1996/10/21 07:15:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.3 1996/11/03 22:58:25 scrappy Exp $
  *	
  * NOTES
  *	Transaction aborts can now occur two ways:
@@ -138,37 +138,18 @@
 
 #include "postgres.h"
 
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/xact.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/htup.h"    
 #include "utils/inval.h"
 
 #include "nodes/memnodes.h"
-#include "utils/tqual.h"
-#include "nodes/primnodes.h" 
 #include "nodes/parsenodes.h" 
 #include "nodes/params.h"
 #include "access/sdir.h"
 #include "executor/hashjoin.h"
-#include "nodes/primnodes.h"
-#include "nodes/memnodes.h"
 #include "storage/buf.h"
 #include "executor/tuptable.h"
 #include "access/funcindex.h"
@@ -180,15 +161,8 @@
 #include "executor/execdesc.h"
 #include "utils/portal.h"
 
-#include <stdio.h>
-#include "storage/ipc.h"
-#include "storage/bufmgr.h"
 #include "access/transam.h" 
 
-#include "storage/spin.h" 
-#include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/lock.h"
 #include "storage/proc.h"
 
 #include "utils/mcxt.h"
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 84ee7ade1d4112f450f43e9243e168b869fdde47..ad6beb403d63799d41b7e23eb809833feaedfb56 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.2 1996/10/21 07:15:18 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.3 1996/11/03 22:58:26 scrappy Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -19,12 +19,11 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <stdio.h>
 
 #include "postgres.h"
-
 #include "utils/palloc.h"
 
-#include <stdio.h>
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;