Make the order of the header file includes consistent.

Similar to commits 14aec03502, 7e735035f2 and dddf4cdc33, this commit
makes the order of header file inclusion consistent in more places.

Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

36 files changed, 38 insertions, 57 deletions

diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 4e45552b3f2..b779cc8c7ca 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -16,8 +16,8 @@
 #include "access/itup.h"
 #include "catalog/pg_am_d.h"
 #include "fmgr.h"
-#include "storage/bufmgr.h"
 #include "lib/rbtree.h"
+#include "storage/bufmgr.h"
 
 /*
  * Storage type for GIN's reloptions
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index dbaabcc073d..ad6da6d71b1 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -15,9 +15,8 @@
 #define HIO_H
 
 #include "access/htup.h"
-#include "utils/relcache.h"
 #include "storage/buf.h"
-
+#include "utils/relcache.h"
 
 /*
  * state for bulk inserts --- private to heapam.c and hio.c
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
index 66d61fd5700..7e947190e11 100644
--- a/src/include/access/htup_details.h
+++ b/src/include/access/htup_details.h
@@ -15,9 +15,9 @@
 #define HTUP_DETAILS_H
 
 #include "access/htup.h"
+#include "access/transam.h"
 #include "access/tupdesc.h"
 #include "access/tupmacs.h"
-#include "access/transam.h"
 #include "storage/bufpage.h"
 
 /*
diff --git a/src/include/access/relation.h b/src/include/access/relation.h
index 38acaa5a2e9..0a1de3597e2 100644
--- a/src/include/access/relation.h
+++ b/src/include/access/relation.h
@@ -15,9 +15,8 @@
 #define ACCESS_RELATION_H
 
 #include "nodes/primnodes.h"
-#include "utils/relcache.h"
 #include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
 
 extern Relation relation_open(Oid relationId, LOCKMODE lockmode);
 extern Relation try_relation_open(Oid relationId, LOCKMODE lockmode);
diff --git a/src/include/access/table.h b/src/include/access/table.h
index cb9b43881b5..071b25493e1 100644
--- a/src/include/access/table.h
+++ b/src/include/access/table.h
@@ -15,9 +15,8 @@
 #define TABLE_H
 
 #include "nodes/primnodes.h"
-#include "utils/relcache.h"
 #include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
 
 extern Relation table_open(Oid relationId, LOCKMODE lockmode);
 extern Relation table_openrv(const RangeVar *relation, LOCKMODE lockmode);
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 1093085a242..02b5315c432 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -14,8 +14,8 @@
 #ifndef TWOPHASE_H
 #define TWOPHASE_H
 
-#include "access/xlogdefs.h"
 #include "access/xact.h"
+#include "access/xlogdefs.h"
 #include "datatype/timestamp.h"
 #include "storage/lock.h"
 
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index c1e60c7dfd2..cbb5d9ab6d4 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -18,10 +18,9 @@
 #ifndef PG_CONSTRAINT_H
 #define PG_CONSTRAINT_H
 
+#include "catalog/dependency.h"
 #include "catalog/genbki.h"
 #include "catalog/pg_constraint_d.h"
-
-#include "catalog/dependency.h"
 #include "nodes/pg_list.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 49c70700ab7..fc523c23268 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -18,9 +18,8 @@
 #define PG_CONVERSION_H
 
 #include "catalog/genbki.h"
-#include "catalog/pg_conversion_d.h"
-
 #include "catalog/objectaddress.h"
+#include "catalog/pg_conversion_d.h"
 
 /* ----------------
  *		pg_conversion definition.  cpp turns this into
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 7c4f6862a86..3157fc574b8 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -19,9 +19,8 @@
 #define PG_OPERATOR_H
 
 #include "catalog/genbki.h"
-#include "catalog/pg_operator_d.h"
-
 #include "catalog/objectaddress.h"
+#include "catalog/pg_operator_d.h"
 #include "nodes/pg_list.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index dc29c06f628..e6c190926e0 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -18,9 +18,8 @@
 #define PG_PROC_H
 
 #include "catalog/genbki.h"
-#include "catalog/pg_proc_d.h"
-
 #include "catalog/objectaddress.h"
+#include "catalog/pg_proc_d.h"
 #include "nodes/pg_list.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 20a2f0ac1bf..ea22aa6563d 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -18,9 +18,8 @@
 #define PG_PUBLICATION_H
 
 #include "catalog/genbki.h"
-#include "catalog/pg_publication_d.h"
-
 #include "catalog/objectaddress.h"
+#include "catalog/pg_publication_d.h"
 
 /* ----------------
  *		pg_publication definition.  cpp turns this into
diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index b7685847980..613d07e6cf6 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -18,11 +18,10 @@
 #ifndef PG_REPLICATION_ORIGIN_H
 #define PG_REPLICATION_ORIGIN_H
 
+#include "access/xlogdefs.h"
 #include "catalog/genbki.h"
 #include "catalog/pg_replication_origin_d.h"
 
-#include "access/xlogdefs.h"
-
 /* ----------------
  *		pg_replication_origin.  cpp turns this into
  *		typedef struct FormData_pg_replication_origin
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index f7df814a181..21b4ac2b9a6 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -18,10 +18,9 @@
 #ifndef PG_SUBSCRIPTION_REL_H
 #define PG_SUBSCRIPTION_REL_H
 
+#include "access/xlogdefs.h"
 #include "catalog/genbki.h"
 #include "catalog/pg_subscription_rel_d.h"
-
-#include "access/xlogdefs.h"
 #include "nodes/pg_list.h"
 
 /* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 2a584b4b130..0c273a0449d 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -19,9 +19,8 @@
 #define PG_TYPE_H
 
 #include "catalog/genbki.h"
-#include "catalog/pg_type_d.h"
-
 #include "catalog/objectaddress.h"
+#include "catalog/pg_type_d.h"
 #include "nodes/nodes.h"
 
 /* ----------------
diff --git a/src/include/commands/event_trigger.h b/src/include/commands/event_trigger.h
index 575e9243e51..6eeb7208fa6 100644
--- a/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@ -17,8 +17,8 @@
 #include "catalog/objectaddress.h"
 #include "catalog/pg_event_trigger.h"
 #include "nodes/parsenodes.h"
-#include "utils/aclchk_internal.h"
 #include "tcop/deparse_utility.h"
+#include "utils/aclchk_internal.h"
 
 typedef struct EventTriggerData
 {
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index 112def153cb..2c31d6fdcb9 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -14,8 +14,8 @@
 #ifndef NODEBITMAPHEAPSCAN_H
 #define NODEBITMAPHEAPSCAN_H
 
-#include "nodes/execnodes.h"
 #include "access/parallel.h"
+#include "nodes/execnodes.h"
 
 extern BitmapHeapScanState *ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags);
 extern void ExecEndBitmapHeapScan(BitmapHeapScanState *node);
diff --git a/src/include/executor/nodeIndexonlyscan.h b/src/include/executor/nodeIndexonlyscan.h
index 644166b5bcb..d85cd12e180 100644
--- a/src/include/executor/nodeIndexonlyscan.h
+++ b/src/include/executor/nodeIndexonlyscan.h
@@ -14,8 +14,8 @@
 #ifndef NODEINDEXONLYSCAN_H
 #define NODEINDEXONLYSCAN_H
 
-#include "nodes/execnodes.h"
 #include "access/parallel.h"
+#include "nodes/execnodes.h"
 
 extern IndexOnlyScanState *ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags);
 extern void ExecEndIndexOnlyScan(IndexOnlyScanState *node);
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index b7f977233be..04feaba55d9 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -15,9 +15,9 @@
 #define TUPTABLE_H
 
 #include "access/htup.h"
+#include "access/htup_details.h"
 #include "access/sysattr.h"
 #include "access/tupdesc.h"
-#include "access/htup_details.h"
 #include "storage/buf.h"
 
 /*----------
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 1a88b520877..1aa1f4d8a44 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -17,11 +17,10 @@
 #ifndef FUNCAPI_H
 #define FUNCAPI_H
 
-#include "fmgr.h"
 #include "access/tupdesc.h"
 #include "executor/executor.h"
 #include "executor/tuptable.h"
-
+#include "fmgr.h"
 
 /*-------------------------------------------------------------------------
  *	Support to ease writing Functions returning composite types
diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h
index 6178864b2e6..8b441dfdcda 100644
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -30,12 +30,10 @@ extern "C"
 {
 #endif
 
-
+#include "access/tupdesc.h"
 #include "fmgr.h"
 #include "jit/jit.h"
 #include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
 
 typedef struct LLVMJitContext
 {
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 44f76082e99..6eb647290be 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -20,18 +20,17 @@
 #include "lib/pairingheap.h"
 #include "nodes/params.h"
 #include "nodes/plannodes.h"
+#include "nodes/tidbitmap.h"
 #include "partitioning/partdefs.h"
+#include "storage/condition_variable.h"
 #include "utils/hsearch.h"
 #include "utils/queryenvironment.h"
 #include "utils/reltrigger.h"
 #include "utils/sharedtuplestore.h"
 #include "utils/snapshot.h"
 #include "utils/sortsupport.h"
-#include "utils/tuplestore.h"
 #include "utils/tuplesort.h"
-#include "nodes/tidbitmap.h"
-#include "storage/condition_variable.h"
-
+#include "utils/tuplestore.h"
 
 struct PlanState;				/* forward references in this file */
 struct PartitionRoutingInfo;
diff --git a/src/include/replication/decode.h b/src/include/replication/decode.h
index 89689a010b2..3f877244e1a 100644
--- a/src/include/replication/decode.h
+++ b/src/include/replication/decode.h
@@ -11,8 +11,8 @@
 
 #include "access/xlogreader.h"
 #include "access/xlogrecord.h"
-#include "replication/reorderbuffer.h"
 #include "replication/logical.h"
+#include "replication/reorderbuffer.h"
 
 void		LogicalDecodingProcessRecord(LogicalDecodingContext *ctx,
 										 XLogReaderState *record);
diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index 31c796b7651..6879a2e6d29 100644
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -9,11 +9,10 @@
 #ifndef LOGICAL_H
 #define LOGICAL_H
 
-#include "replication/slot.h"
-
 #include "access/xlog.h"
 #include "access/xlogreader.h"
 #include "replication/output_plugin.h"
+#include "replication/slot.h"
 
 struct LogicalDecodingContext;
 
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
index e12a9349660..41714eaf0ce 100644
--- a/src/include/replication/walreceiver.h
+++ b/src/include/replication/walreceiver.h
@@ -15,11 +15,11 @@
 #include "access/xlog.h"
 #include "access/xlogdefs.h"
 #include "getaddrinfo.h"		/* for NI_MAXHOST */
+#include "pgtime.h"
 #include "replication/logicalproto.h"
 #include "replication/walsender.h"
 #include "storage/latch.h"
 #include "storage/spin.h"
-#include "pgtime.h"
 #include "utils/tuplestore.h"
 
 /* user-settable parameters */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index 77b2ffa9621..76fde0b89ce 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -14,8 +14,8 @@
 #ifndef REWRITEHANDLER_H
 #define REWRITEHANDLER_H
 
-#include "utils/relcache.h"
 #include "nodes/parsenodes.h"
+#include "utils/relcache.h"
 
 extern List *QueryRewrite(Query *parsetree);
 extern void AcquireRewriteLocks(Query *parsetree,
diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h
index fcf4e8ae0b3..8ff1ef3edbf 100644
--- a/src/include/statistics/extended_stats_internal.h
+++ b/src/include/statistics/extended_stats_internal.h
@@ -14,9 +14,8 @@
 #ifndef EXTENDED_STATS_INTERNAL_H
 #define EXTENDED_STATS_INTERNAL_H
 
-#include "utils/sortsupport.h"
 #include "statistics/statistics.h"
-
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 6ffe184476d..d540c0aaff3 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -15,17 +15,16 @@
 #ifndef BUFMGR_INTERNALS_H
 #define BUFMGR_INTERNALS_H
 
+#include "port/atomics.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 #include "storage/latch.h"
 #include "storage/lwlock.h"
 #include "storage/shmem.h"
 #include "storage/smgr.h"
-#include "port/atomics.h"
 #include "storage/spin.h"
 #include "utils/relcache.h"
 
-
 /*
  * Buffer state is a single 32-bit variable where following data is combined.
  *
diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index ee06e051ce1..0aad8cce72d 100644
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -22,8 +22,8 @@
 #ifndef CONDITION_VARIABLE_H
 #define CONDITION_VARIABLE_H
 
-#include "storage/s_lock.h"
 #include "storage/proclist_types.h"
+#include "storage/s_lock.h"
 
 typedef struct
 {
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 6efb7a96481..e8b50fe0949 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -18,12 +18,11 @@
 #error "lock.h may not be included from frontend code"
 #endif
 
-#include "storage/lockdefs.h"
 #include "storage/backendid.h"
+#include "storage/lockdefs.h"
 #include "storage/lwlock.h"
 #include "storage/shmem.h"
 
-
 /* struct PGPROC is declared in proc.h, but must forward-reference it */
 typedef struct PGPROC PGPROC;
 
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index f627dfedc5c..f9450dac902 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -18,9 +18,9 @@
 #error "lwlock.h may not be included from frontend code"
 #endif
 
+#include "port/atomics.h"
 #include "storage/proclist_types.h"
 #include "storage/s_lock.h"
-#include "port/atomics.h"
 
 struct PGPROC;
 
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index a3f8f82ff32..6ba90c6406d 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -14,10 +14,10 @@
 #ifndef STANDBY_H
 #define STANDBY_H
 
-#include "storage/standbydefs.h"
 #include "storage/lock.h"
 #include "storage/procsignal.h"
 #include "storage/relfilenode.h"
+#include "storage/standbydefs.h"
 
 /* User-settable GUC parameters */
 extern int	vacuum_defer_cleanup_age;
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index 9e8cd77245b..b7db7b28641 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -15,8 +15,8 @@
 #include <ctype.h>
 #include <limits.h>
 
-#include "utils/pg_locale.h"
 #include "mb/pg_wchar.h"
+#include "utils/pg_locale.h"
 
 /*
  * towlower() and friends should be in <wctype.h>, but some pre-C99 systems
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 7352b1f4fec..6015983010f 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -16,9 +16,9 @@
 
 #include <math.h>
 
+#include "datatype/timestamp.h"
 #include "fmgr.h"
 #include "pgtime.h"
-#include "datatype/timestamp.h"
 
 typedef int32 DateADT;
 
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 0f2b08efe6e..9af9ffd2968 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -15,8 +15,8 @@
 #define JSONPATH_H
 
 #include "fmgr.h"
-#include "utils/jsonb.h"
 #include "nodes/pg_list.h"
+#include "utils/jsonb.h"
 
 typedef struct
 {
diff --git a/src/include/utils/pg_lsn.h b/src/include/utils/pg_lsn.h
index 70d8640ef3e..8b371c5bc81 100644
--- a/src/include/utils/pg_lsn.h
+++ b/src/include/utils/pg_lsn.h
@@ -15,8 +15,8 @@
 #ifndef PG_LSN_H
 #define PG_LSN_H
 
-#include "fmgr.h"
 #include "access/xlogdefs.h"
+#include "fmgr.h"
 
 #define DatumGetLSN(X) ((XLogRecPtr) DatumGetInt64(X))
 #define LSNGetDatum(X) (Int64GetDatum((int64) (X)))
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
index 90d08b1fcf2..69e9a9c0e24 100644
--- a/src/include/utils/xml.h
+++ b/src/include/utils/xml.h
@@ -15,10 +15,10 @@
 #ifndef XML_H
 #define XML_H
 
+#include "executor/tablefunc.h"
 #include "fmgr.h"
 #include "nodes/execnodes.h"
 #include "nodes/primnodes.h"
-#include "executor/tablefunc.h"
 
 typedef struct varlena xmltype;