diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 176df283b9a06cce045f11e745813a13c3479b7f..deabe9aaaf999324c994bd0de173cd1b595ad991 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.5 1996/10/18 19:01:16 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.6 1996/10/19 04:51:32 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -19,30 +19,9 @@
 
 #include "postgres.h"
 
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.h" /* required for nodes/pg_list.h */
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
-#include "storage/block.h" /* required for storage/itemptr.h */
-#include "storage/off.h" /* required for storage/itemptr.h */
-#include "storage/itemptr.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-
 #include "storage/buf.h"
-
-#include "storage/itemid.h"
-#include "storage/item.h"
 #include "storage/bufpage.h"
-
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "rewrite/prs2lock.h"
-#include "access/skey.h" /* required for access/strat.h */
-#include "access/strat.h"
 #include "utils/rel.h"
 
 /* this is so the sparcstation debugger works */
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index bb49ec33f17b66a413b4f57b0f30c995d8b1539e..2f25697152013060bbbd875fd6933b54d1f010f7 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,41 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.2 1996/10/19 03:12:50 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.3 1996/10/19 04:51:34 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "utils/nabstime.h"
 #include "access/htup.h"
-
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
 #include "access/skey.h"
-
 #include "storage/buf.h"
-
 #include "storage/itemid.h"
-
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "rewrite/prs2lock.h"
-#include "access/strat.h"
 #include "utils/rel.h"
-
-#include "storage/item.h"
 #include "storage/bufpage.h"
-
 #include "utils/tqual.h"
 
 /* ----------------
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index f7c0ec7b763918a58c692a65b1ae8075f84af668..c7f136bf68695dbb7a6a85bccc131f5a5865f805 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,24 +8,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.2 1996/10/19 03:28:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.3 1996/10/19 04:51:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "nodes/nodes.h"
-#include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "catalog/pg_attribute.h"
-#include "access/tupdesc.h"
 #include "access/itup.h"
-
-#include "utils/memutils.h"
 #include "access/ibit.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 0b96fbd5ebda78644eadc278b771820c7f3dcb3c..6f1fc8815b08cb37d970d0b77c5229c2e2fad77a 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,29 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.2 1996/10/19 03:39:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.3 1996/10/19 04:51:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "nodes/nodes.h"
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
 #include "access/itup.h"
-
 #include "access/skey.h"
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "utils/nabstime.h"
-#include "storage/itemptr.h"
 #include "access/htup.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 2cf94f5ccf47bb68c6eb8795992be9146b6561d0..72985cafa182b7e96969f85945cdd807ba4929a4 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,31 +8,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.2 1996/10/18 04:54:47 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.3 1996/10/19 04:51:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/htup.h"
-#include "access/skey.h"
-#include "access/printtup.h"
-#include "access/tupdesc.h"
-#include "storage/buf.h"
-#include "utils/memutils.h"
-#include "utils/palloc.h"
-#include "fmgr.h"
-#include "utils/elog.h"
-
 #include "utils/syscache.h"
 #include "catalog/pg_type.h"
+#include "storage/buf.h"
 
-#include "libpq/libpq.h"
 
 /* ----------------------------------------------------------------
  *	printtup / debugtup support
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 7a47219a73cc187ff15ec5856c280737afc6865f..6e7d91b626bb107b21cff8e33d38bd3bfafe2c83 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,16 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.1.1.1 1996/07/09 06:21:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.2 1996/10/19 04:51:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
-#include "access/sdir.h"
-#include "access/attnum.h"
+
+#include "postgres.h"
+
 #include "access/skey.h"
 
-#include "fmgr.h"
 
 /*
  * ScanKeyEntryIsLegal --
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 527eb5113dfc5430c35b63a0de3e7cdc4f478cb0..aba6ed8e77d48564f2d7f2abd8ff2cbb06320b20 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.1.1.1 1996/07/09 06:21:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.2 1996/10/19 04:51:44 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -15,29 +15,15 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>	/* for sprintf() */
-#include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/parsenodes.h"
-
-#include "access/attnum.h"
-#include "access/htup.h"
 #include "access/tupdesc.h"
-
-#include "utils/builtins.h"
-#include "utils/elog.h"		/* XXX generate exceptions instead */
-#include "utils/palloc.h"
-
-#include "utils/syscache.h"
+#include "access/htup.h"
 #include "catalog/pg_type.h"
-
-#include "nodes/primnodes.h"
-
+#include "utils/syscache.h"
 #include "parser/catalog_utils.h"
+#include "nodes/parsenodes.h"
 
 /* ----------------------------------------------------------------
  *	CreateTemplateTupleDesc