diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h
index 641ffd52a136531f4d3dcf02dff65f57bc4dda4b..d6ba0405053625a9cdad3e4dabfb3e4c84c5b468 100644
--- a/contrib/pg_trgm/trgm.h
+++ b/contrib/pg_trgm/trgm.h
@@ -5,9 +5,9 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
+#include "utils/builtins.h"
 #include "utils/elog.h"
 #include "utils/palloc.h"
-#include "utils/builtins.h"
 #include "storage/bufpage.h"
 
 /* options */
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
index 0f369bdcb7e88b56b883d1355e4ba78d03030f79..4999b30d785efbc06cfd0dff857a2cc2fbfa6fb2 100644
--- a/contrib/tsearch2/tsvector.c
+++ b/contrib/tsearch2/tsvector.c
@@ -6,15 +6,15 @@
  */
 #include "postgres.h"
 
+
 #include "access/gist.h"
 #include "access/itup.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
-#include "executor/spi.h"
+#include "catalog/namespace.h"
 #include "commands/trigger.h"
+#include "executor/spi.h"
 #include "nodes/pg_list.h"
-#include "catalog/namespace.h"
-
+#include "storage/bufpage.h"
+#include "utils/builtins.h"
 #include "utils/pg_locale.h"
 #include "mb/pg_wchar.h"
 
diff --git a/contrib/tsearch2/tsvector_op.c b/contrib/tsearch2/tsvector_op.c
index c9119753941cb32ea33d10560f1c1f1bb271e22a..7d4113edff3eb1849fd9740f8c7611bfeb0d6f96 100644
--- a/contrib/tsearch2/tsvector_op.c
+++ b/contrib/tsearch2/tsvector_op.c
@@ -4,15 +4,15 @@
  */
 #include "postgres.h"
 
+
 #include "access/gist.h"
 #include "access/itup.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
-#include "executor/spi.h"
+#include "catalog/namespace.h"
 #include "commands/trigger.h"
+#include "executor/spi.h"
 #include "nodes/pg_list.h"
-#include "catalog/namespace.h"
-
+#include "storage/bufpage.h"
+#include "utils/builtins.h"
 #include "utils/pg_locale.h"
 
 #include "tsvector.h"
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index c7cbe240362c35aca85e2e6992c4c0792a1cfb06..4549dc37028c74c507fbf8569469893332c68263 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.60 2006/06/16 18:42:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.61 2006/07/11 18:26:10 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -30,14 +30,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "catalog/catalog.h"
-#include "utils/rel.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/pg_lzcompress.h"
+#include "utils/rel.h"
 #include "utils/typcache.h"
 
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index d34cc8824c19dc9832627e0fa64ef04d81f01de2..026f6d897ca7ca215109d80c0e430c44a68075d6 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.193 2006/07/10 22:10:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.194 2006/07/11 18:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,13 +45,13 @@
 #include "optimizer/prep.h"
 #include "parser/analyze.h"
 #include "parser/gramparse.h"
-#include "parser/parser.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
+#include "parser/parser.h"
 #include "rewrite/rewriteHandler.h"
 #include "storage/smgr.h"
 #include "utils/acl.h"
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 0387d050cdeacca1815aa83a4ae336833184c0ac..361361bcf0ee2cebc612a6041c7eacbe7bc5b5b2 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.92 2006/07/02 02:23:19 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.93 2006/07/11 18:26:10 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -31,8 +31,8 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index c1304042a1d3c407b6859066720a27d02b118429..e55db5123427a6cf95e8ef41d46e12504d11fe30 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.108 2006/06/28 20:04:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.109 2006/07/11 18:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,9 +23,9 @@
 #include "optimizer/planner.h"
 #include "optimizer/subselect.h"
 #include "optimizer/var.h"
-#include "parser/parsetree.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
+#include "parser/parsetree.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index cd7823329e7d4d4282367ed8fa47407bdaf216c0..1fff118e44f7051eb8321a4c80794d2517e49d7c 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.26 2006/06/27 22:16:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.27 2006/07/11 18:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,10 +33,10 @@
 
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "pgtime.h"
 #include "postmaster/fork_process.h"
 #include "postmaster/postmaster.h"
 #include "postmaster/syslogger.h"
-#include "pgtime.h"
 #include "storage/ipc.h"
 #include "storage/pg_shmem.h"
 #include "utils/guc.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 23bc8537a159630261405c7fbe37d1cfee31c318..4a09bfaf6a485cb116a809c27a4d8f15fb5cf81a 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.259 2006/07/02 02:23:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.260 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,8 @@
 #include "commands/async.h"
 #include "commands/cluster.h"
 #include "commands/comment.h"
-#include "commands/copy.h"
 #include "commands/conversioncmds.h"
+#include "commands/copy.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"
 #include "commands/explain.h"
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index c6ea11d381ea7b034b9d344e90b70a8f0a9b3f66..23328e1e8c6a0e1ae66fcf4c65b49ad8a56f11c6 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -8,12 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.116 2006/05/21 20:05:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.117 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+
 #include "access/hash.h"
 #include "catalog/pg_type.h"
 #include "lib/stringinfo.h"
@@ -22,7 +23,6 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
-
 #include "mb/pg_wchar.h"
 
 
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index d23fbb9ce2b463586982d09572c09ced200eccd7..819f15bf24222691974e920f28c56000c62ddb1c 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.104 2006/06/15 02:08:09 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.105 2006/07/11 18:26:11 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -22,13 +22,12 @@
 
 #include "access/heapam.h"
 #include "access/transam.h"
-#include "utils/builtins.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
-#include "catalog/pg_authid.h"
 #include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
 #include "catalog/pg_cast.h"
 #include "catalog/pg_conversion.h"
 #include "catalog/pg_database.h"
@@ -42,6 +41,7 @@
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
+#include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/syscache.h"
 #include "miscadmin.h"
diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c
index fbeefad74574b7f0f2b6d71cbde5fe44adea4aff..052aa24c8e81f03a2e905e33aed908196036a702 100644
--- a/src/backend/utils/cache/typcache.c
+++ b/src/backend/utils/cache/typcache.c
@@ -36,14 +36,14 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.19 2006/06/16 18:42:23 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.20 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/hash.h"
+#include "access/heapam.h"
 #include "access/nbtree.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index ed8b7766b0d22e6cb7a5b35413a2c3811eda7aa4..a53f99985add3ff9cd3e92b0cbd161a62976df74 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.20 2006/05/30 22:12:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.21 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,19 +14,10 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
-#include "../../Unicode/utf8_to_iso8859_2.map"
-#include "../../Unicode/utf8_to_iso8859_3.map"
-#include "../../Unicode/utf8_to_iso8859_4.map"
-#include "../../Unicode/utf8_to_iso8859_5.map"
-#include "../../Unicode/utf8_to_iso8859_6.map"
-#include "../../Unicode/utf8_to_iso8859_7.map"
-#include "../../Unicode/utf8_to_iso8859_8.map"
-#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/utf8_to_iso8859_10.map"
-#include "../../Unicode/utf8_to_iso8859_13.map"
-#include "../../Unicode/utf8_to_iso8859_14.map"
-#include "../../Unicode/utf8_to_iso8859_15.map"
-#include "../../Unicode/utf8_to_iso8859_16.map"
+#include "../../Unicode/iso8859_10_to_utf8.map"
+#include "../../Unicode/iso8859_13_to_utf8.map"
+#include "../../Unicode/iso8859_14_to_utf8.map"
+#include "../../Unicode/iso8859_15_to_utf8.map"
 #include "../../Unicode/iso8859_2_to_utf8.map"
 #include "../../Unicode/iso8859_3_to_utf8.map"
 #include "../../Unicode/iso8859_4_to_utf8.map"
@@ -35,10 +26,19 @@
 #include "../../Unicode/iso8859_7_to_utf8.map"
 #include "../../Unicode/iso8859_8_to_utf8.map"
 #include "../../Unicode/iso8859_9_to_utf8.map"
-#include "../../Unicode/iso8859_10_to_utf8.map"
-#include "../../Unicode/iso8859_13_to_utf8.map"
-#include "../../Unicode/iso8859_14_to_utf8.map"
-#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/utf8_to_iso8859_10.map"
+#include "../../Unicode/utf8_to_iso8859_13.map"
+#include "../../Unicode/utf8_to_iso8859_14.map"
+#include "../../Unicode/utf8_to_iso8859_15.map"
+#include "../../Unicode/utf8_to_iso8859_16.map"
+#include "../../Unicode/utf8_to_iso8859_2.map"
+#include "../../Unicode/utf8_to_iso8859_3.map"
+#include "../../Unicode/utf8_to_iso8859_4.map"
+#include "../../Unicode/utf8_to_iso8859_5.map"
+#include "../../Unicode/utf8_to_iso8859_6.map"
+#include "../../Unicode/utf8_to_iso8859_7.map"
+#include "../../Unicode/utf8_to_iso8859_8.map"
+#include "../../Unicode/utf8_to_iso8859_9.map"
 #include "../../Unicode/iso8859_16_to_utf8.map"
 
 PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
index 0755cf3a17c93769dd0e3f6473b4d112ba1fc5a5..c95919fa0a1ef8ea81c57107b58cc033d330ca43 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.4 2006/05/30 22:12:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.5 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
-#include "../../Unicode/utf8_to_win866.map"
-#include "../../Unicode/utf8_to_win874.map"
 #include "../../Unicode/utf8_to_win1250.map"
 #include "../../Unicode/utf8_to_win1251.map"
 #include "../../Unicode/utf8_to_win1252.map"
@@ -25,8 +23,8 @@
 #include "../../Unicode/utf8_to_win1256.map"
 #include "../../Unicode/utf8_to_win1257.map"
 #include "../../Unicode/utf8_to_win1258.map"
-#include "../../Unicode/win866_to_utf8.map"
-#include "../../Unicode/win874_to_utf8.map"
+#include "../../Unicode/utf8_to_win866.map"
+#include "../../Unicode/utf8_to_win874.map"
 #include "../../Unicode/win1250_to_utf8.map"
 #include "../../Unicode/win1251_to_utf8.map"
 #include "../../Unicode/win1252_to_utf8.map"
@@ -35,6 +33,8 @@
 #include "../../Unicode/win1255_to_utf8.map"
 #include "../../Unicode/win1256_to_utf8.map"
 #include "../../Unicode/win1257_to_utf8.map"
+#include "../../Unicode/win866_to_utf8.map"
+#include "../../Unicode/win874_to_utf8.map"
 #include "../../Unicode/win1258_to_utf8.map"
 
 PG_MODULE_MAGIC;
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 6591ba0456bcfba218570be87477dcd0c47604c6..5b4411d77be020da9790d2d941ff9428e15f299e 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xact.h,v 1.82 2006/04/25 00:25:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/xact.h,v 1.83 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,8 @@
 #define XACT_H
 
 #include "access/xlog.h"
-#include "storage/relfilenode.h"
 #include "nodes/pg_list.h"
+#include "storage/relfilenode.h"
 #include "utils/timestamp.h"
 
 
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 9f5e93164019b24767cdd2f425a7d6dc979e377e..b68f5932e39bbbb4782012893231a67f308ac4fb 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -2,7 +2,7 @@
  *
  * spi.h
  *
- * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.53 2005/10/15 02:49:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.54 2006/07/11 18:26:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,25 +19,25 @@
  *	These are not needed by this file, but used by other programs
  *	using SPI
  */
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
+#include "access/heapam.h"
+#include "access/xact.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "executor/executor.h"
+#include "nodes/execnodes.h"
+#include "nodes/params.h"
+#include "nodes/plannodes.h"
+#include "nodes/primnodes.h"
+#include "nodes/relation.h"
+#include "tcop/dest.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
-#include "tcop/dest.h"
-#include "nodes/params.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/portal.h"
 #include "utils/syscache.h"
-#include "catalog/pg_language.h"
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "executor/executor.h"
 #include "executor/execdefs.h"
 
 typedef struct