5 files changed, 6 insertions, 98 deletions
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 9e8f498a3e..d52c66b912 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 c0082450c6..61ac7ce62d 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 27147fa98d..25277a15fc 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 1accb319b6..07d0981c66 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 84ee7ade1d..ad6beb403d 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;