6 files changed, 15 insertions, 27 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 802064cff0b..aa7f84eef85 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,24 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.3 1996/10/31 09:46:37 scrappy Exp $
+ * $Id: heapam.h,v 1.4 1996/11/03 08:17:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	HEAPAM_H
 #define HEAPAM_H
 
-#include <sys/types.h>
-
-
-#include "access/attnum.h"
-#include "access/htup.h"
 #include "access/relscan.h"
-#include "access/skey.h"
-#include "utils/tqual.h"
-#include "access/tupdesc.h"
-#include "storage/smgr.h"
-#include "utils/rel.h"
+#include "storage/buf.h"
 
 /* ----------------------------------------------------------------
  *		heap access method statistics
diff --git a/src/include/access/heaptuple.h b/src/include/access/heaptuple.h
index 7dcbd60e60e..14de5b094e9 100644
--- a/src/include/access/heaptuple.h
+++ b/src/include/access/heaptuple.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heaptuple.h,v 1.1 1996/10/18 17:58:33 scrappy Exp $
+ * $Id: heaptuple.h,v 1.2 1996/11/03 08:17:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	HEAPTUPLE_H
 #define HEAPTUPLE_H
 
+#include "access/htup.h"
+#include "storage/buf.h"
+#include "access/tupdesc.h"
+
 extern char *heap_getattr(HeapTuple tup,
                           Buffer b,
                           int attnum,
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 69b4c9fb38d..57cb7305184 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.2 1996/10/19 04:09:32 scrappy Exp $
+ * $Id: ibit.h,v 1.3 1996/11/03 08:17:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	IBIT_H
 #define IBIT_H
 
-#include "utils/memutils.h"
+#include "utils/memutils.h" 
 
 typedef struct IndexAttributeBitMapData {
 	char	bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 4588ed1d735..2b69da693ee 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.2 1996/10/19 04:08:58 scrappy Exp $
+ * $Id: itup.h,v 1.3 1996/11/03 08:17:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,7 @@
 #define ITUP_H
 
 #include "storage/itemptr.h"
-#include "access/tupdesc.h"
+#include "access/tupdesc.h" 
 
 #define MaxIndexAttributeNumber	7
 
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 860d9c31fbc..510e2907c96 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.3 1996/10/23 07:41:30 scrappy Exp $
+ * $Id: relscan.h,v 1.4 1996/11/03 08:17:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	RELSCAN_H
 #define RELSCAN_H
 
-#include "utils/tqual.h"
 #include "utils/rel.h"
-#include "storage/buf.h"
+#include "utils/tqual.h" 
+#include "storage/buf.h" 
 
 typedef ItemPointerData	MarkData;
 
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 9b09093379a..526048d663e 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,20 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.1 1996/08/27 21:50:29 scrappy Exp $
+ * $Id: xact.h,v 1.2 1996/11/03 08:17:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XACT_H
 #define XACT_H
 
-#include <signal.h>
-
-#include "storage/ipc.h"
-#include "miscadmin.h"
-#include "utils/portal.h"
-#include "utils/elog.h"
-#include "utils/mcxt.h"
 #include "utils/nabstime.h"
 
 /* ----------------