diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 55e57818b3362954bba388ce9f3cd4f5d3bf0eff..b67e6fb9e6295b51d8efe2eaaefa18eb937bc048 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.12 1996/11/01 09:41:35 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.13 1996/11/03 08:16:44 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -21,9 +21,7 @@
 
 #include "access/htup.h"
 #include "access/transam.h"
-#include "access/tupdesc.h"
 #include "access/tupmacs.h"
-#include "storage/buf.h"
 #include "storage/bufpage.h"
 #include "utils/memutils.h"
 #include "utils/palloc.h"
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index a693b43fd9394fdb54163b54cc04a5fb2021eb8b..6164770db6b8db8f61d372e5b1fadf9504afcb5f 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,28 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.9 1996/11/01 09:41:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.10 1996/11/03 08:16:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/htup.h"
-#include "utils/rel.h"
-#include "access/tupdesc.h"
-
 #include "fmgr.h"
-#include "catalog/pg_attribute.h"
-#include "storage/buf.h"
-#include "storage/item.h"
-#include "storage/itemid.h"
-#include "storage/page.h"
-
+#include "access/heaptuple.h"
 #include "access/xact.h"
 #include "storage/bufpage.h"
-
-#include "access/heaptuple.h"
+#include "utils/rel.h"
 #include "utils/tqual.h"
 
 /* ----------------
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 389e6eeb752e8b3f3a496f5d2416289ca29e7d7c..01734b42e75e904bcb3f9ca34cd18649118b7f17 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,33 +8,20 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.8 1996/11/01 09:41:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.9 1996/11/03 08:16:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-
 #include "postgres.h"
-#include "access/htup.h"
-#include "utils/rel.h"
-
-#include "access/tupmacs.h"
-#include "catalog/pg_attribute.h"
-#include "storage/buf.h"
-#include "utils/memutils.h"
-#include "utils/palloc.h"
 
+#include "access/heapam.h"
 #include "access/ibit.h"
-#include "access/tupdesc.h"
-
 #include "access/itup.h"
-
-#include "utils/tqual.h"
-
 #include "access/relscan.h"
+#include "access/tupmacs.h"
+#include "utils/palloc.h"
 
-#include "access/heapam.h"
 
 static Size IndexInfoFindDataOffset(unsigned short t_info);
 
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index 4100e179d5fe8bd5b80069b35c560308b3dd8db0..bb1970c4fff153bd107fbd3892f99767adf167f2 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.9 1996/11/01 09:41:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.10 1996/11/03 08:16:48 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,14 +15,9 @@
 #include "postgres.h"
 
 #include "access/htup.h"
-#include "access/tupdesc.h"
-
-#include "executor/execdebug.h"
-
-#include "access/skey.h"
-
 #include "access/itup.h"
-
+#include "access/skey.h"
+#include "executor/execdebug.h"
 
 /* ----------------------------------------------------------------
  *		  index scan key qualification code
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 9afff872642303f9bf2a21cefe9d55135441b3ad..aefe620fb951fdc4bc4bb6fe9646fc66f200ec61 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,31 +8,24 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.7 1996/11/01 09:41:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.8 1996/11/03 08:16:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "postgres.h"
 
-#include "access/htup.h"
+#include "access/heaptuple.h" 
 #include "utils/rel.h"
-#include "access/tupdesc.h"
+#include "utils/palloc.h"
 
 #include "fmgr.h" 
 #include "libpq/pqcomm.h"
-#include "storage/buf.h"
-#include "utils/palloc.h"
 
 #include "libpq/libpq.h"
 
 #include "catalog/pg_type.h"
 #include "utils/syscache.h"
-#include "access/heaptuple.h" 
 
 /* ----------------------------------------------------------------
  *	printtup / debugtup support
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index e4940a61ca371f0d2f1f4d774521e92759ebca65..8b1717e81b292b3b4cb97b38abad4bd486cb39f3 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.6 1996/11/01 09:41:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.7 1996/11/03 08:16:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "fmgr.h"
 #include "access/attnum.h"
-
 #include "access/skey.h"
 
 /*
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index c8809543ecdb511e04156c0adccbc3b8b301f55a..4ddf1c09888c2835b1f2f101d412d7f944ca205e 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.7 1996/11/01 09:41:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.8 1996/11/03 08:16:51 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -16,15 +16,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-
 #include "postgres.h"
 
 #include "access/htup.h"
 #include "utils/rel.h"
-#include "access/tupdesc.h"
 
 #include "utils/fcache.h"
 #include "utils/geo-decls.h"
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 802064cff0b0b6a9b3d23cdfdf9c43067b0a5697..aa7f84eef851026b24bc1ec70b52811d57c42c0c 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 7dcbd60e60e0dd76a1480a34a1af21f3f19704b5..14de5b094e9571a9c0dd348743498661211eff80 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 69b4c9fb38d30eaae92bd1c3302931bcf414b05b..57cb73051845b8893deac748681ddb0ef616c884 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 4588ed1d73514aa8a89dfa49f01db3e5c68998e7..2b69da693ee3d4ee1e671019d80220880cd85356 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 860d9c31fbc04f243c1837a99ac18e9a0e7cd87f..510e2907c96b3cb8bc46ce815e7dbbd4a6c17c18 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 9b09093379a329a3f02d4bc3a9f5361fd0caf1c2..526048d663e2332cc98a5c9453e4fda4cd7d2bb4 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"
 
 /* ----------------
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index d508e9ef4555e6beafab2fb84224feff7381f268..b97f581d7324a1d8ddb42e87c30a071facdbb66d 100644
--- a/src/include/nodes/memnodes.h
+++ b/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"
 
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 1678c8d21feee2378eff4130cb212870cbd60c15..bc405cd93644a1f806838e5e739f840a264d4ca4 100644
--- a/src/include/utils/mcxt.h
+++ b/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;
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index f02df8114ca45c53a29e98d3b91d55496c826750..18586b7a6228358a483b3fe93a8dc205f15912fa 100644
--- a/src/include/utils/tqual.h
+++ b/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 {