diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile
index 72f69e616f..79882ecb03 100644
--- a/src/backend/access/hash/Makefile
+++ b/src/backend/access/hash/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for access/hash
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.1 1996/10/27 09:46:08 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.2 1996/10/31 08:24:36 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 20a2b65a83..8fb5bd29cf 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.7 1996/10/24 06:30:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.8 1996/10/31 08:24:37 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -15,10 +15,14 @@
  *-------------------------------------------------------------------------
  */
 
+#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"
@@ -33,13 +37,13 @@
 #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/page.h"
 #include "storage/bufpage.h"
 #include "access/sdir.h"
 #include "access/funcindex.h"
@@ -48,8 +52,12 @@
 #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"
@@ -58,7 +66,6 @@
 #include "nodes/parsenodes.h"
 #include "tcop/dest.h"
 #include "executor/execdesc.h"
-#include <stdio.h>
 #include "catalog/pg_index.h"
 #include "executor/executor.h"
 
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 7527114bd0..2f5d0c44e9 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,15 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.4 1996/10/21 05:45:13 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 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"
@@ -30,13 +34,13 @@
 #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/page.h"
 #include "storage/bufpage.h"
 #include "access/sdir.h"
 #include "access/funcindex.h"
@@ -45,7 +49,6 @@
 #include "access/relscan.h"
 #include "access/hash.h"
 
-#include <stdio.h>
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 33f0bd40cc..2880d353a7 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.5 1996/10/23 07:38:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $
  *
  * NOTES
  *    Overflow pages look like ordinary relation pages.
@@ -15,10 +15,15 @@
  *-------------------------------------------------------------------------
  */
 
+#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"
@@ -33,26 +38,23 @@
 #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/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 <stdio.h>
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
-#include <string.h>
 
 #include "utils/memutils.h"
 
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 6a236e3085..3ee2fc1a9d 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.4 1996/10/21 05:45:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.5 1996/10/31 08:24:41 scrappy Exp $
  *
  * NOTES
  *    Postgres hash pages look like ordinary relation pages.  The opaque
@@ -23,10 +23,15 @@
  *-------------------------------------------------------------------------
  */
 
+#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" 
@@ -41,22 +46,20 @@
 #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/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 <stdio.h>
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
@@ -64,8 +67,6 @@
 
 #include "utils/memutils.h"
 
-#include <string.h>
-
 #include "storage/spin.h"
 #include "utils/hsearch.h"
 #include "storage/shmem.h"
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index a4f2c442bf..56717a59b4 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.4 1996/10/21 05:45:16 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.5 1996/10/31 08:24:42 scrappy Exp $
  *
  * NOTES
  *    Because we can be doing an index scan on a relation while we
@@ -27,10 +27,13 @@
  *-------------------------------------------------------------------------
  */
 
+#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"
@@ -45,18 +48,17 @@
 #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/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"
 
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index fc09951511..fdb3cc51e5 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,15 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.4 1996/10/21 05:45:19 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 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"
@@ -30,18 +34,17 @@
 #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/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"
 
@@ -53,7 +56,6 @@
 # include <string.h>
 #endif 
 
-#include <stdio.h>
 #include "storage/ipc.h" 
 #include "storage/bufmgr.h"
 
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 6a54f87a70..5d248f7b8b 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,15 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.4 1996/10/21 05:45:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.5 1996/10/31 08:24: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" 
@@ -30,18 +33,17 @@
 #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/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"
 
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 25231d9671..51e0baf6c1 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,15 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.4 1996/10/21 05:45:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.5 1996/10/31 08:24:47 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" 
@@ -30,18 +33,17 @@
 #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/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"