diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index eb8589a369..960445ed57 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.7 1996/10/20 08:31:26 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.8 1996/10/20 22:04:36 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -45,6 +45,23 @@
 #include "access/strat.h"
 #include "utils/rel.h"
 
+#include "utils/memutils.h"
+
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
+#include "access/tupmacs.h"
+
+#include "utils/palloc.h"
+
+#include <stdio.h>
+#include "storage/ipc.h"
+#include "storage/bufmgr.h"
+#include "access/transam.h"
+
 /* this is so the sparcstation debugger works */
 
 #if !defined(NO_ASSERT_CHECKING) && defined(sparc)
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index 53e0787197..70720fbe81 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.4 1996/10/20 08:31:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.5 1996/10/20 22:04:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,6 +45,12 @@
 
 #include "utils/tqual.h"
 
+#include "access/xact.h"
+
+#include "fmgr.h"
+
+#include "access/heaptuple.h"
+
 /* ----------------
  *	heap_keytest
  *
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index d0696aa70e..fbac15b4de 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.4 1996/10/20 08:31:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.5 1996/10/20 22:04:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,27 @@
 
 #include "access/tupmacs.h"
 
+#include <string.h>
+
+#include "utils/palloc.h"
+
+#include <time.h>
+#include "storage/fd.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_class.h"
+#include "nodes/nodes.h"
+#include "rewrite/prs2lock.h"
+#include "access/skey.h"
+#include "access/strat.h"
+#include "utils/rel.h"
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "storage/itemptr.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.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 d9ddbaab50..41eff14070 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.4 1996/10/20 08:31:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.5 1996/10/20 22:04:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,8 @@
 #include "utils/nabstime.h"
 #include "access/htup.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 99bc5c25c5..af1e43beb2 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.4 1996/10/20 08:31:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.5 1996/10/20 22:04:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,6 +43,16 @@
 #include "access/heaptuple.h" /* Prototypes */
 #include "fmgr.h" /* Prototypes */
 
+#include <stdio.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include "libpq/pqcomm.h"
+#include "libpq/libpq.h"
+
+#include <stdio.h>
+
+#include "utils/palloc.h"
+
 /* ----------------------------------------------------------------
  *	printtup / debugtup support
  * ----------------------------------------------------------------
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 04867b2a33..c61333fe1c 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.3 1996/10/20 08:31:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.4 1996/10/20 22:04:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "access/attnum.h"
 #include "access/skey.h"
 
+#include "fmgr.h"
+
 /*
  * ScanKeyEntryIsLegal --
  *	True iff the scan key entry is legal.
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 7e3a721448..990bafdfbf 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.3 1996/10/20 08:31:35 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.4 1996/10/20 22:04:49 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -50,6 +50,16 @@
 
 #include "utils/palloc.h"
 
+#include <string.h>
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#endif
+
+#include "utils/geo-decls.h"
+#include "utils/builtins.h"
+
+#include <stdio.h>
+
 /* ----------------------------------------------------------------
  *	CreateTemplateTupleDesc
  *