That pretty much totally cleans up the includes files here.

src/backend/access/common/indextuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.9 1996/11/03 08:16:47 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.10 1996/11/03 10:57:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,11 @@
 #include "access/tupmacs.h"
 #include "utils/palloc.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
 
 static Size IndexInfoFindDataOffset(unsigned short t_info);
 

src/backend/access/common/printtup.c

@@ -8,23 +8,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.8 1996/11/03 08:16:49 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.9 1996/11/03 10:57:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "fmgr.h" 
 #include "access/heaptuple.h" 
-#include "utils/rel.h"
 #include "utils/palloc.h"
-
-#include "fmgr.h" 
-#include "libpq/pqcomm.h"
-
-#include "libpq/libpq.h"
-
 #include "catalog/pg_type.h"
+#include "libpq/libpq.h"
 #include "utils/syscache.h"
 
 /* ----------------------------------------------------------------

src/backend/access/common/scankey.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.7 1996/11/03 08:16:50 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.8 1996/11/03 10:57:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include "postgres.h"
 
 #include "fmgr.h"
-#include "access/attnum.h"
 #include "access/skey.h"
 
 /*

src/backend/access/common/tupdesc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.8 1996/11/03 08:16:51 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.9 1996/11/03 10:57:24 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,25 +18,17 @@
 
 #include "postgres.h"
 
-#include "access/htup.h"
-#include "utils/rel.h"
-
+#include "parser/catalog_utils.h"
+#include "nodes/parsenodes.h"
+#include "utils/builtins.h"
 #include "utils/fcache.h"
-#include "utils/geo-decls.h"
 #include "utils/palloc.h"
-
-#include "nodes/primnodes.h"
-
-#include "catalog/pg_type.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "utils/tqual.h"
 
-#include "nodes/parsenodes.h"
-#include "parser/catalog_utils.h"
-
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
+#else
+# include <string.h>
 #endif
 
 /* ----------------------------------------------------------------