Make the order of the header file includes consistent.

Similar to commits 14aec03, 7e73503 and dddf4cd, 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

Author: Amit Kapila

contrib/bloom/bloom.h

@@ -17,8 +17,8 @@
 #include "access/generic_xlog.h"
 #include "access/itup.h"
 #include "access/xlog.h"
-#include "nodes/pathnodes.h"
 #include "fmgr.h"
+#include "nodes/pathnodes.h"
 
 /* Support procedures numbers */
 #define BLOOM_HASH_PROC			1

contrib/btree_gist/btree_gist.h

@@ -4,8 +4,8 @@
 #ifndef __BTREE_GIST_H__
 #define __BTREE_GIST_H__
 
-#include "fmgr.h"
 #include "access/nbtree.h"
+#include "fmgr.h"
 
 #define BtreeGistNotEqualStrategyNumber 6
 

contrib/btree_gist/btree_utils_num.h

@@ -4,13 +4,13 @@
 #ifndef __BTREE_UTILS_NUM_H__
 #define __BTREE_UTILS_NUM_H__
 
-#include "btree_gist.h"
-#include "access/gist.h"
-#include "utils/rel.h"
-
 #include <math.h>
 #include <float.h>
 
+#include "access/gist.h"
+#include "btree_gist.h"
+#include "utils/rel.h"
+
 typedef char GBT_NUMKEY;
 
 /* Better readable key */

contrib/btree_gist/btree_utils_var.h

@@ -4,9 +4,8 @@
 #ifndef __BTREE_UTILS_VAR_H__
 #define __BTREE_UTILS_VAR_H__
 
-#include "btree_gist.h"
-
 #include "access/gist.h"
+#include "btree_gist.h"
 #include "mb/pg_wchar.h"
 
 /* Variable length key */

contrib/postgres_fdw/postgres_fdw.h

@@ -15,11 +15,10 @@
 
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
+#include "libpq-fe.h"
 #include "nodes/pathnodes.h"
 #include "utils/relcache.h"
 
-#include "libpq-fe.h"
-
 /*
  * FDW-specific planner information kept in RelOptInfo.fdw_private for a
  * postgres_fdw foreign table.  For a baserel, this struct is created by

src/backend/libpq/auth.c

@@ -39,7 +39,6 @@
 #include "utils/memutils.h"
 #include "utils/timestamp.h"
 
-
 /*----------------------------------------------------------------
  * Global authentication functions
  *----------------------------------------------------------------

src/bin/pg_basebackup/receivelog.h

@@ -12,11 +12,10 @@
 #ifndef RECEIVELOG_H
 #define RECEIVELOG_H
 
+#include "access/xlogdefs.h"
 #include "libpq-fe.h"
 #include "walmethods.h"
 
-#include "access/xlogdefs.h"
-
 /*
  * Called before trying to read more data or when a segment is
  * finished. Return true to stop streaming.

src/bin/pg_basebackup/streamutil.h

@@ -12,10 +12,9 @@
 #ifndef STREAMUTIL_H
 #define STREAMUTIL_H
 
-#include "libpq-fe.h"
-
 #include "access/xlogdefs.h"
 #include "datatype/timestamp.h"
+#include "libpq-fe.h"
 
 extern const char *progname;
 extern char *connection_string;

src/bin/pg_dump/pg_backup_archiver.h

@@ -24,12 +24,10 @@
 #ifndef __PG_BACKUP_ARCHIVE__
 #define __PG_BACKUP_ARCHIVE__
 
-
 #include <time.h>
 
-#include "pg_backup.h"
-
 #include "libpq-fe.h"
+#include "pg_backup.h"
 #include "pqexpbuffer.h"
 
 #define LOBBUFSIZE 16384

src/bin/pg_rewind/datapagemap.h

@@ -9,9 +9,8 @@
 #ifndef DATAPAGEMAP_H
 #define DATAPAGEMAP_H
 
-#include "storage/relfilenode.h"
 #include "storage/block.h"
-
+#include "storage/relfilenode.h"
 
 struct datapagemap
 {