diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index d52c66b9128fbb847e342b699be2c3a2201f5dfc..b11af7486e7a9b730b865280dd1cc442eb2fc9f1 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.4 1996/11/03 22:58:18 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.5 1996/11/05 11:12:28 scrappy Exp $
  *
  * NOTES
  *    This file contains the high level access-method interface to the
@@ -16,24 +16,15 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "utils/rel.h"
-#include "access/transam.h"
-#include "access/xact.h"
-
-#include "nodes/memnodes.h"
-
-#include "access/htup.h"
-#include "access/heapam.h"
-
-#include "utils/mcxt.h"
-
-#include "catalog/catname.h"
-
-#include "storage/spin.h"
-
-#include "commands/vacuum.h"
+#include <access/transam.h>
+#include <access/xact.h>
+#include <access/heapam.h>
+#include <utils/mcxt.h>
+#include <catalog/catname.h>
+#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 61ac7ce62dbd6aec1b6a503471a9f10df42fc0e6..61767d6bb0d23c9ce8ee58619bbccf41a716fe67 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.5 1996/11/03 22:58:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.6 1996/11/05 11:12:30 scrappy Exp $
  *
  * NOTES
  *    This file contains support functions for the high
@@ -16,16 +16,12 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "utils/rel.h"
-#include "access/transam.h"
-
-#include "utils/bit.h"
-
-#include "access/xact.h"
-
-#include "storage/lmgr.h"
+#include <access/transam.h>
+#include <utils/bit.h>
+#include <access/xact.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 25277a15fca61869eab6302a8540f5e36b0b0bb6..b622976acb8e5774ea489e2758c7f327a011e981 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,30 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.5 1996/11/03 22:58:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.6 1996/11/05 11:12:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "catalog/pg_attribute.h"
-#include "access/tupdesc.h"
-#include "storage/bufmgr.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 "access/relscan.h"
-#include "access/heapam.h"
-
-#include "catalog/catname.h"
+#include <access/transam.h>
+#include <storage/spin.h>
+#include <access/xact.h>
+#include <access/heapam.h>
+#include <catalog/catname.h>
 
 /* ---------------------
  *	spin lock for oid generation
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 07d0981c663baaedbecd64c59a738955fc504d2d..008499fc3b2e77af933ee75a7b75684931406081 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.3 1996/11/03 22:58:25 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.4 1996/11/05 11:12:32 scrappy Exp $
  *	
  * NOTES
  *	Transaction aborts can now occur two ways:
@@ -136,44 +136,18 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "access/xact.h"
-
-#include "access/tupdesc.h"
-#include "utils/rel.h"  
-#include "access/htup.h"    
-#include "utils/inval.h"
-
-#include "nodes/memnodes.h"
-#include "nodes/parsenodes.h" 
-#include "nodes/params.h"
-#include "access/sdir.h"
-#include "executor/hashjoin.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 "access/transam.h" 
-
-#include "storage/proc.h"
-
-#include "utils/mcxt.h"
-
-#include "catalog/heap.h"
-
-#include "utils/relcache.h"
-
-#include "miscadmin.h"
-
-#include "commands/async.h"
+#include <access/xact.h>
+#include <utils/inval.h>
+#include <utils/portal.h>
+#include <access/transam.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 ad6beb403d63799d41b7e23eb809833feaedfb56..5d1293d66bf2332c7da31f889c876c99ace14885 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.3 1996/11/03 22:58:26 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.4 1996/11/05 11:12:33 scrappy Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -19,11 +19,10 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 
-#include "postgres.h"
-#include "utils/palloc.h"
+#include <stdio.h>
 
+#include <postgres.h>
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;