diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index d75ce361061a68bf255893ce98ac169da30c8308..6567f7f02694fcb3afb257c64ccbb7df4f497017 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -5,7 +5,7 @@
  * DMN Digital Music Network.
  * www.dmn.com
  *
- * $PostgreSQL: pgsql/contrib/intagg/int_aggregate.c,v 1.24 2006/05/30 22:12:13 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/intagg/int_aggregate.c,v 1.25 2006/07/11 17:04:12 momjian Exp $
  *
  * Copyright (C) Digital Music Network
  * December 20, 2001
@@ -20,18 +20,18 @@
 #include <sys/types.h>
 
 #include "access/heapam.h"
+#include "access/tupmacs.h"
+#include "access/xact.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
-#include "utils/syscache.h"
-#include "access/tupmacs.h"
-#include "access/xact.h"
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
+#include "utils/syscache.h"
 #include "utils/lsyscache.h"
 
 PG_MODULE_MAGIC;
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index c5cf2cf75b1be017b30e7382e1ec58c84317ef52..2e37a28591e7224a411b093314425881b166a003 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -1,19 +1,19 @@
 /*
  *	PostgreSQL definitions for managed Large Objects.
  *
- *	$PostgreSQL: pgsql/contrib/lo/lo.c,v 1.16 2006/05/30 22:12:13 tgl Exp $
+ *	$PostgreSQL: pgsql/contrib/lo/lo.c,v 1.17 2006/07/11 17:04:12 momjian Exp $
  *
  */
 
 #include "postgres.h"
 
-/* Required for largeobjects */
-#include "libpq/libpq-fs.h"
-#include "libpq/be-fsstubs.h"
-
 /* Required for SPI */
 #include "executor/spi.h"
 
+/* Required for largeobjects */
+#include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+
 /* Required for triggers */
 #include "commands/trigger.h"
 
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index febebec207437129aa585e1d75b35b1a30204b02..f3bac44fbc206d1a07e400c923d8697f003e2884 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.76 2006/03/05 15:58:20 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.77 2006/07/11 17:04:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,8 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/tuptoaster.h"
 #include "access/itup.h"
+#include "access/tuptoaster.h"
 #include "catalog/pg_type.h"
 
 
diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c
index 0fe213d2a8faf3f5dae54190f5e3f4e56bc48d22..99156791420307cea725e3ee98c4eac488e0bd8b 100644
--- a/src/backend/access/gin/ginarrayproc.c
+++ b/src/backend/access/gin/ginarrayproc.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *          $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.1 2006/05/02 11:28:54 teodor Exp $
+ *          $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.2 2006/07/11 17:04:12 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -19,10 +19,10 @@
 #include "miscadmin.h"
 #include "storage/freespace.h"
 #include "utils/array.h"
+#include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
-#include "utils/builtins.h"
 #include "access/gin.h"
 
 #define GinOverlapStrategy		1
diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
index bc8a3e53efc71ef2e4dbd738f0f04d807bc83262..e3ba203506d8d094027e8f6cd6d0af672d32db45 100644
--- a/src/backend/access/gin/ginvacuum.c
+++ b/src/backend/access/gin/ginvacuum.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *          $PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.2 2006/05/02 22:25:10 tgl Exp $
+ *          $PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.3 2006/07/11 17:04:12 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -19,9 +19,9 @@
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "storage/freespace.h"
-#include "utils/memutils.h"
 #include "storage/freespace.h"
 #include "storage/smgr.h"
+#include "utils/memutils.h"
 #include "commands/vacuum.h"
 
 typedef struct {
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index c69f2887b89a8329302e44775c753082216321b0..ca684c7025d757867c916a8f0e444c8213e8c7fa 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -8,14 +8,14 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.58 2006/06/28 12:00:14 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.59 2006/07/11 17:04:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/itup.h"
 #include "access/gist_private.h"
+#include "access/itup.h"
 #include "executor/execdebug.h"
 #include "pgstat.h"
 #include "utils/memutils.h"
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index faf7661f96a79851c579e4af948148eebe9465a9..00eb2ae8ecc910fa207b088ddab4603430c857f3 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.23 2006/07/02 02:23:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.24 2006/07/11 17:04:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,8 @@
 #include "catalog/index.h"
 #include "commands/vacuum.h"
 #include "miscadmin.h"
-#include "utils/memutils.h"
 #include "storage/freespace.h"
+#include "utils/memutils.h"
 #include "storage/smgr.h"
 
 
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 6fe1d1a67283f694d0339f3a71297d35f20207e8..98898156cdeccf19929fb9569cf4bfbce254b378 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.17 2006/03/24 04:32:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.18 2006/07/11 17:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,9 +52,9 @@
 #include "access/slru.h"
 #include "access/xact.h"
 #include "miscadmin.h"
-#include "utils/memutils.h"
 #include "storage/backendid.h"
 #include "storage/lmgr.h"
+#include "utils/memutils.h"
 #include "storage/procarray.h"
 
 
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 67b5a2783680477da84425e4b20ba47e2c353720..f31a75b679e2955aa4ee68941dc07155df200d34 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.306 2006/07/10 16:20:49 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.307 2006/07/11 17:04:13 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -29,8 +29,8 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index d2c4bf89059309345e3223a6502ebc76d335e457..3eba7e7bb7a2397331a8e3dd656c56fbf7032001 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.143 2006/07/03 22:45:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.144 2006/07/11 17:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,10 +32,10 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
-#include "parser/parsetree.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
+#include "parser/parsetree.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index bf8e67d0dcd07ea6135de6144f2531a0adf58896..7891ebc54857e345554654c430e96ecc617b4710 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.118 2006/07/01 18:38:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.119 2006/07/11 17:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,9 +27,9 @@
 #include "optimizer/restrictinfo.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "parser/parsetree.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
+#include "parser/parsetree.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 935e4a8d1895043de7b01c6096ea1a072e4d36e7..a9003658b73ac4b531af5efba8abdb65b7e3a46b 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,14 +4,14 @@
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.56 2006/05/21 20:05:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.57 2006/07/11 17:04:13 momjian Exp $
  */
 #include "postgres.h"
 
 #include "access/xact.h"
 #include "catalog/namespace.h"
-#include "miscadmin.h"
 #include "mb/pg_wchar.h"
+#include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 9b8e788cd0971a480c3029946d6659280fe05143..99b1473d2cabecad93f283cb8abd1ac091ef10c1 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.325 2006/06/27 23:25:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.326 2006/07/11 17:04:13 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -25,15 +25,13 @@
 #include <syslog.h>
 #endif
 
-#include "utils/guc.h"
-#include "utils/guc_tables.h"
 
 #include "access/twophase.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "commands/async.h"
-#include "commands/variable.h"
 #include "commands/vacuum.h"
+#include "commands/variable.h"
 #include "executor/executor.h"
 #include "fmgr.h"
 #include "funcapi.h"
@@ -50,10 +48,11 @@
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
 #include "parser/scansup.h"
+#include "pgstat.h"
 #include "postmaster/autovacuum.h"
 #include "postmaster/bgwriter.h"
-#include "postmaster/syslogger.h"
 #include "postmaster/postmaster.h"
+#include "postmaster/syslogger.h"
 #include "storage/bufmgr.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
@@ -62,10 +61,11 @@
 #include "tcop/tcopprot.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/guc.h"
+#include "utils/guc_tables.h"
 #include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/ps_status.h"
-#include "pgstat.h"
 #include "access/gin.h"
 
 #ifndef PG_KRB_SRVTAB
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index bf9dd11e215fd8aef5bfdfc972eba1003908b18d..1df82fe9fbf111045935db93cb38d30e494e31f9 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -7,15 +7,15 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.20 2006/07/03 22:45:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.21 2006/07/11 17:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef GIST_PRIVATE_H
 #define GIST_PRIVATE_H
 
-#include "access/itup.h"
 #include "access/gist.h"
+#include "access/itup.h"
 #include "access/xlog.h"
 #include "access/xlogdefs.h"
 #include "fmgr.h"