Make the order of the header file includes consistent in contrib modules.

The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes.  In this, we also follow that all the
Postgres header includes are in order based on their ASCII value.  We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent just for contrib modules.  The later
commits will enforce similar rules in other parts of code.

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

contrib/pgcrypto/crypt-md5.c

@@ -8,8 +8,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
+#include "px.h"
 
 #define MD5_SIZE 16
 

contrib/pgcrypto/internal.c

@@ -33,11 +33,11 @@
 
 #include <time.h>
 
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
 #include "blf.h"
+#include "md5.h"
+#include "px.h"
 #include "rijndael.h"
+#include "sha1.h"
 
 #ifndef MD5_DIGEST_LENGTH
 #define MD5_DIGEST_LENGTH 16

contrib/pgcrypto/mbuf.c

@@ -31,8 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "mbuf.h"
+#include "px.h"
 
 #define STEP  (16*1024)
 

contrib/pgcrypto/openssl.c

@@ -31,12 +31,11 @@
 
 #include "postgres.h"
 
-#include "px.h"
-
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
+#include "px.h"
 #include "utils/memutils.h"
 #include "utils/resowner.h"
 

contrib/pgcrypto/pgcrypto.c

@@ -34,13 +34,12 @@
 #include <ctype.h>
 
 #include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
 #include "utils/builtins.h"
 #include "utils/uuid.h"
 
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
 PG_MODULE_MAGIC;
 
 /* private stuff */

contrib/pgcrypto/pgp-armor.c

@@ -31,8 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 /*
  * BASE64 - duplicated :(

contrib/pgcrypto/pgp-cfb.c

@@ -31,8 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
 

contrib/pgcrypto/pgp-compress.c

@@ -31,9 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
-
+#include "px.h"
 
 /*
  * Compressed pkt writer

contrib/pgcrypto/pgp-decrypt.c

@@ -31,9 +31,9 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "mbuf.h"
 #include "pgp.h"
+#include "px.h"
 
 #define NO_CTX_SIZE		0
 #define ALLOW_CTX_SIZE	1

contrib/pgcrypto/pgp-encrypt.c

@@ -34,9 +34,8 @@
 #include <time.h>
 
 #include "mbuf.h"
-#include "px.h"
 #include "pgp.h"
-
+#include "px.h"
 
 #define MDC_DIGEST_LEN 20
 #define STREAM_ID 0xE0

contrib/pgcrypto/pgp-info.c

@@ -30,9 +30,9 @@
  */
 #include "postgres.h"
 
-#include "px.h"
 #include "mbuf.h"
 #include "pgp.h"
+#include "px.h"
 
 static int
 read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)

contrib/pgcrypto/pgp-mpi-internal.c

@@ -31,9 +31,8 @@
 #include "postgres.h"
 
 #include "imath.h"
-
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 static mpz_t *
 mp_new()

contrib/pgcrypto/pgp-mpi-openssl.c

@@ -32,8 +32,8 @@
 
 #include <openssl/bn.h>
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 static BIGNUM *
 mpi_to_bn(PGP_MPI *n)

contrib/pgcrypto/pgp-mpi.c

@@ -30,8 +30,8 @@
  */
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 int
 pgp_mpi_alloc(int bits, PGP_MPI **mpi)

contrib/pgcrypto/pgp-pgsql.c

@@ -31,16 +31,15 @@
 
 #include "postgres.h"
 
-#include "lib/stringinfo.h"
 #include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
 #include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
 #include "mbuf.h"
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
 
 /*
  * public functions

contrib/pgcrypto/pgp-pubdec.c

@@ -30,8 +30,8 @@
  */
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 /*
  * padded msg = 02 || PS || 00 || M

contrib/pgcrypto/pgp-pubenc.c

@@ -30,8 +30,8 @@
  */
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 /*
  * padded msg: 02 || non-zero pad bytes || 00 || msg

contrib/pgcrypto/pgp-pubkey.c

@@ -30,9 +30,9 @@
  */
 #include "postgres.h"
 
-#include "px.h"
 #include "mbuf.h"
 #include "pgp.h"
+#include "px.h"
 
 int
 pgp_key_alloc(PGP_PubKey **pk_p)

contrib/pgcrypto/pgp-s2k.c

@@ -31,9 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
-
+#include "px.h"
 
 static int
 calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,

contrib/pgcrypto/pgp.c

@@ -31,8 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "pgp.h"
+#include "px.h"
 
 /*
  * Defaults.

contrib/pgcrypto/px-crypt.c

@@ -31,9 +31,8 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
-
+#include "px.h"
 
 static char *
 run_crypt_des(const char *psw, const char *salt,