diff --git a/contrib/btree_gist/btree_bool.c b/contrib/btree_gist/btree_bool.c
index 8282055ebca..344f059c78f 100644
--- a/contrib/btree_gist/btree_bool.c
+++ b/contrib/btree_gist/btree_bool.c
@@ -5,8 +5,8 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct boolkey
 {
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index 8228d2871e9..282d5c5731f 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "common/int.h"
 #include "utils/cash.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index da248a29aaa..1f1a3f32b56 100644
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "utils/fmgrprotos.h"
 #include "utils/date.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 23253770ea1..46e6f88a3dc 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -8,8 +8,8 @@
 #include "fmgr.h"
 #include "utils/fmgrprotos.h"
 #include "utils/fmgroids.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 /* enums are really Oids, so we just use the same structure */
 
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index 21eccf1a9ab..d9c859835da 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/float.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct float4key
 {
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index 8e7c78877e7..567beede178 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/float.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct float8key
 {
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 460ef6e4a7d..52bf3e2446e 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct inetkey
 {
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index d9529f760a0..faf456997bb 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "common/int.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct int16key
 {
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 9e2e67a0c28..0bdb9e58c56 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -5,8 +5,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "common/int.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct int32key
 {
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index ac710f96677..a9a7b569278 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "common/int.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct int64key
 {
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 61d25b10214..19eefc60cde 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/fmgrprotos.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 #include "utils/timestamp.h"
 
 typedef struct
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index 5fac3b66fda..c444a709853 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "utils/fmgrprotos.h"
 #include "utils/inet.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_macaddr8.c b/contrib/btree_gist/btree_macaddr8.c
index dd49f377db5..6d9837d90a3 100644
--- a/contrib/btree_gist/btree_macaddr8.c
+++ b/contrib/btree_gist/btree_macaddr8.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "utils/fmgrprotos.h"
 #include "utils/inet.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index 41fb3872819..b8f2f661076 100644
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -5,8 +5,8 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index 49c2cae522b..a152402d194 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -7,8 +7,8 @@
 #include "btree_utils_num.h"
 #include "utils/fmgrprotos.h"
 #include "utils/date.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 #include "utils/timestamp.h"
 
 typedef struct
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 7173124d574..287013491ad 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -10,8 +10,8 @@
 #include "utils/fmgrprotos.h"
 #include "utils/timestamp.h"
 #include "utils/float.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c
index 873d77dd8f5..07f304f39f1 100644
--- a/contrib/btree_gist/btree_uuid.c
+++ b/contrib/btree_gist/btree_uuid.c
@@ -6,8 +6,8 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "port/pg_bswap.h"
-#include "utils/sortsupport.h"
 #include "utils/rel.h"
+#include "utils/sortsupport.h"
 #include "utils/uuid.h"
 
 typedef struct