Final cleanup.

204 files changed, 602 insertions, 676 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 133bb7bb00..3a122ae1a1 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -23,6 +23,7 @@
 #include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 18ee5596d0..eaef82005a 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -20,6 +20,7 @@
 #include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 27d19ab8aa..a0418bcc59 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -27,6 +27,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 934d7e5911..8dab9755cc 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -13,16 +13,17 @@
 
 #include "postgres.h"
 
-#include "catalog/pg_index.h"
 #include "access/genam.h"
 #include "access/gist.h"
 #include "access/gistscan.h"
 #include "access/heapam.h"
 #include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "executor/executor.h"
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 26736686e6..f35a0f7cd3 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,6 +17,7 @@
 #include "executor/execdebug.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 9bc3acc719..c455309443 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -12,11 +12,12 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/gist.h"
 #include "access/gistscan.h"
-#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 23b08e0356..997d8f4cd4 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -17,14 +17,15 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/hash.h"
-#include "executor/executor.h"
 #include "access/heapam.h"
-#include "access/genam.h"
 #include "catalog/index.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 24887d6dec..0a4d7fb40f 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -19,6 +19,7 @@
 #include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 520335de01..554e7ac0e4 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -25,11 +25,12 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/hash.h"
 #include "miscadmin.h"
-#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 1f7f798326..8e5f236d1e 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -17,6 +17,7 @@
 #include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index b30fd701c5..ebc2e35f67 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -18,6 +18,7 @@
 #include "access/iqual.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index c2bdc14177..80c0067318 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -76,16 +76,17 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "miscadmin.h"
-#include "utils/relcache.h"
-#include "access/valid.h"
 #include "access/hio.h"
-#include "storage/smgr.h"
+#include "access/valid.h"
 #include "catalog/catalog.h"
-#include "utils/inval.h"
+#include "miscadmin.h"
+#include "storage/smgr.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/relcache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 5af649c49d..cb178f680a 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/hio.h"
 #include "access/heapam.h"
+#include "access/hio.h"
 
 /*
  * amputunique	- place tuple at tid
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index af212a6530..70512da52d 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -23,6 +23,7 @@
 #include "access/heapam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 3bdd2255fa..0203d2a3e7 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -45,10 +45,10 @@
  */
 
 #include "postgres.h"
-
 #include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 3c561e2e4c..b7460d4af2 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -66,8 +66,8 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "utils/relcache.h"
 #include "access/heapam.h"
+#include "utils/relcache.h"
 
 /* ----------------
  *	 undefine macros we aren't going to use that would otherwise
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index f3997cf717..be1d24db0d 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -15,7 +15,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
 #include "catalog/catname.h"
@@ -23,6 +22,7 @@
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_operator.h"
+#include "miscadmin.h"
 #include "utils/syscache.h"
 
 #ifdef USE_ASSERT_CHECKING
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 215d53563d..bf844106b6 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -14,10 +14,11 @@
 
 #include "postgres.h"
 
-#include "access/nbtree.h"
 #include "access/heapam.h"
+#include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 7e93655821..ba0702f4cf 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -23,15 +23,15 @@
 #include <time.h>
 
 #include "postgres.h"
-
-#include "access/nbtree.h"
-#include "miscadmin.h"
-
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
 
+#include "access/nbtree.h"
+#include "miscadmin.h"
+
 #define BTREE_METAPAGE	0
 #define BTREE_MAGIC		0x053162
 
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 33069598c9..44d76f4cf0 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -17,19 +17,19 @@
  */
 
 #include "postgres.h"
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
 
 #include "access/genam.h"
-#include "access/nbtree.h"
-#include "executor/executor.h"
 #include "access/heapam.h"
+#include "access/nbtree.h"
 #include "catalog/index.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
 
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
-
 #ifdef BTREE_BUILD_STATS
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index aa2840119e..2d6dd266cf 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -18,6 +18,7 @@
 #include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index dcf573d6a7..33c85fa71f 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -54,6 +54,7 @@
 #include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 76662a5893..380579e059 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -23,6 +23,7 @@ extern int	NIndexTupleProcessed;
 
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 8d6e3ce948..70cb8b1f51 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -18,6 +18,7 @@
 #include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index ef2827cbea..35af87194c 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -17,6 +17,7 @@
 #include "utils/builtins.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index e3e712c1f9..7a4286c35e 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -15,13 +15,14 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "catalog/index.h"
+#include "access/heapam.h"
 #include "access/rtree.h"
-#include "utils/geo_decls.h"
+#include "catalog/index.h"
 #include "executor/executor.h"
-#include "access/heapam.h"
+#include "utils/geo_decls.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index e3a9f21c63..401def5a67 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -18,6 +18,7 @@
 #include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index a00dc08c00..827dc0e198 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/rtree.h"
 #include "access/istrat.h"
+#include "access/rtree.h"
 
 static StrategyNumber RelationGetRTStrategy(Relation r,
 					  AttrNumber attnum, RegProcedure proc);
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index bbceab50d0..277a414d9f 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -18,8 +18,8 @@
 
 #include "postgres.h"
 
-#include "utils/bit.h"
 #include "access/xact.h"
+#include "utils/bit.h"
 
 static XidStatus TransBlockGetXidStatus(Block tblock,
 					   TransactionId transactionId);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index b8e05c5964..3091779eaf 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -144,14 +144,14 @@
  */
 #include "postgres.h"
 
-#include "utils/inval.h"
-#include "utils/portal.h"
-#include "storage/proc.h"
 #include "catalog/heap.h"
-#include "utils/relcache.h"
 #include "commands/async.h"
 #include "commands/sequence.h"
 #include "libpq/be-fsstubs.h"
+#include "storage/proc.h"
+#include "utils/inval.h"
+#include "utils/portal.h"
+#include "utils/relcache.h"
 
 extern bool	SharedBufferChanged;
 
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 251820588a..9b5e285eb9 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -18,7 +18,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 
 #include "access/attnum.h"
 #include "access/funcindex.h"
@@ -34,6 +33,7 @@
 #include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
 #include "commands/defrem.h"
+#include "miscadmin.h"
 #include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index ff4abb3349..91ce973dff 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -17,31 +17,32 @@
 
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "catalog/pg_attribute.h"
+
+
+
 #include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "access/itup.h"
 #include "access/funcindex.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/htup.h"
+#include "access/itup.h"
 #include "access/skey.h"
 #include "access/strat.h"
-#include "utils/rel.h"
+#include "access/tupdesc.h"
 #include "bootstrap/bootstrap.h"
-
-#include "nodes/primnodes.h"
-#include "utils/nabstime.h"
-#include "access/htup.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
+#include "catalog/pg_class.h"
+#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
-
+#include "nodes/pg_list.h"
+#include "nodes/primnodes.h"
 #include "parser/scansup.h"
+#include "rewrite/prs2lock.h"
+#include "storage/block.h"
+#include "storage/fd.h"
+#include "storage/itemptr.h"
+#include "storage/off.h"
+#include "utils/nabstime.h"
+#include "utils/rel.h"
 
 #include "bootstrap_tokens.h"
 
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 890af8cce0..dc580ffaca 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -18,13 +18,13 @@
 #include <setjmp.h>
 #include <string.h>
 #ifdef __CYGWIN32__
+#include <getopt.h>
 #endif
 
 #define BOOTSTRAP_INCLUDE		/* mask out stuff in tcop/tcopprot.h */
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -33,12 +33,14 @@
 #include "catalog/index.h"
 #include "catalog/pg_type.h"
 #include "libpq/pqsignal.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/portal.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #endif
 
 #define ALLOC(t, c)		(t *)calloc((unsigned)(c), sizeof(t))
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 67a10a9f5c..16b35a11e4 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -17,21 +17,21 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "utils/acl.h"
 #include "access/heapam.h"
-#include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
+#include "miscadmin.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_func.h"
+#include "utils/acl.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
 
 static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode);
 
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 0e6fb6ca51..f1ce2b4462 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -15,12 +15,12 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
-#include "utils/syscache.h"
+#include "access/transam.h"
+#include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/pg_type.h"
-#include "catalog/catalog.h"
-#include "access/transam.h"
+#include "miscadmin.h"
+#include "utils/syscache.h"
 
 /*
  * relpath				- path to the relation
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 55a60bd999..ec8f3f6dc2 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -42,8 +42,8 @@
 #include "catalog/pg_relcheck.h"
 #include "commands/trigger.h"
 #include "optimizer/tlist.h"
-#include "parser/parse_expr.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_expr.h"
 #include "rewrite/rewriteRemove.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
@@ -53,6 +53,7 @@
 #include "utils/temprel.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 2f3287c6c8..89af9e0529 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -19,6 +19,12 @@
  */
 #include "postgres.h"
 
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
@@ -41,11 +47,6 @@
 #include "utils/syscache.h"
 #include "utils/temprel.h"
 
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
-
 /*
  * macros used in guessing how many tuples are on a page.
  */
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 776705a027..dde0232e82 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -14,14 +14,15 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "utils/builtins.h"
 #include "catalog/catname.h"
-#include "utils/syscache.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_aggregate.h"
 #include "miscadmin.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 6d0a0fd663..47c6d2a02e 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -21,12 +21,13 @@
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "parser/parse_func.h"
 #include "miscadmin.h"
+#include "parser/parse_func.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index d3d68714e5..90bf96a773 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -20,15 +20,16 @@
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "optimizer/planner.h"
+#include "parser/parse_type.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/fmgrtab.h"
 #include "utils/lsyscache.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
-#include "parser/parse_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 5a00356fe7..657ca300f3 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -23,6 +23,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index 51a0a024c7..af0ec373b6 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -13,22 +13,22 @@
  */
 #include "postgres.h"
 
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/makefuncs.h"
 #include "catalog/pg_type.h"
 #include "commands/recipe.h"
+#include "executor/executor.h"
 #include "libpq/libpq-be.h"
+#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "optimizer/planner.h"
 #include "parser/parse_node.h"
-#include "utils/builtins.h"
-#include "utils/relcache.h"
 #include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
-#include "tcop/pquery.h"
 #include "tcop/dest.h"
-#include "optimizer/planner.h"
-#include "executor/executor.h"
+#include "tcop/pquery.h"
+#include "utils/builtins.h"
+#include "utils/relcache.h"
 
 /* from tcop/postgres.c */
 extern CommandDest whereToSendOutput;
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 64dded2956..7de6b653ac 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -85,17 +85,17 @@
 
 #include "postgres.h"
 
-#include "commands/async.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_listener.h"
+#include "commands/async.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
+#include "utils/ps_status.h"
 #include "utils/syscache.h"
 #include "utils/trace.h"
-#include "utils/ps_status.h"
 
 /* stuff that we really ought not be touching directly :-( */
 extern TransactionState CurrentTransactionState;
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 7d21f432fb..4964252145 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,19 +22,17 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/syscache.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "catalog/index.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/cluster.h"
 #include "commands/rename.h"
-#include "utils/builtins.h"
-#include "catalog/pg_proc.h"
 #include "optimizer/internal.h"
-#ifndef NO_SECURITY
-#endif	 /* !NO_SECURITY */
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static Relation copy_heap(Oid OIDOldHeap);
 static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap);
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 715643125a..fcc68a9b17 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -20,23 +20,23 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_type.h"
 #include "commands/command.h"
 #include "executor/execdefs.h"
 #include "executor/executor.h"
+#include "miscadmin.h"
 #include "optimizer/prep.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/temprel.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
-#include <string.h>
+#include "utils/temprel.h"
 
 /* ----------------
  *		PortalExecutorHeapMemory stuff
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 5cd39923ed..6aaa18c90a 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -13,27 +13,28 @@
 
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include <sys/stat.h>
-#include "catalog/pg_index.h"
-#include "utils/syscache.h"
-#include "executor/executor.h"
-#include "catalog/index.h"
 #include "access/genam.h"
-#include "catalog/pg_type.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/pg_type.h"
 #include "commands/copy.h"
 #include "commands/trigger.h"
+#include "executor/executor.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 80b9f077d8..713a667940 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -16,14 +16,14 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "commands/creatinh.h"
 #include "access/heapam.h"
-#include "utils/syscache.h"
 #include "catalog/catname.h"
-#include "catalog/pg_type.h"
+#include "catalog/heap.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_ipl.h"
+#include "catalog/pg_type.h"
+#include "commands/creatinh.h"
+#include "utils/syscache.h"
 
 /* ----------------
  *		local stuff
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index a2b0acdcb2..962712c319 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -22,9 +22,9 @@
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/dbcommands.h"
 #include "miscadmin.h"
 #include "tcop/tcopprot.h"
-#include "commands/dbcommands.h"
 #include "utils/syscache.h"
 
 
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 32c9f9b2cc..03bde72387 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -42,17 +42,17 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_language.h"
-#include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
 #include "commands/defrem.h"
-#include "tcop/dest.h"
-#include "catalog/pg_shadow.h"
+#include "fmgr.h"
 #include "optimizer/cost.h"
+#include "tcop/dest.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 9f7b7f99cd..7e303e0c1a 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -12,13 +12,13 @@
 
 #include "postgres.h"
 
-#include "nodes/print.h"
-#include "lib/stringinfo.h"
 #include "commands/explain.h"
-#include "parser/parsetree.h"
+#include "lib/stringinfo.h"
+#include "nodes/print.h"
 #include "optimizer/planner.h"
-#include "utils/relcache.h"
+#include "parser/parsetree.h"
 #include "rewrite/rewriteHandler.h"
+#include "utils/relcache.h"
 
 typedef struct ExplainState
 {
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 3e71afffdd..c8db9422ba 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -17,18 +17,18 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/pg_index.h"
+#include "catalog/pg_opclass.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_opclass.h"
 #include "commands/defrem.h"
-#include "parser/parsetree.h"
-#include "optimizer/prep.h"
 #include "optimizer/clauses.h"
+#include "optimizer/prep.h"
+#include "parser/parsetree.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 84c540054b..f15e356e11 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -25,6 +25,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 79de86f36f..6cf4c7030d 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -11,6 +11,12 @@
  *
  *-------------------------------------------------------------------------
  */
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
+
 #include "postgres.h"
 
 #include "access/heapam.h"
@@ -22,13 +28,7 @@
 #include "commands/rename.h"
 #include "miscadmin.h"
 #include "optimizer/prep.h"
-#ifndef NO_SECURITY
 #include "utils/acl.h"
-#endif	 /* !NO_SECURITY */
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
 
 /*
  *		renameatt		- changes the name of a attribute in a relation
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 4efc85c41a..548b3311a0 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -9,13 +9,13 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "access/heapam.h"
 #include "commands/creatinh.h"
 #include "commands/sequence.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "utils/acl.h"
+#include "utils/builtins.h"
 
 #define SEQ_MAGIC	  0x1717
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 6107c4bd6f..35b3356de4 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include "postgres.h"
 
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -17,15 +18,12 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
 #include "commands/trigger.h"
-#include "utils/inval.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "executor/executor.h"
-
-#ifndef NO_SECURITY
 #include "miscadmin.h"
 #include "utils/acl.h"
-#endif
+#include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/syscache.h"
 
 DLLIMPORT TriggerData *CurrentTriggerData = NULL;
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index e6f230d36d..c342cf9591 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -18,16 +18,16 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/user.h"
 #include "libpq/crypt.h"
-#include "access/heapam.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
-#include "commands/user.h"
 
 static void CheckPgUserAclNotNull(void);
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index b5e91d4c64..be89ed930f 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -20,7 +20,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -30,6 +29,7 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "commands/vacuum.h"
+#include "miscadmin.h"
 #include "parser/parse_oper.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
@@ -39,6 +39,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_GETRUSAGE
+#include "rusagestub.h"
 #else
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 9b2bb44b9d..2ded6655f5 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -10,16 +10,19 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+
 #include "postgres.h"
-#include "miscadmin.h"
+#include "access/xact.h"
 #include "commands/variable.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "optimizer/internal.h"
-#include "access/xact.h"
+#include "utils/builtins.h"
 #include "utils/tqual.h"
+
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
+
 static bool show_date(void);
 static bool reset_date(void);
 static bool parse_date(const char *);
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 7b5347d405..330b78a5c9 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -14,15 +14,15 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
 #include "access/xact.h"
+#include "catalog/heap.h"
+#include "commands/creatinh.h"
+#include "commands/view.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteManip.h"
 #include "rewrite/rewriteRemove.h"
-#include "commands/creatinh.h"
-#include "commands/view.h"
 
 /*---------------------------------------------------------------------
  * DefineVirtualRelation
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index ee8060b128..d41ea43745 100644
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -23,16 +23,16 @@
 #include <sys/file.h>
 #include "postgres.h"
 
-#include "utils/relcache.h"
-#include "storage/bufmgr.h"
-#include "storage/smgr.h"
-#include "optimizer/internal.h"
-#include "executor/executor.h"
-#include "executor/nodeTee.h"
+#include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
+#include "executor/executor.h"
+#include "executor/nodeTee.h"
+#include "optimizer/internal.h"
+#include "storage/bufmgr.h"
+#include "storage/smgr.h"
 #include "tcop/pquery.h"
-#include "access/heapam.h"
+#include "utils/relcache.h"
 
 /* ------------------------------------------------------------------
  *		ExecInitTee
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index ed8de050d6..24f334a128 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,28 +28,28 @@
 
 #include "postgres.h"
 
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
+#include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/nodeSeqscan.h"
+#include "executor/nodeAgg.h"
+#include "executor/nodeAppend.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeHash.h"
+#include "executor/nodeHashjoin.h"
 #include "executor/nodeIndexscan.h"
-#include "executor/nodeSort.h"
 #include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
 #include "executor/nodeNestloop.h"
-#include "executor/nodeHashjoin.h"
-#include "executor/nodeHash.h"
-#include "executor/nodeGroup.h"
-
-#include "executor/nodeAgg.h"
-#include "executor/nodeGroup.h"
 #include "executor/nodeResult.h"
-#include "executor/nodeUnique.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeAppend.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
-#include "executor/execdebug.h"
+#include "executor/nodeUnique.h"
 #include "optimizer/internal.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/heap.h"
 
 static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys,
 			  bool isindex, ScanDirection dir, Snapshot snapshot);
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index 1bcd6ed529..771bc407f7 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -26,8 +26,8 @@
  *	 node does the actual flattening work.
  */
 #include "postgres.h"
-#include "executor/executor.h"
 #include "executor/execFlatten.h"
+#include "executor/executor.h"
 
 #ifdef SETS_FIXED
 static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext,
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 806189dc0f..ba886ea868 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -32,20 +32,19 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
 
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/execdebug.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include "utils/syscache.h"
-#include "parser/parsetree.h"
-/* #include "access/localam.h" */
-#include "optimizer/var.h"
 #include "access/heapam.h"
 #include "catalog/heap.h"
 #include "commands/trigger.h"
+#include "executor/execdebug.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
+#include "optimizer/var.h"
+#include "parser/parsetree.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
 			   Query *parseTree);
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index bfa2ddd882..416444024a 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -74,23 +74,23 @@
  */
 #include "postgres.h"
 
-#include "miscadmin.h"
-#include "tcop/tcopprot.h"
 #include "executor/executor.h"
-#include "executor/nodeResult.h"
+#include "executor/nodeAgg.h"
 #include "executor/nodeAppend.h"
-#include "executor/nodeSeqscan.h"
-#include "executor/nodeIndexscan.h"
-#include "executor/nodeNestloop.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeMaterial.h"
-#include "executor/nodeSort.h"
-#include "executor/nodeUnique.h"
 #include "executor/nodeGroup.h"
-#include "executor/nodeAgg.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
+#include "executor/nodeIndexscan.h"
+#include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
+#include "executor/nodeNestloop.h"
+#include "executor/nodeResult.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
+#include "executor/nodeUnique.h"
+#include "miscadmin.h"
+#include "tcop/tcopprot.h"
 
 /* ------------------------------------------------------------------------
  *		ExecInitNode
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 05979c36a5..3602abb326 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -35,9 +35,9 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_language.h"
+#include "executor/execFlatten.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "executor/nodeSubplan.h"
 #include "utils/builtins.h"
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 071805032d..549877ee8f 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -119,9 +119,8 @@
 #include <string.h>
 
 #include "postgres.h"
-
-
 #include "executor/executor.h"
+
 #undef ExecStoreTuple
 
 #include "catalog/pg_type.h"
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index a336a2a1cf..c2efff5277 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -46,9 +46,9 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "catalog/pg_index.h"
 
 static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
 					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 3eae47d96e..0a01c9ae76 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -15,15 +15,14 @@
 #include <string.h>
 #include "postgres.h"
 
-
+#include "access/heapam.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "executor/functions.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
 #include "utils/datum.h"
-#include "access/heapam.h"
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/functions.h"
 
 #undef new
 
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index a8535b5a98..45196dfdf6 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -21,11 +21,11 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
-#include "parser/parse_type.h"
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
-#include "utils/syscache.h"
 #include "optimizer/clauses.h"
+#include "parser/parse_type.h"
+#include "utils/syscache.h"
 
 /*
  * AggFuncInfo -
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index e004ed27c5..84414d39a0 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -57,8 +57,8 @@
 
 
 #include "access/heapam.h"
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeAppend.h"
 #include "parser/parsetree.h"
 
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 6e8876b30f..9cce97e7d7 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -30,16 +30,16 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/execdebug.h"
-#include "executor/nodeIndexscan.h"
 
-#include "optimizer/clauses.h"
-#include "parser/parsetree.h"
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
+#include "executor/execdebug.h"
+#include "executor/executor.h"
+#include "executor/nodeIndexscan.h"
 #include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "parser/parsetree.h"
 
 /* ----------------
  *		Misc stuff to move to executor.h soon -cim 6/5/90
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index b3df8346b8..386455bb67 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -21,11 +21,11 @@
 #include "postgres.h"
 
 
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "executor/executor.h"
 #include "executor/nodeMaterial.h"
-#include "catalog/heap.h"
 #include "optimizer/internal.h"
-#include "access/heapam.h"
 
 /* ----------------------------------------------------------------
  *		ExecMaterial
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 422e2ba88e..9811db83b7 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -68,10 +68,10 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_operator.h"
-#include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/execdefs.h"
+#include "executor/executor.h"
 #include "executor/nodeMergejoin.h"
-#include "executor/execdebug.h"
 #include "utils/lsyscache.h"
 #include "utils/psort.h"
 
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index 4553e16f55..a675705757 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeNestloop.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 40ff81817c..db8357e498 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -24,10 +24,10 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
+#include "access/heapam.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeSeqscan.h"
-#include "access/heapam.h"
 #include "parser/parsetree.h"
 
 static Oid InitScanRelation(SeqScan *node, EState *estate,
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index fd6eb491ef..056fa7f029 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -11,9 +11,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 #include <string.h>
 
+#include "postgres.h"
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 6c88bbe85e..e4e83d654a 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "tcop/pquery.h"
 #include "executor/executor.h"
 #include "executor/nodeSubplan.h"
+#include "tcop/pquery.h"
 
 /* ----------------------------------------------------------------
  *		ExecSubPlan(node)
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index b9460498d0..fb3e216c55 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -26,10 +26,10 @@
 
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/nodeUnique.h"
 #include "access/heapam.h"
 #include "access/printtup.h"
+#include "executor/executor.h"
+#include "executor/nodeUnique.h"
 
 /* ----------------------------------------------------------------
  *		ExecIdenticalTuples
diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c
index 278ae71195..ec7c839f55 100644
--- a/src/backend/lib/fstack.c
+++ b/src/backend/lib/fstack.c
@@ -11,8 +11,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
+#include "postgres.h"
 #include "lib/fstack.h"
 
 /*
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index 04f14e7d07..9b52936850 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "utils/memutils.h"
 #include "lib/hasht.h"
+#include "utils/memutils.h"
 
 /* -----------------------------------
  *		HashTableWalk
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 29cc92de80..438f1695ac 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -31,14 +31,13 @@
 #include <arpa/inet.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "libpq/auth.h"
-#include "libpq/libpq.h"
+#include "libpq/crypt.h"
 #include "libpq/hba.h"
+#include "libpq/libpq.h"
 #include "libpq/password.h"
-#include "libpq/crypt.h"
-
+#include "miscadmin.h"
 
 static void sendAuthRequest(Port *port, AuthRequest areq, PacketDoneProc handler);
 static int	handle_done_auth(void *arg, PacketLen len, void *pkt);
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 0b11bf1cff..a6db7aa4f9 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -31,11 +31,11 @@
 
 #include "postgres.h"
 
-#include "lib/dllist.h"
-#include "libpq/libpq.h"
 #include "access/heapam.h"
-#include "catalog/catalog.h"
 #include "access/printtup.h"
+#include "catalog/catalog.h"
+#include "lib/dllist.h"
+#include "libpq/libpq.h"
 
 /* ----------------
  *		backend portal stack for recursive PQexec calls
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 7d86f3c2be..0cd132748e 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -37,10 +37,10 @@
 
 #include "postgres.h"
 
-#include "libpq/libpq-fs.h"
 #include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
 #include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+#include "storage/large_object.h"
 
 /* [PA] is Pascal Andr� <[email protected]> */
 
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 7f5b79ccee..eab9acc670 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -22,11 +22,12 @@
  */
 #include "postgres.h"
 
+#include "libpq/libpq.h"
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
-#include "libpq/libpq.h"
 #include "utils/builtins.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 78ec48d0ee..42f35fc51c 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -20,12 +20,13 @@
 #include <unistd.h>
 
 #include "postgres.h"
+#include "libpq/crypt.h"
 #include "miscadmin.h"
-#include "utils/nabstime.h"
 #include "storage/fd.h"
-#include "libpq/crypt.h"
+#include "utils/nabstime.h"
 
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
 char	  **pwd_cache = NULL;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 778bc3a2e1..781e5cfa68 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -21,8 +21,8 @@
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
 
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 70ac23c5cd..7108deb53a 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -5,15 +5,17 @@
  *
  */
 
-#include "postgres.h"
-#include "miscadmin.h"
-#include "libpq/password.h"
-#include "libpq/libpq.h"
 #include <string.h>
 #include <unistd.h>
+#include "postgres.h"
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
+#include "libpq/libpq.h"
+#include "libpq/password.h"
+#include "miscadmin.h"
+
 int
 verify_password(char *auth_arg, char *user, char *password)
 {
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index f6927b6ea6..d2e96f0f40 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -58,14 +58,7 @@
  *
  *------------------------
  */
-#include "postgres.h"
-
 #include <stdio.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -79,6 +72,14 @@
 #include <arpa/inet.h>
 #include <sys/file.h>
 
+#include "postgres.h"
+
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 #include "libpq/libpq.h"
 #include "miscadmin.h"
 
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 7afe669c69..99096e43a3 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -45,9 +45,11 @@
  */
 #include "postgres.h"
 
-#include "libpq/pqformat.h"
 #include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 #include <string.h>
 #ifdef HAVE_ENDIAN_H
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 9c2eaaeedc..2de32dc2aa 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -37,10 +37,10 @@
  *	is to do signal-handler reinstallation, which doesn't work well
  *	at all.
  * ------------------------------------------------------------------------*/
-#include "postgres.h"
-
 #include <signal.h>
 
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"
 
 pqsigfunc
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 38917478ff..477694437d 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -16,11 +16,10 @@
 
 #include "postgres.h"
 
-
-#include "utils/syscache.h"
 #include "catalog/pg_type.h"
 #include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
+#include "utils/syscache.h"
 
 /*
  * listCopy
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 166fd52d88..4db54b24c0 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -15,9 +15,8 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
 #include "nodes/plannodes.h"
-
+#include "nodes/relation.h"
 #include "utils/datum.h"
 
 static bool equali(List *a, List *b);
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 9738640e24..aa77582606 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -24,21 +24,19 @@
 
 #include "access/heapam.h"
 #include "access/htup.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
+#include "catalog/pg_type.h"
 #include "fmgr.h"
-#include "utils/datum.h"
-
-#include "nodes/nodes.h"
+#include "lib/stringinfo.h"
 #include "nodes/execnodes.h"
+#include "nodes/nodes.h"
+#include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-
-#include "catalog/pg_type.h"
-#include "lib/stringinfo.h"
+#include "utils/datum.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 #include "../parse.h"
 
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 704b9dcee9..ac2fb387b6 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -22,9 +22,9 @@
 
 #include "access/printtup.h"
 #include "nodes/print.h"
+#include "optimizer/clauses.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
-#include "optimizer/clauses.h"
 
 static char *plannode_type(Plan *p);
 
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index 3872da5fc7..474180fd07 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "postgres.h"
 #include "nodes/pg_list.h"
 #include "nodes/readfuncs.h"
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index ab5edca684..74603a9874 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -29,12 +29,12 @@
 #include "postgres.h"
 
 
-#include "utils/lsyscache.h"
-#include "catalog/pg_index.h"
 
+#include "catalog/pg_index.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 #include "nodes/readfuncs.h"
+#include "nodes/relation.h"
+#include "utils/lsyscache.h"
 
 /* ----------------
  *		node creator declarations
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index de2cb95b21..ab38a5fc6e 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -33,8 +33,6 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
 #include "optimizer/geqo_copy.h"
 
 /* geqo_copy
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 27b137187a..cf525ec862 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,10 +35,6 @@
 
 
 #include "postgres.h"
-
-
-
-
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 01cb6a6241..49d5699841 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,10 +32,6 @@
 
 
 #include "postgres.h"
-
-
-
-
 #include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 0d57ccaf6b..0e6fd76192 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -18,9 +18,9 @@
    =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
-#include "postgres.h"
-
 #include <math.h>
+
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #ifndef MAXINT
@@ -30,13 +30,11 @@
 #include <values.h>
 #endif
 
-
-#include "utils/portal.h"
-
-#include "optimizer/paths.h"
 #include "optimizer/cost.h"
-
 #include "optimizer/geqo.h"
+#include "optimizer/paths.h"
+#include "utils/portal.h"
+
 
 /*
  * Variables set by geqo_eval_startup for use within a single GEQO run
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index c041e51e20..6ae9853598 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -22,14 +22,10 @@
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
 
 #include "postgres.h"
-
-
-
-
 #include "optimizer/geqo.h"
+#include "optimizer/geqo_misc.h"
 #include "optimizer/geqo_pool.h"
 #include "optimizer/geqo_selection.h"
-#include "optimizer/geqo_misc.h"
 
 
 /* define edge recombination crossover [ERX] per default */
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 4066a0dfcf..6bdc602d93 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -22,10 +22,6 @@
 #include <stdio.h>
 
 #include "postgres.h"
-
-
-
-
 #include "optimizer/geqo_misc.h"
 
 static float avg_pool(Pool *pool);
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index 9b80f758b4..bde6101527 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -32,12 +32,8 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_random.h"
 #include "optimizer/geqo_mutation.h"
+#include "optimizer/geqo_random.h"
 
 void
 geqo_mutation(Gene *tour, int num_gene)
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index c253998e07..9602c94eae 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -34,12 +34,8 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
 
 
 /* ox1
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index a14b6403c2..42d31c9748 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -34,12 +34,8 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
 
 
 /* ox2
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 37dbe8a1ed..8de56e2b82 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -26,21 +26,16 @@
 
 #include "postgres.h"
 #include "miscadmin.h"
-
 #include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
+#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
-
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
-
+#include "optimizer/geqo_gene.h"
+#include "optimizer/internal.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 #include "storage/fd.h"
 
 
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index 85562c9521..5b6063d454 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -34,12 +34,8 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
 
 
 /* pmx
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 63bd28c0a6..ac5aa76d6e 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -21,13 +21,9 @@
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
 
 #include "postgres.h"
-
-
-
-
 #include "optimizer/geqo.h"
-#include "optimizer/geqo_pool.h"
 #include "optimizer/geqo_copy.h"
+#include "optimizer/geqo_pool.h"
 #include "optimizer/geqo_recombination.h"
 
 
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index df0d690a28..46d41c221f 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -34,12 +34,8 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
 
 
 /* px
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index c0b0b919c6..9edfaa8f0f 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -19,12 +19,8 @@
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_recombination.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
 
 
 /*
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index 2f3aab2604..f33f8e5004 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -36,13 +36,9 @@
 #include <math.h>
 
 #include "postgres.h"
-
-
-
-
-#include "optimizer/geqo_selection.h"
 #include "optimizer/geqo_copy.h"
 #include "optimizer/geqo_random.h"
+#include "optimizer/geqo_selection.h"
 
 static int	linear(int max, double bias);
 
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index f1e7b73145..ea9f57d067 100644
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@@ -16,19 +16,13 @@
 
 #include "postgres.h"
 
+
 #include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-
+#include "nodes/relation.h"
 #include "optimizer/cost.h"
-
-/*
- include "optimizer/geqo/tsp.h"
- */
-
-#include "optimizer/geqo/geqo_gene.h"
 #include "optimizer/geqo/geqo.h"
+#include "optimizer/geqo/geqo_gene.h"
 
 /*
  * minspantree
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index fb35cdc1d7..03f94390af 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -20,8 +20,8 @@
 
 #include "postgres.h"
 
-#include "access/htup.h"
 #include "access/heapam.h"
+#include "access/htup.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 0c1ed0777c..07ac81b845 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -16,15 +16,11 @@
 
 #include "postgres.h"
 
-
-#include "optimizer/internal.h"
-
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
 #include "optimizer/cost.h"
-
-
 #include "optimizer/geqo.h"
+#include "optimizer/internal.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
 #ifdef GEQO
 bool		_use_geqo_ = true;
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index dfdd2b239f..681042eead 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -15,10 +15,10 @@
 
 #include "catalog/pg_operator.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
 #include "optimizer/plancat.h"
+#include "optimizer/restrictinfo.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index e7c10ab850..ec2bea1c5c 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -12,10 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
 #include <math.h>
 
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #ifndef MAXINT
@@ -27,6 +26,7 @@
 #endif
 #endif
 
+
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
 #include "optimizer/tlist.h"
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index 8b507529b2..b3cb182db8 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
+#include "optimizer/paths.h"
 
 
 static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 237267bd88..1f2b36dc69 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -24,17 +24,17 @@
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
 #include "optimizer/keys.h"
 #include "optimizer/ordering.h"
+#include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
-#include "optimizer/pathnode.h"
-#include "parser/parsetree.h"
+#include "optimizer/restrictinfo.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
-#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
 #include "utils/lsyscache.h"
 
 
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 31755a3eb2..17020d2617 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -18,9 +18,9 @@
 
 
 
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
 #include "optimizer/cost.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
 static Path *best_innerjoin(List *join_paths, List *outer_relid);
 static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 1f3e5d145c..e17e517fee 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -15,10 +15,10 @@
 
 
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
 static bool nonoverlap_sets(List *s1, List *s2);
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 46ca7d8483..12f82bf777 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
 
 /*
  * group_clauses_by_order
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 554da6c52d..01fbf29f18 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -14,15 +14,15 @@
 #include "postgres.h"
 
 
-#include "nodes/nodeFuncs.h"
 
-#include "optimizer/internal.h"
+
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/paths.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
+#include "optimizer/paths.h"
 #include "optimizer/plancat.h"
-
+#include "optimizer/restrictinfo.h"
 #include "parser/parsetree.h"
 
 
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index c5a560061a..72f0a3cadb 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -14,11 +14,11 @@
 #include "postgres.h"
 
 
-#include "optimizer/paths.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
+#include "optimizer/keys.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static int match_pathkey_joinkeys(List *pathkey, List *joinkeys,
 					   int outer_or_inner);
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index c4136aa75b..ebf8358afc 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -15,8 +15,8 @@
 
 
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
 
 
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 12d10940d1..77c36bba4c 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -16,20 +16,16 @@
 
 #include "postgres.h"
 
-#include "utils/syscache.h"
-
-#include "nodes/nodeFuncs.h"
-
 #include "nodes/makefuncs.h"
-
-#include "utils/lsyscache.h"
-
-#include "optimizer/restrictinfo.h"
-#include "optimizer/cost.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
+#include "optimizer/cost.h"
+#include "optimizer/internal.h"
 #include "optimizer/planmain.h"
+#include "optimizer/restrictinfo.h"
 #include "optimizer/tlist.h"
-#include "optimizer/internal.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 
 #define NONAME_SORT		1
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 2f362005e3..91fff30fc8 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,21 +14,16 @@
 #include <sys/types.h>
 
 #include "postgres.h"
-
-#include "nodes/makefuncs.h"
-
-
 #include "catalog/pg_type.h"
-
-#include "utils/lsyscache.h"
-
-#include "optimizer/planmain.h"
+#include "nodes/makefuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/cost.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
+#include "utils/lsyscache.h"
 
 extern int	Quiet;
 
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index c2beb677e6..95280d87ce 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -16,11 +16,11 @@
 #include "postgres.h"
 
 
+#include "optimizer/clauses.h"
+#include "optimizer/paths.h"
 #include "optimizer/planmain.h"
-#include "optimizer/subselect.h"
 #include "optimizer/prep.h"
-#include "optimizer/paths.h"
-#include "optimizer/clauses.h"
+#include "optimizer/subselect.h"
 #include "optimizer/tlist.h"
 
 
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 9d9e5345e5..86e3970baa 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -16,30 +16,24 @@
 
 #include "postgres.h"
 
-#include "nodes/makefuncs.h"
-#include "catalog/pg_type.h"
-#include "parser/parse_expr.h"
-
-#include "utils/lsyscache.h"
+#include "access/genam.h"
 #include "access/heapam.h"
-
+#include "catalog/pg_type.h"
+#include "executor/executor.h"
+#include "nodes/makefuncs.h"
+#include "optimizer/clauses.h"
 #include "optimizer/internal.h"
+#include "optimizer/planmain.h"
 #include "optimizer/planner.h"
 #include "optimizer/prep.h"
-#include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
-
-/* DATA STRUCTURE CREATION/MANIPULATION ROUTINES */
-#include "optimizer/clauses.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-
-#include "executor/executor.h"
-
+#include "parser/parse_expr.h"
+#include "parser/parse_oper.h"
 #include "utils/builtins.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
-#include "access/genam.h"
-#include "parser/parse_oper.h"
 
 static List *make_subplanTargetList(Query *parse, List *tlist,
 					   AttrNumber **groupColIdx);
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 08db12a091..fa5ae33870 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -16,14 +16,13 @@
 #include "postgres.h"
 
 
-#include "nodes/nodeFuncs.h"
-#include "nodes/makefuncs.h"
 
+#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/tlist.h"
 
 static void set_join_tlist_references(Join *join);
 static void set_nonamescan_tlist_references(SeqScan *nonamescan);
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 8d8cd96790..6e44baccb6 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -15,9 +15,9 @@
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "optimizer/subselect.h"
-#include "optimizer/planner.h"
 #include "optimizer/clauses.h"
+#include "optimizer/planner.h"
+#include "optimizer/subselect.h"
 
 int			PlannerQueryLevel;	/* level of current query */
 List	   *PlannerInitPlan;	/* init subplans for current query */
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index c2978ed485..b69bedf4db 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -15,11 +15,11 @@
 
 #include "postgres.h"
 
-#include "nodes/makefuncs.h"
 
+
+#include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
-
 #include "utils/lsyscache.h"
 
 static Expr *pull_args(Expr *qual);
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 4639e743ab..b48005cfd8 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -14,17 +14,17 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "catalog/pg_type.h"
 
-#include "nodes/makefuncs.h"
 
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
 
-#include "parser/parsetree.h"
 
-#include "optimizer/prep.h"
+#include "catalog/pg_type.h"
+#include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
+#include "optimizer/prep.h"
+#include "parser/parsetree.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static List *expand_targetlist(List *tlist, Oid relid, int command_type,
 				  Index result_relation);
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 12c31e9557..d2955ccb27 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -17,15 +17,15 @@
 #include "postgres.h"
 
 
-#include "parser/parsetree.h"
-#include "parser/parse_clause.h"
 
-#include "utils/lsyscache.h"
 
-#include "optimizer/prep.h"
 #include "optimizer/plancat.h"
-#include "optimizer/planner.h"
 #include "optimizer/planmain.h"
+#include "optimizer/planner.h"
+#include "optimizer/prep.h"
+#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
+#include "utils/lsyscache.h"
 
 static List *plan_inherit_query(Relids relids, Index rt_index,
 				   RangeTblEntry *rt_entry, Query *parse, List *tlist,
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index c3882a1cf9..4617d3ba19 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -19,16 +19,13 @@
 #include "postgres.h"
 
 #include "catalog/pg_operator.h"
-#include "nodes/plannodes.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-
-
-#include "utils/lsyscache.h"
-
+#include "nodes/plannodes.h"
 #include "optimizer/clauses.h"
 #include "optimizer/internal.h"
 #include "optimizer/var.h"
+#include "utils/lsyscache.h"
 
 
 static bool fix_opid_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 38c26a2c0d..cdc3bc43d3 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -16,8 +16,8 @@
 #include "postgres.h"
 
 
-#include "optimizer/plancat.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/plancat.h"
 
 
 static List *find_secondary_index(Query *root, Oid relid);
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index a61f92661f..4be7927f71 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -14,8 +14,8 @@
 #include "postgres.h"
 
 
-#include "optimizer/joininfo.h"
 #include "optimizer/clauses.h"
+#include "optimizer/joininfo.h"
 
 
 /*
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 436b923366..5071172cc0 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,13 +16,13 @@
 #include "postgres.h"
 
 
-#include "optimizer/pathnode.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/plancat.h"
+
 #include "optimizer/cost.h"
 #include "optimizer/keys.h"
 #include "optimizer/ordering.h"
-
+#include "optimizer/pathnode.h"
+#include "optimizer/plancat.h"
+#include "optimizer/restrictinfo.h"
 #include "parser/parsetree.h"
 
 static Path *better_path(Path *new_path, List *unique_paths, bool *is_new);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 7cbdb38592..ba4e73aac9 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -16,20 +16,21 @@
 #include <math.h>
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/genam.h"
 
+
+
+
+#include "access/genam.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_inherits.h"
-
-#include "parser/parsetree.h"
-
 #include "optimizer/internal.h"
 #include "optimizer/plancat.h"
-
+#include "parser/parsetree.h"
 #include "utils/syscache.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 0bfb7b095d..f0e154d2ea 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -13,10 +13,10 @@
  */
 #include "postgres.h"
 
-#include "nodes/nodeFuncs.h"
 
-#include "optimizer/internal.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
+#include "optimizer/internal.h"
 #include "optimizer/restrictinfo.h"
 
 /*
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index f78d069067..61ed76ec13 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -13,13 +13,13 @@
  */
 #include "postgres.h"
 
-#include "nodes/nodeFuncs.h"
 
-#include "optimizer/var.h"
-#include "optimizer/tlist.h"
-#include "optimizer/clauses.h"
 
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/tlist.h"
+#include "optimizer/var.h"
 
 static Node *flatten_tlistentry(Node *tlistentry, List *flat_tlist);
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index d57cc1cd74..39c0b0d47c 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -16,16 +16,16 @@
 #include <string.h>
 
 #include "postgres.h"
+
 #include "access/heapam.h"
+#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
+#include "parse.h"
 #include "parser/analyze.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "catalog/pg_type.h"
-#include "parse.h"
-
 #include "utils/builtins.h"
 
 static Query *transformStmt(ParseState *pstate, Node *stmt);
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 8ff81c69be..34d5f77674 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -37,18 +37,18 @@
 
 #include "postgres.h"
 #include "access/htup.h"
+#include "access/xact.h"
+#include "catalog/catname.h"
+#include "catalog/pg_type.h"
 #include "nodes/parsenodes.h"
 #include "nodes/print.h"
+#include "parser/analyze.h"
 #include "parser/gramparse.h"
 #include "parser/parse_type.h"
-#include "utils/acl.h"
-#include "catalog/catname.h"
-#include "access/xact.h"
+#include "storage/bufpage.h"
 #include "storage/lmgr.h"
+#include "utils/acl.h"
 #include "utils/numeric.h"
-#include "parser/analyze.h"
-#include "catalog/pg_type.h"
-#include "storage/bufpage.h"
 
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index e42f75891e..16d50e5eae 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -19,10 +19,10 @@
 #include "catalog/pg_aggregate.h"
 #include "optimizer/clauses.h"
 #include "parser/parse_agg.h"
-#include "parser/parse_expr.h"
 #include "parser/parse_coerce.h"
-#include "utils/syscache.h"
+#include "parser/parse_expr.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static bool contain_agg_clause(Node *clause);
 static bool contain_agg_clause_walker(Node *node, void *context);
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 13e16e768a..c8f234c2f1 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -17,14 +17,14 @@
 
 #include "postgres.h"
 #include "access/heapam.h"
+#include "nodes/relation.h"
+#include "parse.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_target.h"
-#include "parser/parse_coerce.h"
-#include "nodes/relation.h"
-#include "parse.h"
 
 
 #define ORDER_CLAUSE 0
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index d4ee2ae728..e06345f6a0 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -13,13 +13,13 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "utils/builtins.h"
 
-#include "parser/parse_expr.h"
 
+#include "parser/parse_coerce.h"
+#include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
+#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 Oid			DemoteType(Oid inType);
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index b550782968..89e4102d6a 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,11 +22,11 @@
 #include "parse.h"
 #include "parser/analyze.h"
 #include "parser/gramparse.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
 
 static Node *parser_typecast(Value *expr, TypeName *typename, int32 atttypmod);
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index b3256c369c..cd92fd1e8b 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -19,19 +19,19 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_aggregate.h"
 #include "lib/dllist.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/relation.h"
 #include "parser/parse_agg.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 9db51d3712..da43dc7ee5 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,15 +20,15 @@
 #include "catalog/pg_type.h"
 #include "fmgr.h"
 #include "nodes/makefuncs.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_node.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static void disallow_setop(char *op, Type optype, Node *operand);
 static Node *make_operand(char *opname,
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index bb0ee9dece..d51a230744 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -18,11 +18,11 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
+#include "parser/parse_coerce.h"
+#include "parser/parse_func.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
-#include "parser/parse_coerce.h"
 #include "utils/syscache.h"
-#include "parser/parse_func.h"
 
 static Oid *oper_select_candidate(int nargs, Oid *input_typeids,
 					  CandidateList candidates);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 54f36a6067..316bbbccf2 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -19,12 +19,12 @@
 #include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
-#include "parser/parse_relation.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_relation.h"
+#include "parser/parse_type.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
-#include "parser/parse_type.h"
 
 static void checkTargetTypes(ParseState *pstate, char *target_colname,
 				 char *refname, char *colname);
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 85673eb407..2ab482c52f 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -17,11 +17,11 @@
 
 #include "postgres.h"
 #include "nodes/makefuncs.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 13ef16a7ce..f4f13f88d6 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -20,7 +20,6 @@
 
 #if defined(FLEX_SCANNER)
 extern void DeleteBuffer(void);
-
 #endif	 /* FLEX_SCANNER */
 
 char	   *parseString;		/* the char* which holds the string to be
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 1c11237eba..80342dfb69 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -24,12 +24,12 @@
 
 #include "postgres.h"
 #include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+#include "parse.h"
 #include "parser/gramparse.h"
 #include "parser/keywords.h"
 #include "parser/scansup.h"
-#include "parse.h"
 #include "utils/builtins.h"
 
 #ifdef  YY_READ_BUF_SIZE
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index 22b21586e8..b9dc93985c 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 #include <nlist.h>
-#include "link.h"
+#include <link.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index da43aa7563..d54c542ee5 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -18,8 +18,9 @@
 /* System includes */
 #include <stdio.h>
 #include <a.out.h>
-#include "dl.h"
+
 #include "postgres.h"
+#include "dl.h"
 #include "dynloader.h"
 #include "fmgr.h"
 #include "utils/dynamic_loader.h"
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index b20ca4e874..1c7259c5df 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -19,6 +19,7 @@
 
 #include "postgres.h"
 #ifdef HAVE_DLD_H
+#include "dld.h"
 #endif
 
 #ifdef NOT_USED
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 2ead59012c..48668e753f 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -16,10 +16,9 @@
 #include <stdio.h>
 #include "postgres.h"
 #include "dl.h"
-#include "utils/dynamic_loader.h"
-#include "postgres.h"
 #include "fmgr.h"
 #include "port-protos.h"
+#include "utils/dynamic_loader.h"
 
 extern char *pg_pathname;
 
diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c
index b08d660e9c..448f02b456 100644
--- a/src/backend/port/isinf.c
+++ b/src/backend/port/isinf.c
@@ -26,6 +26,7 @@ isinf(double d)
 
 #if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D)
 #if HAVE_FP_CLASS_H
+#include <fp_class.h>
 #endif
 int
 isinf(x)
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 26d0e3216e..5a46b55363 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -31,8 +31,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifdef NOT_USED
-#endif
 
 #include "postgres.h"
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1e6e32115d..e15988344c 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -38,32 +38,33 @@
 #include <netdb.h>
 #endif
 
+#include "postgres.h"
+
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256
 #endif
 
-#include "postgres.h"
+#if !defined(NO_UNISTD_H)
+#include <unistd.h>
+#endif	 /* !NO_UNISTD_H */
 
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif	 /* !NO_UNISTD_H */
 
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/socket.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
 #include <values.h>
 #endif
 #include <sys/wait.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/socket.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -77,24 +78,25 @@
 #include "getopt.h"
 #endif
 
-#include "storage/ipc.h"
-#include "libpq/libpq.h"
+#ifndef HAVE_GETHOSTNAME
+#include "port-protos.h"
+#endif
+
+#include "commands/async.h"
+#include "lib/dllist.h"
 #include "libpq/auth.h"
+#include "libpq/crypt.h"
+#include "libpq/libpq.h"
 #include "libpq/pqcomm.h"
 #include "libpq/pqsignal.h"
-#include "libpq/crypt.h"
 #include "miscadmin.h"
-#include "version.h"
-#include "lib/dllist.h"
-#include "tcop/tcopprot.h"
-#include "commands/async.h"
 #include "nodes/nodes.h"
-#include "storage/proc.h"
-#ifndef HAVE_GETHOSTNAME
-#include "port-protos.h"
-#endif
 #include "storage/fd.h"
+#include "storage/ipc.h"
+#include "storage/proc.h"
+#include "tcop/tcopprot.h"
 #include "utils/trace.h"
+#include "version.h"
 
 #if !defined(MAXINT)
 #define MAXINT		   INT_MAX
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index b8768d622d..8deae9cb79 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -11,14 +11,14 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "utils/syscache.h"
-#include "rewrite/locks.h"
 
 #include "access/heapam.h"
-#include "utils/syscache.h"
+#include "catalog/pg_shadow.h"
+#include "rewrite/locks.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "catalog/pg_shadow.h"
+#include "utils/syscache.h"
+#include "utils/syscache.h"
 
 
 /*
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 4acd301fb2..e02634c446 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -12,25 +12,25 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
-#include "parser/parse_type.h"
-#include "parser/parsetree.h"
-#include "parser/parse_relation.h"
 
-#include "parser/parse_target.h"
 
-#include "parser/analyze.h"
-#include "optimizer/clauses.h"
-#include "optimizer/prep.h"
 
-#include "rewrite/rewriteManip.h"
-#include "rewrite/locks.h"
 
-#include "access/heapam.h"
 
-#include "utils/lsyscache.h"
-#include "utils/acl.h"
+#include "access/heapam.h"
 #include "catalog/pg_type.h"
+#include "miscadmin.h"
+#include "optimizer/clauses.h"
+#include "optimizer/prep.h"
+#include "parser/analyze.h"
+#include "parser/parse_relation.h"
+#include "parser/parse_target.h"
+#include "parser/parse_type.h"
+#include "parser/parsetree.h"
+#include "rewrite/locks.h"
+#include "rewrite/rewriteManip.h"
+#include "utils/acl.h"
+#include "utils/lsyscache.h"
 
 
 static RewriteInfo *gatherRewriteMeta(Query *parsetree,
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 13905cb4dc..45d01b30aa 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -12,12 +12,12 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "parser/parsetree.h"
-#include "utils/lsyscache.h"
-#include "utils/builtins.h"
-#include "rewrite/rewriteManip.h"
 
 #include "optimizer/clauses.h"
+#include "parser/parsetree.h"
+#include "rewrite/rewriteManip.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
 
 static void ResolveNew(RewriteInfo *info, List *targetlist,
 		   Node **node, int sublevels_up);
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 84921b2376..f1ac76ba9e 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -17,13 +17,13 @@
 #include "postgres.h"
 
 
+
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_rewrite.h"
-#include "utils/syscache.h"
-
 #include "rewrite/rewriteRemove.h"
 #include "rewrite/rewriteSupport.h"
+#include "utils/syscache.h"
 
 /*-----------------------------------------------------------------------
  * RewriteGetRuleEventRel
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index d9df7dc54b..0e370c4846 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -13,14 +13,14 @@
  */
 #include "postgres.h"
 
+
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "rewrite/rewriteSupport.h"
 #include "utils/catcache.h"
 #include "utils/syscache.h"
 
-#include "rewrite/rewriteSupport.h"
-
 /*
  * RuleIdGetActionInfo -
  *	   given a rule oid, look it up and return the rule-event-qual and
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 255e65456e..c86d77a218 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -19,24 +19,23 @@
 
 #include "postgres.h"
 
-/* declarations split between these three files */
+
+#include "catalog/catalog.h"
+#include "executor/execdebug.h"
+#include "miscadmin.h"
 #include "storage/buf.h"
 #include "storage/buf_internals.h"
 #include "storage/bufmgr.h"
-
 #include "storage/fd.h"
 #include "storage/ipc.h"
+#include "storage/lmgr.h"
 #include "storage/s_lock.h"
 #include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/smgr.h"
-#include "storage/lmgr.h"
-#include "miscadmin.h"
+#include "storage/spin.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
-#include "executor/execdebug.h"
-#include "catalog/catalog.h"
 
 /*
  *	if BMTRACE is defined, we trace the last 200 buffer allocations and
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 17bba2cbd8..45b4aafab9 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -48,14 +48,11 @@
 #include <signal.h>
 
 #include "postgres.h"
-
-/* declarations split between these three files */
-
+#include "executor/execdebug.h"
+#include "miscadmin.h"
 #include "storage/s_lock.h"
 #include "storage/smgr.h"
-#include "miscadmin.h"
 #include "utils/relcache.h"
-#include "executor/execdebug.h"
 
 extern SPINLOCK BufMgrLock;
 extern long int ReadBufferCount;
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 9032deb903..e6f4d21b87 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 
 #include "postgres.h"
-
 #include "storage/bufmgr.h"
 
 
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index bd5e7d5094..2deff2699e 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -28,11 +28,9 @@
 
 #include "postgres.h"
 
-/* declarations split between these three files */
-
+#include "executor/execdebug.h"
 #include "storage/smgr.h"
 #include "utils/relcache.h"
-#include "executor/execdebug.h"
 
 extern long int LocalBufferFlushCount;
 
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 98e36d6ab3..312496219b 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -16,9 +16,9 @@
 
 #include "postgres.h"
 
-#include "storage/sinval.h"
-#include "storage/bufmgr.h"
 #include "miscadmin.h"
+#include "storage/bufmgr.h"
+#include "storage/sinval.h"
 
 /*
  * SystemPortAddressCreateMemoryKey
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 27bf19316e..91b14bb5e8 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -26,13 +26,14 @@
  */
 #include <errno.h>
 #include "postgres.h"
-#include "storage/s_lock.h"
-#include "storage/proc.h"
 
 #ifndef HAS_TEST_AND_SET
 #include <sys/sem.h>
 #endif
 
+#include "storage/proc.h"
+#include "storage/s_lock.h"
+
 /* globals used in this file */
 IpcSemaphoreId SpinLockId;
 
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 2dc819fef8..77227c24da 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -23,11 +23,11 @@
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
-#include "catalog/catalog.h"	/* for newoid() */
+#include "catalog/catalog.h"
 #include "catalog/heap.h"
-#include "catalog/index.h"		/* for index_create() */
-#include "catalog/pg_type.h"	/* for INT4OID */
-#include "catalog/pg_opclass.h" /* for INT4_OPS_OID */
+#include "catalog/index.h"
+#include "catalog/pg_opclass.h"
+#include "catalog/pg_type.h"
 #include "libpq/libpq-fs.h"
 #include "miscadmin.h"
 #include "storage/large_object.h"
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 36e440f0dc..e28487d0e4 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -25,9 +25,9 @@
 
 
 
-#include "catalog/catalog.h"
 
 #include "access/transam.h"
+#include "catalog/catalog.h"
 
 extern Oid	MyDatabaseId;
 
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index f66a995b05..0cd08d1bd7 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -36,11 +36,11 @@
 #include <signal.h>
 
 #include "postgres.h"
+#include "access/xact.h"
 #include "miscadmin.h"
 #include "storage/proc.h"
-#include "access/xact.h"
-#include "utils/trace.h"
 #include "utils/ps_status.h"
+#include "utils/trace.h"
 
 static int	WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode);
 
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index d7af722127..71813ace74 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <string.h>
 #include "postgres.h"
+
+#include "miscadmin.h"
 #include "storage/lmgr.h"
 #include "storage/multilev.h"
-
 #include "utils/rel.h"
-#include "miscadmin.h"
 
 static bool MultiAcquire(LOCKMETHOD lockmethod, LOCKTAG *tag,
 			 LOCKMODE lockmode, PG_LOCK_LEVEL level);
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 2d5da63e47..512e0dae49 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -66,6 +66,7 @@
 
 /* In Ultrix, sem.h must be included after ipc.h */
 #include <sys/sem.h>
+
 #include "storage/lmgr.h"
 #include "storage/proc.h"
 #include "utils/trace.h"
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index e298629268..49897e2369 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -18,9 +18,9 @@
 #include <sys/file.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "catalog/catalog.h"
+#include "miscadmin.h"
 #include "storage/smgr.h"
 
 #undef DIAGNOSTIC
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index bebeeb0889..1aa67eb8d6 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -37,12 +37,9 @@
 
 #include "postgres.h"
 
+#include "access/printtup.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
-#include "access/printtup.h"
-
-
-
 
 
 static char CommandInfo[32] = {0};
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 0ef85beabb..9e5b662e0c 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -61,17 +61,14 @@
 
 #include "postgres.h"
 
-
-#include "utils/builtins.h"
-#include "tcop/fastpath.h"
-#include "libpq/libpq.h"
-#include "libpq/pqformat.h"
-
 #include "access/xact.h"
-
-#include "utils/syscache.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+#include "tcop/fastpath.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 
 /* ----------------
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 6c18339212..7011b90322 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/param.h>
+
+#include "postgres.h"
+
 #ifndef MAXHOSTNAMELEN
 #include <netdb.h>
 #endif
@@ -41,13 +44,11 @@
 #ifdef __CYGWIN32__
 #endif
 
-#include "postgres.h"
-#include "miscadmin.h"
-
 #include "commands/async.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "libpq/pqsignal.h"
+#include "miscadmin.h"
 #include "nodes/print.h"
 #include "optimizer/cost.h"
 #include "optimizer/planner.h"
@@ -59,20 +60,12 @@
 #include "tcop/utility.h"
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
-#include "../backend/parser/parse.h"
-
-#ifdef NOT_USED
-#endif
-
-#ifdef NOT_USED
-#endif
-
-#ifdef NOT_USED
-#endif
-
 #include "utils/trace.h"
 
+#include "../backend/parser/parse.h"
+
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 
 /*
@@ -1502,7 +1495,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.122 $ $Date: 1999/07/16 03:13:50 $\n");
+		puts("$Revision: 1.123 $ $Date: 1999/07/16 04:59:53 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 94f32be246..f897fa4424 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -15,10 +15,6 @@
 
 #include "postgres.h"
 
-
-
-
-
 #include "executor/execdefs.h"
 #include "executor/executor.h"
 #include "tcop/pquery.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 6f10701db6..4be1da058e 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -14,38 +14,35 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+
 #include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
-
 #include "commands/async.h"
 #include "commands/cluster.h"
 #include "commands/command.h"
 #include "commands/copy.h"
 #include "commands/creatinh.h"
 #include "commands/dbcommands.h"
-#include "commands/sequence.h"
 #include "commands/defrem.h"
-#include "commands/rename.h"
-#include "commands/view.h"
-#include "commands/vacuum.h"
 #include "commands/explain.h"
-#include "commands/trigger.h"
 #include "commands/proclang.h"
+#include "commands/rename.h"
+#include "commands/sequence.h"
+#include "commands/trigger.h"
+#include "commands/vacuum.h"
 #include "commands/variable.h"
-
-#include "../backend/parser/parse.h"
-#include "utils/acl.h"
-#include "rewrite/rewriteRemove.h"
+#include "commands/view.h"
+#include "miscadmin.h"
 #include "rewrite/rewriteDefine.h"
+#include "rewrite/rewriteRemove.h"
 #include "tcop/utility.h"
-#include "utils/ps_status.h"
-
-#ifndef NO_SECURITY
-#include "miscadmin.h"
 #include "utils/acl.h"
+#include "utils/acl.h"
+#include "utils/ps_status.h"
 #include "utils/syscache.h"
-#endif
+
+#include "../backend/parser/parse.h"
 
 void		DefineUser(CreateUserStmt *stmt, CommandDest);
 void		AlterUser(AlterUserStmt *stmt, CommandDest);
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index 75007ad4a4..c0a0205f2a 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -18,9 +18,9 @@
 
 #include <stdlib.h>
 #include "postgres.h"
-#include "tioga/tgRecipe.h"
 
 #include "catalog/catalog.h"
+#include "tioga/tgRecipe.h"
 
 static Arr_TgString *TextArray2ArrTgString(char *str);
 
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index abd48e7963..d50c3ba8a2 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -15,13 +15,13 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "utils/memutils.h"
-#include "utils/acl.h"
-#include "utils/syscache.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
+#include "utils/acl.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
 
 static char *getid(char *s, char *n);
 static int32 aclitemeq(AclItem *a1, AclItem *a2);
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 2af435a288..b07c5efa0d 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -19,16 +19,16 @@
 
 #include "postgres.h"
 
+
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
-
-#include "utils/syscache.h"
-#include "utils/memutils.h"
-#include "storage/fd.h"
 #include "fmgr.h"
-#include "utils/array.h"
-#include "libpq/libpq-fs.h"
 #include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+#include "storage/fd.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
 
 #define ASSGN	 "="
 
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index 8f25d129b3..46f3bcc939 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -34,7 +34,6 @@ static const char *num_word(Cash value);
 
 #ifdef USE_LOCALE
 static struct lconv *lconvert = NULL;
-
 #endif
 
 /* cash_in()
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index c20f1869a3..e17ea08c7b 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -15,7 +15,7 @@
 #include <stdio.h>				/* for sprintf() */
 #include <string.h>
 #include "postgres.h"
-#include "utils/builtins.h"		/* where the declarations go */
+#include "utils/builtins.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index 1e1a31f364..e1852d38c3 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -15,21 +15,20 @@
 #include <fcntl.h>
 
 #include "postgres.h"
-#include "fmgr.h"
+#ifndef HAVE_MEMMOVE
+#include "regex/utils.h"
+#else
+#include <string.h>
+#endif
 
 #include "catalog/pg_type.h"
+#include "fmgr.h"
 #include "libpq/be-fsstubs.h"
 #include "libpq/libpq-fs.h"
 #include "optimizer/internal.h"
 #include "utils/array.h"
 #include "utils/memutils.h"
 
-#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
-#else
-#include <string.h>
-#endif
-
 #define INFTY 500000000
 #define MANY  10000
 #define MAXPAT 20
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 4d516a0cde..aa2cb0ec78 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -31,14 +31,15 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+
 #include "access/xact.h"
+#include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/dt.h"
 
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 31ebd7a828..54585b8c10 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -17,9 +17,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
-
 #include "postgres.h"
-#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
@@ -29,6 +27,8 @@
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
+
+#include "miscadmin.h"
 #include "utils/builtins.h"
 
 static int	DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 91b716831a..af36e073ea 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -30,11 +30,12 @@
  */
 #include <stdio.h>
 #include <string.h>
+
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#include "postgres.h"
 #include "utils/builtins.h"
 
 #ifndef SHRT_MAX
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 44a767e1d2..9d13b2c42a 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -19,8 +19,8 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "utils/builtins.h"
 #include "mb/pg_wchar.h"
+#include "utils/builtins.h"
 
 static int	like(pg_wchar * text, pg_wchar * p);
 
@@ -110,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }
 
 
-/*	$Revision: 1.28 $
+/*	$Revision: 1.29 $
 **	"like.c" A first attempt at a LIKE operator for Postgres95.
 **
 **	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index f55484920b..ebcc59c908 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
@@ -23,8 +22,10 @@
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
-#include "utils/builtins.h"
+
 #include "access/xact.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
 
 static AbsoluteTime tm2abstime(struct tm * tm, int tz);
 
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 0d7b6831b5..1e82d42ef2 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -17,15 +17,17 @@
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
+
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#include "postgres.h"
-#include "utils/builtins.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
+#include "utils/builtins.h"
 
 #ifndef INT_MAX
 #define INT_MAX (0x7FFFFFFFL)
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index aa59fd008d..ffc11f7ffa 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "regex/regex.h"
 
+#include "regex/regex.h"
 #include "utils/builtins.h"
 
 #if defined(DISABLE_XOPEN_NLS)
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 0b6ea2a5d2..e078f29e0a 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -13,16 +13,16 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "utils/syscache.h"
 
+#include "access/genam.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/syscache.h"
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 75f047f866..3d8e8920ee 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -21,13 +21,13 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "utils/builtins.h"
 
+#include "access/heapam.h"
 #include "catalog/catname.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
 #include "catalog/pg_statistic.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 /* N is not a valid var/constant or relation id */
 #define NONVALUE(N)		((N) == -1)
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 512fb04c5b..095af4a54b 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -19,9 +19,9 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "catalog/pg_proc.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_proc.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 3c67ab854e..4ad2ab3dea 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -3,9 +3,9 @@
 #include <time.h>
 #include <ctype.h>
 #include "postgres.h"
+#include "access/xact.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "access/xact.h"
 
 time_t
 timestamp_in(const char *timestamp_str)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index a9a3690c04..734229d903 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -13,10 +13,11 @@
  */
 #include <stdio.h>
 #include <string.h>
+
 #include "postgres.h"
 #include "access/htup.h"
-#include "utils/builtins.h"
 #include "catalog/pg_type.h"
+#include "utils/builtins.h"
 
 #ifdef CYR_RECODE
 char	   *convertstr(char *, int, int);
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 544c351bc3..ce4e644efa 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -15,9 +15,9 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "utils/builtins.h"
 
 #include "mb/pg_wchar.h"
+#include "utils/builtins.h"
 
 static int	text_cmp(text *arg1, text *arg2);
 
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 0348d1403f..2f03644a22 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -13,13 +13,13 @@
  */
 #include <string.h>
 #include "postgres.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/builtins.h"
-#include "utils/catcache.h"
+#include "access/heapam.h"
 #include "access/valid.h"
-#include "miscadmin.h"
 #include "catalog/pg_type.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
 
 static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
 static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 53f926c766..27fa32d6a3 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -12,19 +12,19 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
 
-
-#include "utils/syscache.h"
-#include "catalog/pg_type.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
 #include "parser/parsetree.h"
 #include "utils/builtins.h"
 #include "utils/fcache2.h"
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
+#include "utils/syscache.h"
 
 static Oid	GetDynamicFuncArgType(Var *arg, ExprContext *econtext);
 static FunctionCachePtr init_fcache(Oid foid,
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 4f65e84cf6..249ca3b535 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -15,15 +15,14 @@
  */
 #include "postgres.h"
 
-#include "miscadmin.h"
-
 #include "catalog/catalog.h"
+#include "catalog/catname.h"
 #include "catalog/heap.h"
+#include "miscadmin.h"
 #include "storage/sinval.h"
 #include "utils/catcache.h"
 #include "utils/inval.h"
 #include "utils/relcache.h"
-#include "catalog/catname.h"
 
 static InvalidationEntry InvalidationEntryAllocate(uint16 size);
 static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());