Make the order of the header file includes consistent

Similar to commit 7e735035f2.

Author: Richard Guo <guofenglinux@gmail.com>
Reviewed-by: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAMbWs4-WhpCFMbXCjtJ%2BFzmjfPrp7Hw1pk4p%2BZpU95Kh3ofZ1A%40mail.gmail.com

src/backend/utils/activity/pgstat_database.c

@@ -17,9 +17,9 @@
 
 #include "postgres.h"
 
+#include "storage/procsignal.h"
 #include "utils/pgstat_internal.h"
 #include "utils/timestamp.h"
-#include "storage/procsignal.h"
 
 
 static bool pgstat_should_report_connstat(void);

src/backend/utils/activity/pgstat_relation.c

@@ -19,12 +19,12 @@
 
 #include "access/twophase_rmgr.h"
 #include "access/xact.h"
+#include "catalog/catalog.h"
 #include "postmaster/autovacuum.h"
 #include "utils/memutils.h"
 #include "utils/pgstat_internal.h"
 #include "utils/rel.h"
 #include "utils/timestamp.h"
-#include "catalog/catalog.h"
 
 
 /* Record that's written to 2PC state file when pgstat state is persisted */

src/backend/utils/activity/pgstat_wal.c

@@ -17,8 +17,8 @@
 
 #include "postgres.h"
 
-#include "utils/pgstat_internal.h"
 #include "executor/instrument.h"
+#include "utils/pgstat_internal.h"
 
 
 PgStat_PendingWalStats PendingWalStats = {0};

src/backend/utils/adt/array_userfuncs.c

@@ -13,13 +13,13 @@
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
-#include "libpq/pqformat.h"
 #include "common/int.h"
 #include "common/pg_prng.h"
+#include "libpq/pqformat.h"
 #include "port/pg_bitutils.h"
 #include "utils/array.h"
-#include "utils/datum.h"
 #include "utils/builtins.h"
+#include "utils/datum.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
 

src/backend/utils/adt/jsonbsubs.c

@@ -19,8 +19,8 @@
 #include "nodes/subscripting.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
-#include "utils/jsonb.h"
 #include "utils/builtins.h"
+#include "utils/jsonb.h"
 
 
 /* SubscriptingRefState.workspace for jsonb subscripting execution */

src/backend/utils/adt/jsonpath.c

@@ -65,8 +65,8 @@
 
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
-#include "nodes/miscnodes.h"
 #include "miscadmin.h"
+#include "nodes/miscnodes.h"
 #include "utils/fmgrprotos.h"
 #include "utils/json.h"
 #include "utils/jsonpath.h"

src/backend/utils/adt/multirangetypes.c

@@ -39,11 +39,11 @@
 #include "libpq/pqformat.h"
 #include "nodes/nodes.h"
 #include "port/pg_bitutils.h"
+#include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
-#include "utils/rangetypes.h"
 #include "utils/multirangetypes.h"
-#include "utils/array.h"
+#include "utils/rangetypes.h"
 
 /* fn_extra cache entry for one of the range I/O functions */
 typedef struct MultirangeIOData

src/backend/utils/adt/multirangetypes_selfuncs.c

@@ -25,8 +25,8 @@
 #include "utils/float.h"
 #include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/rangetypes.h"
 #include "utils/multirangetypes.h"
+#include "utils/rangetypes.h"
 #include "utils/selfuncs.h"
 #include "utils/typcache.h"
 

src/backend/utils/adt/numutils.c

@@ -18,8 +18,8 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include "utils/builtins.h"
 #include "port/pg_bitutils.h"
+#include "utils/builtins.h"
 
 /*
  * A table of all two-digit numbers. This is used to speed up decimal digit

src/backend/utils/adt/rangetypes_typanalyze.c

@@ -29,8 +29,8 @@
 #include "utils/float.h"
 #include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/rangetypes.h"
 #include "utils/multirangetypes.h"
+#include "utils/rangetypes.h"
 #include "varatt.h"
 
 static int	float8_qsort_cmp(const void *a1, const void *a2, void *arg);

src/backend/utils/error/elog.c

@@ -70,8 +70,8 @@
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
-#include "nodes/miscnodes.h"
 #include "miscadmin.h"
+#include "nodes/miscnodes.h"
 #include "pgstat.h"
 #include "postmaster/bgworker.h"
 #include "postmaster/postmaster.h"

src/backend/utils/mb/stringinfo_mb.c

@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "mb/stringinfo_mb.h"
 #include "mb/pg_wchar.h"
+#include "mb/stringinfo_mb.h"
 
 
 /*

src/backend/utils/misc/guc_tables.c

@@ -82,11 +82,11 @@
 #include "utils/float.h"
 #include "utils/guc_hooks.h"
 #include "utils/guc_tables.h"
+#include "utils/inval.h"
 #include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/plancache.h"
 #include "utils/ps_status.h"
-#include "utils/inval.h"
 #include "utils/xml.h"
 
 /* This value is normally passed in from the Makefile */

src/backend/utils/misc/tzparser.c

@@ -26,10 +26,10 @@
 
 #include "miscadmin.h"
 #include "storage/fd.h"
+#include "utils/datetime.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
 #include "utils/tzparser.h"
-#include "utils/datetime.h"
 
 
 #define WHITESPACE " \t\n\r"

src/backend/utils/mmgr/aset.c

@@ -49,8 +49,8 @@
 #include "port/pg_bitutils.h"
 #include "utils/memdebug.h"
 #include "utils/memutils.h"
-#include "utils/memutils_memorychunk.h"
 #include "utils/memutils_internal.h"
+#include "utils/memutils_memorychunk.h"
 
 /*--------------------
  * Chunk freelist k holds chunks of size 1 << (k + ALLOC_MINBITS),

src/backend/utils/mmgr/generation.c

@@ -39,8 +39,8 @@
 #include "port/pg_bitutils.h"
 #include "utils/memdebug.h"
 #include "utils/memutils.h"
-#include "utils/memutils_memorychunk.h"
 #include "utils/memutils_internal.h"
+#include "utils/memutils_memorychunk.h"
 
 
 #define Generation_BLOCKHDRSZ	MAXALIGN(sizeof(GenerationBlock))

src/backend/utils/mmgr/slab.c

@@ -71,8 +71,8 @@
 #include "lib/ilist.h"
 #include "utils/memdebug.h"
 #include "utils/memutils.h"
-#include "utils/memutils_memorychunk.h"
 #include "utils/memutils_internal.h"
+#include "utils/memutils_memorychunk.h"
 
 #define Slab_BLOCKHDRSZ	MAXALIGN(sizeof(SlabBlock))
 

src/backend/utils/sort/tuplesortvariants.c

@@ -27,8 +27,8 @@
 #include "executor/executor.h"
 #include "pg_trace.h"
 #include "utils/datum.h"
-#include "utils/lsyscache.h"
 #include "utils/guc.h"
+#include "utils/lsyscache.h"
 #include "utils/tuplesort.h"