diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 8fb5bd29cf..37de0fad34 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.8 1996/10/31 08:24:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.9 1996/11/03 12:34:33 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -15,58 +15,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.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/block.h"  
-#include "storage/off.h" 
-#include "storage/itemptr.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/page.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 "storage/ipc.h"
-#include "executor/hashjoin.h"
-#include "utils/fcache.h"
-#include "nodes/primnodes.h"
-#include "utils/memutils.h"
-#include "lib/fstack.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 "catalog/pg_index.h"
 #include "executor/executor.h"
 
 #include "access/heapam.h"
@@ -83,7 +38,6 @@
 # include <string.h>
 #endif
 
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "miscadmin.h"
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 2f5d0c44e9..6b2edf6320 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.6 1996/11/03 12:34:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,39 +17,9 @@
 
 #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 "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/page.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/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "utils/palloc.h"
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 2880d353a7..ad479be2f4 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,57 +7,26 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.7 1996/11/03 12:34:38 scrappy Exp $
  *
  * NOTES
  *    Overflow pages look like ordinary relation pages.
  *
  *-------------------------------------------------------------------------
  */
-
-#include <stdio.h>
-#include <time.h>
-#include <string.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/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.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/page.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 "storage/ipc.h"
 #include "storage/bufmgr.h"
-
-
 #include "utils/memutils.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
 static uint32 _hash_firstfreebit(uint32 map);
 
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 3ee2fc1a9d..276d7216a8 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.5 1996/10/31 08:24:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.6 1996/11/03 12:34:40 scrappy Exp $
  *
  * NOTES
  *    Postgres hash pages look like ordinary relation pages.  The opaque
@@ -23,58 +23,27 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <time.h>
-#include <string.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/block.h"
-#include "storage/off.h"  
-#include "storage/itemptr.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/page.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 "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "miscadmin.h"
 
 #include "utils/memutils.h"
 
-#include "storage/spin.h"
-#include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/lock.h"
 #include "storage/lmgr.h"
 
 #include "access/genam.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
 static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);
 static void _hash_splitpage(Relation rel, Buffer metabuf, Bucket obucket, Bucket nbucket);
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index 56717a59b4..8bd14394e3 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.5 1996/10/31 08:24:42 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.6 1996/11/03 12:34:41 scrappy Exp $
  *
  * NOTES
  *    Because we can be doing an index scan on a relation while we
@@ -27,41 +27,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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/block.h"
-#include "storage/off.h"  
-#include "storage/itemptr.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/page.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 "utils/palloc.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 fdb3cc51e5..2dcda4dec6 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,48 +7,17 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.6 1996/11/03 12:34:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.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/block.h"  
-#include "storage/off.h"
-#include "storage/itemptr.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/page.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 "utils/palloc.h"
+#include "storage/bufmgr.h"
 
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
@@ -56,9 +25,6 @@
 # include <string.h>
 #endif 
 
-#include "storage/ipc.h" 
-#include "storage/bufmgr.h"
-
 /*
  *  _hash_search() -- Finds the page/bucket that the contains the
  *  scankey and loads it into *bufP.  the buffer has a read lock.
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 5d248f7b8b..9c0911e3a8 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,46 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.5 1996/10/31 08:24:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.6 1996/11/03 12:34:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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/block.h"  
-#include "storage/off.h"
-#include "storage/itemptr.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/page.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 "access/istrat.h"
 
 /* 
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 51e0baf6c1..f14c6c10f3 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,47 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.5 1996/10/31 08:24:47 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.6 1996/11/03 12:34:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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/block.h"  
-#include "storage/off.h"
-#include "storage/itemptr.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/page.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 "utils/palloc.h"
+#include "fmgr.h"
+#include "utils/memutils.h"
+#include "access/iqual.h"
 
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
@@ -55,12 +27,6 @@
 # include <string.h>
 #endif
 
-#include "fmgr.h"
-
-#include "utils/memutils.h"
-
-#include "access/iqual.h"
-
 ScanKey
 _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
 {
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 04c43d2e47..28df1af592 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.6 1996/10/31 08:28:51 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.7 1996/11/03 12:34:50 scrappy Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -75,44 +75,13 @@
 
 #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 "storage/itemid.h"
-
-#include "storage/item.h"
-#include "storage/page.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"
 
 #ifndef HAVE_MEMMOVE
@@ -121,18 +90,14 @@
 # include <string.h>
 #endif
 
-#include <stdio.h>
-#include "storage/ipc.h" 
+#include "access/valid.h"
+
 #include "storage/bufmgr.h"
 
 #include "utils/palloc.h"
 
 #include "access/hio.h"
 
-#include "storage/spin.h"
-#include "utils/hsearch.h"
-#include "storage/shmem.h"
-#include "storage/lock.h"  
 #include "storage/lmgr.h"
 
 #include "storage/smgr.h"
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 579535dae4..5c4d115108 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,51 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Id: hio.c,v 1.6 1996/10/31 08:28:52 scrappy Exp $
+ *    $Id: hio.c,v 1.7 1996/11/03 12:34:52 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 "storage/buf.h"
-
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/off.h"
-#include "storage/page.h"
 #include "storage/bufpage.h"
-
-#include "utils/tqual.h"
 #include "access/relscan.h"
-
 #include "access/heapam.h"
-
-#include <stdio.h>
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
-
 #include "utils/memutils.h"
 
 /*
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 35d4827c46..7f39559069 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.5 1996/10/31 08:28:53 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.6 1996/11/03 12:34:55 scrappy Exp $
  *
  * NOTES
  *    initam should be moved someplace else.
@@ -15,37 +15,14 @@
  *-------------------------------------------------------------------------
  */
 
+#include <stdio.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/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 "utils/memutils.h"
-#include "lib/fstack.h"
 #include "nodes/memnodes.h"
 
 #include "utils/mcxt.h"
@@ -58,8 +35,6 @@
 # include <string.h>
 #endif
 
-#include <stdio.h>
-
 /* ----------------
  *      InitHeapAccessStatistics
  * ----------------
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 2c2b778524..935402a383 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.4 1996/10/31 08:32:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.5 1996/11/03 12:35:02 scrappy Exp $
  *
  * NOTES
  *    many of the old access method routines have been turned into
@@ -46,42 +46,12 @@
 
 #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 "access/itup.h"
-
 #include "access/sdir.h"
 
-#include "lib/dllist.h"
-#include "lib/fstack.h"
-#include "utils/memutils.h"
-#include "nodes/memnodes.h"
 #include "utils/catcache.h"
 
-#include "access/funcindex.h"
 #include "access/genam.h"
 
 #include "utils/palloc.h"
@@ -92,8 +62,6 @@
 # include <string.h>
 #endif
 
-#include <stdio.h>
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index ebfa65f16d..5fe97489f2 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.4 1996/10/25 09:55:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.5 1996/11/03 12:35:11 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,17 +17,6 @@
 
 #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/buf.h"
@@ -51,6 +40,12 @@
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
 static Buffer _bt_split(Relation rel, Buffer buf);
 static OffsetNumber _bt_findsplitloc(Relation rel, Page page, OffsetNumber start, OffsetNumber maxoff, Size llimit);
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 5325bf0f03..7d0f964934 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.3 1996/10/23 07:39:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.4 1996/11/03 12:35:17 scrappy Exp $
  *
  *  NOTES
  *     Postgres btree pages look like ordinary relation pages.  The opaque
@@ -24,17 +24,6 @@
 
 #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/buf.h"
@@ -57,6 +46,14 @@
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
+#include "miscadmin.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 d157dc75ae..c80bb03bfd 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.6 1996/10/24 06:30:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.7 1996/11/03 12:35:19 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -20,18 +20,6 @@
 
 #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 "catalog/index.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"
@@ -52,24 +40,16 @@
 #include "access/sdir.h"
 #include "access/nbtree.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 "catalog/pg_index.h"
 #include "executor/executor.h"
 
 #include "access/heapam.h"
 
 #include "access/genam.h"
 
+#include "catalog/index.h"
+
+#include "miscadmin.h"
+
 bool	BuildingBtree = false;
 bool	FastBuild = false; /* turn this on to make bulk builds work*/
 
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 3d3ff08524..cb73ffe282 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.5 1996/10/30 06:08:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.6 1996/11/03 12:35:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,6 +48,12 @@
 #include "access/nbtree.h"
 #include "access/genam.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 #include "fmgr.h"
 
 static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in);
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index aa6d1e6cb6..dc7e7bf87b 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.5 1996/10/23 07:39:11 scrappy Exp $
+ *    $Id: nbtsort.c,v 1.6 1996/11/03 12:35:22 scrappy Exp $
  *
  * NOTES
  *
@@ -53,17 +53,6 @@
 
 #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"
@@ -83,6 +72,12 @@
 #include "access/sdir.h"
 #include "access/nbtree.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index fac79e7b4f..8f029ff0a0 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.4 1996/10/23 07:39:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.5 1996/11/03 12:35:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,17 +16,6 @@
 
 #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"
@@ -48,7 +37,11 @@
 #include "access/istrat.h"
 #include "access/genam.h"
 #include "access/iqual.h"
-
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
 #include "fmgr.h"
 
 ScanKey 
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 36314686b2..2931557414 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.6 1996/10/31 08:52:52 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.7 1996/11/03 12:35:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,73 +16,29 @@
 #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 "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 "utils/nabstime.h"
-#include "access/htup.h"
- 
-#include "access/itup.h"
- 
-#include "utils/tqual.h"
+
 #include "utils/palloc.h"
-#include "storage/buf.h"
+#include "catalog/index.h"
+
 #include "access/relscan.h"  
 #include "access/rtscan.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/genam.h"
+
 #include "access/rtree.h"
 #include "access/funcindex.h"
  
-#include "nodes/params.h"
-#include "access/sdir.h"
-#include "executor/hashjoin.h"
-#include "utils/fcache.h"
-#include "nodes/primnodes.h"
-#include "lib/fstack.h"
-#include "utils/memutils.h"
-#include "nodes/memnodes.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
- 
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "utils/geo-decls.h"
  
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "tcop/dest.h"
-#include "executor/execdesc.h"
-#include "catalog/pg_index.h"
 #include "executor/executor.h"
 
 #include "access/heapam.h"
 
-#include "storage/itemid.h"
-#include "storage/item.h"
-#include "storage/buf.h"
-#include "storage/page.h"
 #include "storage/bufpage.h"
 
 typedef struct SPLITVEC {