diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 960445ed57284246094933006c3cc46930b6a421..31dc08355762522b4587b7e63acc57588bbb6bd0 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.8 1996/10/20 22:04:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.9 1996/10/21 11:49:35 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -17,35 +17,42 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
+#include <stdio.h>
 #include <time.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 "catalog/pg_attribute.h"
+#include "postgres.h"
 #include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "storage/fd.h"
+#include "access/tupmacs.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
 #include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
+#include "nodes/pg_list.h"
+#include "storage/block.h"
+#include "storage/buf.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
+#include "storage/item.h"
+#include "storage/itemid.h"
+#include "storage/off.h"
+#include "utils/memutils.h"
+#include "utils/nabstime.h"
+#include "utils/palloc.h"
+
 #include "access/skey.h"
+#include "access/tupdesc.h"
+#include "rewrite/prs2lock.h"
+#include "storage/bufpage.h"
+#include "storage/itemptr.h"
+
 #include "access/strat.h"
+
+#include "access/htup.h"
 #include "utils/rel.h"
 
-#include "utils/memutils.h"
+#include "storage/bufmgr.h"
+
+#include "access/transam.h"
 
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
@@ -53,14 +60,6 @@
 # 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 */
 
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index 70720fbe812823ad0cd1f72b4c0c179f58cb69d7..45003095b237ca0eb64f2d8fd891b92f2ee6ceaa 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,49 +7,43 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.5 1996/10/20 22:04:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.6 1996/10/21 11:49:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
 #include <time.h>
-#include "utils/nabstime.h"
-#include "access/htup.h"
 
+#include "postgres.h"
+#include "fmgr.h"
 #include "access/attnum.h"
-#include "access/skey.h"
-
+#include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
+#include "catalog/pg_class.h"
+#include "nodes/nodes.h"
+#include "nodes/pg_list.h"
+#include "storage/block.h"
 #include "storage/buf.h"
-
+#include "storage/fd.h"
+#include "storage/item.h"
 #include "storage/itemid.h"
+#include "storage/off.h"
+#include "utils/nabstime.h"
 
-#include "catalog/pg_attribute.h"
-#include "access/attnum.h"
-#include "nodes/pg_list.h"
+#include "access/skey.h"
 #include "access/tupdesc.h"
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
+#include "access/xact.h"
 #include "rewrite/prs2lock.h"
-#include "access/strat.h"
-#include "utils/rel.h"
-
-#include "storage/item.h"
 #include "storage/bufpage.h"
+#include "storage/itemptr.h"
 
-#include "utils/tqual.h"
-
-#include "access/xact.h"
+#include "access/strat.h"
 
-#include "fmgr.h"
+#include "access/htup.h"
+#include "utils/rel.h"
 
 #include "access/heaptuple.h"
+#include "utils/tqual.h"
 
 /* ----------------
  *	heap_keytest
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index b8bfe52377edb9d6c0ac6b2e0042c417b4cc5893..9e52ad3e4491382ede7e9f58d5a3914c1260e913 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,46 +8,46 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.6 1996/10/21 07:18:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.7 1996/10/21 11:49:37 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <string.h>
+#include <time.h>
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "catalog/pg_attribute.h"
+#include "postgres.h"
 #include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "storage/itemptr.h"
-#include "access/tupdesc.h"
-#include "access/itup.h"
-
-#include "utils/memutils.h"
-#include "access/ibit.h"
-
 #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_attribute.h"
 #include "catalog/pg_class.h"
 #include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
+#include "nodes/pg_list.h"
+#include "storage/block.h"
+#include "storage/buf.h"
+#include "storage/fd.h"
+#include "storage/off.h"
+#include "utils/memutils.h"
+#include "utils/nabstime.h"
+#include "utils/palloc.h"
+
+#include "access/ibit.h"
 #include "access/skey.h"
+#include "access/tupdesc.h"
+#include "rewrite/prs2lock.h"
+#include "storage/itemptr.h"
+
 #include "access/strat.h"
-#include "utils/rel.h"
-#include "utils/nabstime.h"
+
+#include "access/itup.h"
 #include "access/htup.h"
-#include "storage/itemptr.h"
+#include "utils/rel.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 41eff1407048c447d86fa7b061d46d4f8c703e89..b5854db569724c36487db00c7313a869fa1f94bd 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,29 +7,29 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.5 1996/10/20 22:04:43 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.6 1996/10/21 11:49:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <time.h>
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "catalog/pg_attribute.h"
+#include "postgres.h"
 #include "access/attnum.h"
+#include "catalog/pg_attribute.h"
+#include "executor/execdebug.h"
 #include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "access/itup.h"
+#include "storage/off.h"
+#include "storage/block.h"
+#include "utils/nabstime.h"
 
 #include "access/skey.h"
+#include "access/tupdesc.h"
+#include "storage/itemptr.h"
 
-#include <time.h>
-#include "utils/nabstime.h"
 #include "access/htup.h"
+#include "access/itup.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 af1e43beb20b31a51281c928346dc2e8e4a769c6..2dcf1d4cc9e39347f57cf68424ecb71aa0206c51 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,50 +8,46 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.5 1996/10/20 22:04:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.6 1996/10/21 11:49:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
+#include <stdio.h>
+#include <sys/types.h>
 #include <time.h>
-#include "utils/nabstime.h"
-#include "access/htup.h"
+#include <netinet/in.h>
 
+#include "postgres.h"
+#include "fmgr.h" 
 #include "access/attnum.h"
-#include "utils/syscache.h"
-
-#include "catalog/pg_attribute.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "storage/fd.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
+#include "libpq/pqcomm.h"
 #include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "utils/rel.h"
-#include "catalog/pg_type.h"
-
+#include "nodes/pg_list.h"
+#include "storage/block.h"
 #include "storage/buf.h"
+#include "storage/fd.h"
+#include "storage/off.h"
+#include "utils/nabstime.h"
+#include "utils/palloc.h"
 
-#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 "storage/itemptr.h"
+#include "access/tupdesc.h"
+#include "rewrite/prs2lock.h"
+#include "access/skey.h"
 
-#include <stdio.h>
+#include "access/strat.h"
 
-#include "utils/palloc.h"
+#include "access/htup.h"
+#include "utils/rel.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 c61333fe1c884a90eda02ea658235b20a5dd0b52..837f361df4f052f08041ce85748b558014b4643e 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,17 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.4 1996/10/20 22:04:47 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.5 1996/10/21 11:49:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "fmgr.h"
 #include "access/attnum.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 990bafdfbff3d3b29aa5223ed409cf777ad9ae47..a041cc4f4a28abef4a9dadfbb8fd18972a2d5d78 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.4 1996/10/20 22:04:49 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.5 1996/10/21 11:49:41 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -16,50 +16,47 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
 
-#include "catalog/pg_attribute.h"
+#include "postgres.h"
 #include "access/attnum.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
+#include "catalog/pg_class.h"
+#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
 #include "storage/block.h"
+#include "storage/fd.h"
 #include "storage/off.h"
-#include "storage/itemptr.h"
-#include <time.h>
+#include "utils/geo-decls.h"
 #include "utils/nabstime.h"
-#include "access/htup.h"
+#include "utils/palloc.h"
 
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
+#include "nodes/primnodes.h"
+#include "access/tupdesc.h"
 #include "rewrite/prs2lock.h"
+#include "storage/itemptr.h"
 #include "access/skey.h"
+
 #include "access/strat.h"
+
+#include "access/htup.h"
 #include "utils/rel.h"
-#include "catalog/pg_type.h"
 
+#include "catalog/pg_type.h"
+#include "utils/builtins.h"
 #include "utils/syscache.h"
-
-#include "parser/catalog_utils.h"
-
-#include "nodes/primnodes.h"
 #include "utils/tqual.h"
-#include "nodes/parsenodes.h"
 
-#include "utils/palloc.h"
+#include "nodes/parsenodes.h"
+#include "parser/catalog_utils.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
  *