diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index dee9a83476..9e8f498a3e 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.2 1996/08/27 22:15:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.3 1996/10/21 07:15:00 scrappy Exp $
  *
  * NOTES
  *    This file contains the high level access-method interface to the
@@ -15,23 +15,49 @@
  *	
  *-------------------------------------------------------------------------
  */
+
 #include "postgres.h"
 
-#include "access/heapam.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 "utils/memutils.h"
-#include "utils/mcxt.h"
-#include "utils/rel.h"
-#include "utils/elog.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"
+
 #include "catalog/catname.h"
 
-#include "access/transam.h"
-#include "access/xact.h"
-#include "commands/vacuum.h"	/* for VacuumRunning */
+#include "storage/spin.h"
+
+#include "commands/vacuum.h"
 
 /* ----------------
  *    global variables holding pointers to relations used
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 090bc2a5e5..d77fac11d2 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.2 1996/08/27 22:15:16 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.3 1996/10/21 07:15:06 scrappy Exp $
  *
  * NOTES
  *    This file contains support functions for the high
@@ -15,21 +15,42 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #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 "utils/rel.h"
-#include "utils/elog.h"
-#include "utils/memutils.h"
+#include <time.h>
 #include "utils/nabstime.h"
+#include "access/transam.h"
 
-#include "catalog/heap.h"
-#include "access/transam.h"	/* where the declarations go */
-#include "access/xact.h"	/* where the declarations go */
+#include "utils/bit.h"
 
-#include "storage/smgr.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"
 
 /* ----------------------------------------------------------------
  *		      general support routines
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index b6f21c96d3..27147fa98d 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,23 +7,44 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.3 1996/08/27 22:15:17 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.4 1996/10/21 07:15:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <math.h>
+
 #include "postgres.h"
 
+#include <stdio.h>
+#include "storage/ipc.h"
+#include "storage/block.h"
 #include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "storage/ipc.h"	/* for OIDGENLOCKID */
-
+#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 "utils/elog.h"
+#include "storage/bufmgr.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/transam.h"
 
+#include "storage/spin.h"
+
+#include "access/xact.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 "access/transam.h"	/* where the declarations go */
-#include "access/xact.h"	/* where the declarations go */
 
 #include "catalog/catname.h"
 
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 1798d09d05..1accb319b6 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.1.1.1 1996/07/09 06:21:13 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.2 1996/10/21 07:15:15 scrappy Exp $
  *	
  * NOTES
  *	Transaction aborts can now occur two ways:
@@ -135,17 +135,72 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #include "postgres.h"
+
+#include <time.h>
+#include "utils/nabstime.h"
 #include "access/xact.h"
-#include "commands/async.h"
-#include "storage/bufmgr.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/proc.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/htup.h"    
 #include "utils/inval.h"
-#include "utils/relcache.h"
-#include "access/transam.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"
+#include "access/htup.h"
+#include "access/relscan.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+#include "tcop/dest.h"
+#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"
+
 #include "catalog/heap.h"
 
+#include "utils/relcache.h"
+
+#include "miscadmin.h"
+
+#include "commands/async.h"
+
 /* ----------------
  *	global variables holding the current transaction state.
  *
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index faeeb623d5..84ee7ade1d 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.1.1.1 1996/07/09 06:21:14 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.2 1996/10/21 07:15:18 scrappy Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -19,12 +19,12 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
+
 #include "postgres.h"
+
 #include "utils/palloc.h"
-#include "utils/elog.h"
-#include "utils/memutils.h"
-#include "utils/nabstime.h"
+
+#include <stdio.h>
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;