diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 8675d2488de0f0667cca983fd5fbbb0358e6aeb9..5c0d198b09049e579d8016c0675496717a0c4d8b 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_bit.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/bytea.h"
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c
index e45509d15caadd07b4215d3f22a1fecebac0522e..0dd441964a637834f9edce824653ec1bfd070c90 100644
--- a/contrib/btree_gist/btree_bytea.c
+++ b/contrib/btree_gist/btree_bytea.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_bytea.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/bytea.h"
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index 2664a2687057d4b001839043480c204952dcb43e..f22e1bff92982e4736a433c5f33a53dd735249be 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_cash.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/cash.h"
diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index 8a675e2f1d884a5e0625c3f00f3ea4715622ba54..d6b989a177b3821ae14cbeb39220e39b4a8beecf 100644
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_date.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/date.h"
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index 266256b23cf973cdaebec5b5160164baca5b66a0..e3f2155d5935225f495eacf70e2d5d01f7998020 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_float4.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index efbee0f3e4b66531310bb6f98a8eec991f2954b3..0fbebeea077b0df72ab758054d27f8d5a10ebcf9 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_float8.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index 7e1c7e054cddf6c4f0e413052c1650e765702902..f2d2ed2cb28b34d18551c8a2cee3c4f16fc1a8c7 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_gist.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 
 PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index 058a3f99e98b19de0041338bbf63495cc515468e..a661303977228c7ec6cab3ceea3e4d4ef08fa730 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -4,7 +4,6 @@
 #ifndef __BTREE_GIST_H__
 #define __BTREE_GIST_H__
 
-#include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
 #include "access/nbtree.h"
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 690a01cbc7a2b6c264608c8dab94398c1a828fa0..439e6c90a7c9906de62ed020b4935463879e5220 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_inet.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index 7841145b53f6e49da3d8f9e13918bd1358023f8f..3eb76b8be0697170c629f5e852d77df28eb1e88a 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_int2.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 0e4b4f85b0eb448ce004e2863b7b9cdc79c8b40d..9e1362cc2f312590cf15b1a5c760474f27de2305 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_int4.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index d54113d3936660a1b5ab5b5b8a5d700b71e09551..45f5379a3e0526c616fd9694841ca661478c23ab 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_int8.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 137a5fcd7f4e2e9487782b28d9a8b6ec46ecc506..b56494684f7348ba60f33c04c3db2e171ca260ea 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_interval.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/timestamp.h"
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index aa150e26a23d244c7b98a6d760da54c54ff33303..2a223361b8d96ccb0f37371a05a915bf50e9cab3 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_macaddr.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index e962c6dd32743e9638c9a2d3bb8d0383e80358c1..37938aff6aa068e7cf27b78d827dc0f3e385b818 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_numeric.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 
 #include <math.h>
diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index 3b0929b42bb0147a6dbcbb240d676df5a21fb83b..7b4de5726dca595b799dbeda880a06afdad94087 100644
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_oid.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 
diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c
index 3d4f8c13c8684e887d7e5f10652e085972903249..277820dc0a6b422ba4248b11ebeb4f6be8d493f3 100644
--- a/contrib/btree_gist/btree_text.c
+++ b/contrib/btree_gist/btree_text.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_text.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index e9cfe33f45594fbe5db9077dfe97ef4472f7b025..c7f37d42302d4631b0e87f5860f2d92fcc0d20d2 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_time.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/date.h"
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 9d3a5919a0ee078eb0be8c4097c4a01471ab396e..4badb80bd2fd8e71bb5be0e7db28e0cca289e764 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_ts.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index a3da5802df29aa9b825b4b7123e3f5f2ea484449..2b1252b78e20f13ca110bff2532a117a9ae13df2 100644
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_utils_num.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/cash.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index e73799bb21c430dad613a291729bc4c8c5d37d84..9f8a132775beda7a9cb4ac81be297a4064d27d73 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -1,6 +1,8 @@
 /*
  * contrib/btree_gist/btree_utils_var.c
  */
+#include "postgres.h"
+
 #include "btree_gist.h"
 
 #include <math.h>
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index c736defc73f2ddb420ea087b9bdc9f947ee2c019..ea1a661fefbbceaab5f3bf503a8ab68aab2dfeaa 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -2,6 +2,8 @@
 
 /* contrib/ltree/crc32.c */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 8e4ea4c1513ddf942c3f0f64803c862451270b03..aec445847f9a5730d70252e77b4d86a5693d4c62 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -3,7 +3,6 @@
 #ifndef __LTREE_H__
 #define __LTREE_H__
 
-#include "postgres.h"
 #include "fmgr.h"
 #include "tsearch/ts_locale.h"
 
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 528b674b4f0f080bf6dfa55133349faa4be0cc8d..9690695fce8c25ede119bf4fd08bfa4a107e285a 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/check.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 1c64f39aa309448fb35316e4af112bb535e42a91..788c690c2a656a1230bea74c67f071f6c9abca76 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/controldata.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include <ctype.h>
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
index a07ab12d8f43cedf794785a09fa0c99036d973f1..2af50bc8b5bcfde22585bfe85d6417fb1e9fe5c9 100644
--- a/contrib/pg_upgrade/dump.c
+++ b/contrib/pg_upgrade/dump.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/dump.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index 2f5e76da2dcc3b64e1285791aa3f71853ef6d50f..ff9b3171090b95773883ac1bb57d2b2221236f3c 100644
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/exec.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include <fcntl.h>
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index fe8978576769b714bef2f69583bbfb106f20d156..e5d1613182bd66a80bbf5e4a05c10f4c1c83350b 100644
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/file.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include <fcntl.h>
diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
index 53d562f3bd3c2c9518a3f0f0b2ab8b14474ebe17..0f8008951ab2f5fcacd61a94ed503b62e1e6d71b 100644
--- a/contrib/pg_upgrade/function.c
+++ b/contrib/pg_upgrade/function.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/function.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "access/transam.h"
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 10188ca0f5e60cab047be3681a57d75a0ebcbfcb..5606486ef366079087bc8d866afa53be4a6e0075 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/info.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "access/transam.h"
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index 32bd3b896e22dd87d9b85a7494a3ae53c2316256..bdb7ddb85900bf7aa047bd38b9ddc76c062e490a 100644
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/option.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "getopt_long.h"
diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c
index d9e9f694d83aeb9a5fd138f9817ffb1a662f2ddd..c8f57745a5f30235536921da046c22380e435e49 100644
--- a/contrib/pg_upgrade/page.c
+++ b/contrib/pg_upgrade/page.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/page.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "storage/bufpage.h"
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 4912f7727f6568bdcb3ee0898137a476d5bba331..0568acafb25ded881a0bf52e90bc2756b7f115f8 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -35,6 +35,8 @@
 
 
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #ifdef HAVE_LANGINFO_H
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index a19b3df4393016e761ceab9b6b891593812c1109..feea324bd50b0471896e9dea264df0935d89b7da 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -5,8 +5,6 @@
  *	contrib/pg_upgrade/pg_upgrade.h
  */
 
-#include "postgres.h"
-
 #include <unistd.h>
 #include <assert.h>
 #include <dirent.h>
diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index df752c5fad0ea33633e078ab648b26755255ab26..9354d92d36cdbe4df310e1f293597ec8b29c329f 100644
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/relfilenode.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "catalog/pg_class.h"
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index 17231da790e388e755beccf741ce656bc3d0ebaa..f256e7f26e85e579743ac744130369bf991880e0 100644
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/server.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 
diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c
index 6cdae51cf1904b419058d57373cc50fdda855d06..08d227c10a011f9e2233e917759bf2fe197de6f6 100644
--- a/contrib/pg_upgrade/tablespace.c
+++ b/contrib/pg_upgrade/tablespace.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/tablespace.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 static void get_tablespace_paths(void);
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index 66c6acded0f49000f400da1ca9d5cbdab8477cf3..b7136be045261a5ad538c1d1a693b502c19c55e8 100644
--- a/contrib/pg_upgrade/util.c
+++ b/contrib/pg_upgrade/util.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/util.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include <signal.h>
diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c
index 46190b11543f1d24d121b27de391b0f5d8eb8985..58d2ae4ac93c994f15752885e3ca2aa61c61a96d 100644
--- a/contrib/pg_upgrade/version.c
+++ b/contrib/pg_upgrade/version.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/version.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "access/transam.h"
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
index d63050c5b514c567503c57fb2ff65fd0849c6b8e..55d919cf072fccf8ca7d25094739ad747799ee3c 100644
--- a/contrib/pg_upgrade/version_old_8_3.c
+++ b/contrib/pg_upgrade/version_old_8_3.c
@@ -7,6 +7,8 @@
  *	contrib/pg_upgrade/version_old_8_3.c
  */
 
+#include "postgres.h"
+
 #include "pg_upgrade.h"
 
 #include "access/transam.h"