More include file cleanups

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

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,

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)

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
 

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;
 

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"
 
 /* ----------------

src/include/nodes/memnodes.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memnodes.h,v 1.2 1996/10/19 06:27:27 scrappy Exp $
+ * $Id: memnodes.h,v 1.3 1996/11/03 08:17:27 scrappy Exp $
  *
  * XXX the typedefs in this file are different from the other ???nodes.h;
  *    they are pointers to structures instead of the structures themselves.
@@ -18,6 +18,7 @@
 #ifndef	MEMNODES_H
 #define MEMNODES_H
 
+#include "nodes/nodes.h"
 #include "utils/memutils.h"
 #include "lib/fstack.h"
 

src/include/utils/mcxt.h

@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.2 1996/10/31 09:51:24 scrappy Exp $
+ * $Id: mcxt.h,v 1.3 1996/11/03 08:17:34 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	MCXT_H
 #define MCXT_H
 
-
 #include "nodes/memnodes.h"
-#include "nodes/nodes.h"
 
 extern MemoryContext	CurrentMemoryContext;
 extern MemoryContext	TopMemoryContext;

src/include/utils/tqual.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.3 1996/10/23 07:42:13 scrappy Exp $
+ * $Id: tqual.h,v 1.4 1996/11/03 08:17:38 scrappy Exp $
  *
  * NOTE
  *    It may be desirable to allow time qualifications to indicate
@@ -17,7 +17,6 @@
 #ifndef	TQUAL_H
 #define TQUAL_H
 
-#include "utils/nabstime.h"
 #include "access/htup.h"
 
 typedef struct TimeQualSpace {