Remove unnecessary #include references, per pgrminclude script.

48 files changed, 3 insertions, 97 deletions

diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c
index b320698748..42b45377fe 100644
--- a/contrib/auto_explain/auto_explain.c
+++ b/contrib/auto_explain/auto_explain.c
@@ -14,7 +14,6 @@
 
 #include "commands/explain.h"
 #include "executor/instrument.h"
-#include "utils/guc.h"
 
 PG_MODULE_MAGIC;
 
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 5c4f58b8b1..5e6003f63c 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -5,7 +5,6 @@
 
 #include <limits.h>
 
-#include "fmgr.h"
 #include "access/skey.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"
diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index a661303977..dcffbb5178 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -4,8 +4,7 @@
 #ifndef __BTREE_GIST_H__
 #define __BTREE_GIST_H__
 
-#include "access/gist.h"
-#include "access/itup.h"
+#include "fmgr.h"
 #include "access/nbtree.h"
 
 #define BtreeGistNotEqualStrategyNumber 6
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 8935ed6630..d7a61d2242 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -5,6 +5,7 @@
 #define __BTREE_UTILS_NUM_H__
 
 #include "btree_gist.h"
+#include "access/gist.h"
 #include "utils/rel.h"
 
 #include <math.h>
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 57d10e80f1..7a3eeec01a 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -6,6 +6,7 @@
 
 #include "btree_gist.h"
 
+#include "access/gist.h"
 #include "mb/pg_wchar.h"
 
 /* Variable length key */
diff --git a/contrib/citext/citext.c b/contrib/citext/citext.c
index 31b952b3f7..a584f57455 100644
--- a/contrib/citext/citext.c
+++ b/contrib/citext/citext.c
@@ -5,7 +5,6 @@
 
 #include "access/hash.h"
 #include "catalog/pg_collation.h"
-#include "fmgr.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
 
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index 4a207ccb98..b0564f75a4 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -13,8 +13,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "lib/stringinfo.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
 
 #include "cubedata.h"
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 3963329655..62c810a772 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -35,36 +35,21 @@
 #include <limits.h>
 
 #include "libpq-fe.h"
-#include "fmgr.h"
 #include "funcapi.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "access/tupdesc.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_index.h"
 #include "catalog/pg_type.h"
-#include "executor/executor.h"
 #include "executor/spi.h"
 #include "foreign/foreign.h"
-#include "lib/stringinfo.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "parser/parse_type.h"
 #include "parser/scansup.h"
 #include "utils/acl.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/dynahash.h"
 #include "utils/fmgroids.h"
-#include "utils/hsearch.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
-#include "utils/syscache.h"
 #include "utils/tqual.h"
 
 #include "dblink.h"
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index c4ad6ef343..9f61447160 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -13,7 +13,6 @@
 #include "postgres.h"
 
 #include "commands/defrem.h"
-#include "fmgr.h"
 #include "tsearch/ts_public.h"
 
 PG_MODULE_MAGIC;
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
index ded20facd4..a6b413bb55 100644
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -15,7 +15,6 @@
 #include <ctype.h>
 
 #include "commands/defrem.h"
-#include "fmgr.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_utils.h"
 
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index dbce1c1019..98b95bf6f1 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -40,7 +40,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 
diff --git a/contrib/hstore/hstore_compat.c b/contrib/hstore/hstore_compat.c
index 5778f74a80..88764b1b69 100644
--- a/contrib/hstore/hstore_compat.c
+++ b/contrib/hstore/hstore_compat.c
@@ -83,7 +83,6 @@
  */
 #include "postgres.h"
 
-#include "funcapi.h"
 
 #include "hstore.h"
 
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 88d89ece23..800de48247 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -4,7 +4,6 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/itup.h"
 #include "access/skey.h"
 #include "catalog/pg_type.h"
 
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 0d6f0b6b13..fc39bebc58 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -5,8 +5,6 @@
 
 #include <ctype.h>
 
-#include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 5b278c14ff..fee2c3c5ae 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -4,8 +4,6 @@
 #include "postgres.h"
 
 #include "access/hash.h"
-#include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "utils/builtins.h"
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index 392e227cff..4c2aa7af8b 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -3,7 +3,6 @@
  */
 #include "postgres.h"
 
-#include "lib/stringinfo.h"
 
 #include "_int.h"
 
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 6946150fed..9dbbbcebd2 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -10,7 +10,6 @@
 #include "commands/trigger.h"
 #include "executor/spi.h"
 #include "libpq/be-fsstubs.h"
-#include "libpq/libpq-fs.h"
 #include "utils/rel.h"
 
 
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c1f509ed8b..f03f633290 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,7 +9,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "utils/array.h"
 #include "crc32.h"
 #include "ltree.h"
 
diff --git a/contrib/ltree/_ltree_op.c b/contrib/ltree/_ltree_op.c
index f4f0451fd8..1b53af816d 100644
--- a/contrib/ltree/_ltree_op.c
+++ b/contrib/ltree/_ltree_op.c
@@ -9,7 +9,6 @@
 
 #include <ctype.h>
 
-#include "utils/array.h"
 #include "ltree.h"
 
 PG_FUNCTION_INFO_V1(_ltree_isparent);
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index da1086a8eb..31d150db40 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -8,7 +8,6 @@
 #include <ctype.h>
 
 #include "catalog/pg_collation.h"
-#include "utils/array.h"
 #include "utils/formatting.h"
 #include "ltree.h"
 
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 26c34753dc..1c0fa88c3a 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -6,9 +6,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/nbtree.h"
 #include "access/skey.h"
-#include "utils/array.h"
 #include "crc32.h"
 #include "ltree.h"
 
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index 2b048d4b7c..4290ad4e63 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -11,7 +11,6 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
-#include "utils/syscache.h"
 #include "ltree.h"
 
 PG_MODULE_MAGIC;
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 514406a67a..dbb2158ba8 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -27,13 +27,10 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/nbtree.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "miscadmin.h"
-#include "storage/bufmgr.h"
 #include "utils/builtins.h"
 #include "utils/rel.h"
 
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 38c4e23fc2..0d6bc14e9c 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -18,7 +18,6 @@
  */
 
 #include "postgres.h"
-#include "lib/stringinfo.h"
 #include "storage/fsm_internals.h"
 #include "utils/builtins.h"
 #include "miscadmin.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 20bca0dc53..fa50655d60 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -25,12 +25,7 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "funcapi.h"
-#include "access/heapam.h"
-#include "access/transam.h"
-#include "catalog/namespace.h"
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "miscadmin.h"
 
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index 8fc3a48d56..362ad84cef 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -15,12 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/transam.h"
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index ed882881ab..27e52b3b35 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -8,12 +8,10 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "storage/buf_internals.h"
 #include "storage/bufmgr.h"
-#include "utils/relcache.h"
 
 
 #define NUM_BUFFERCACHE_PAGES_ELEM	8
diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c
index bf6b0df8f9..f6f7d2e743 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@@ -8,9 +8,7 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "funcapi.h"
-#include "storage/block.h"
 #include "storage/freespace.h"
 
 
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 0236b87498..582c8d6cce 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -23,8 +23,6 @@
 #include <unistd.h>
 
 #include "access/hash.h"
-#include "catalog/pg_type.h"
-#include "executor/executor.h"
 #include "executor/instrument.h"
 #include "funcapi.h"
 #include "mb/pg_wchar.h"
@@ -32,11 +30,8 @@
 #include "pgstat.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
-#include "storage/spin.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/guc.h"
 
 
 PG_MODULE_MAGIC;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 43ac0b0c65..114fb784c4 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -6,12 +6,7 @@
 #include "trgm.h"
 
 #include "access/gin.h"
-#include "access/itup.h"
 #include "access/skey.h"
-#include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
 
 
 PG_FUNCTION_INFO_V1(gin_extract_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index b328a09f41..aee060bab7 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -5,13 +5,7 @@
 
 #include "trgm.h"
 
-#include "access/gist.h"
-#include "access/itup.h"
 #include "access/skey.h"
-#include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
 
 
 PG_FUNCTION_INFO_V1(gtrgm_in);
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index dfb2df5048..4e32c6f654 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -9,7 +9,6 @@
 
 #include "catalog/pg_type.h"
 #include "tsearch/ts_locale.h"
-#include "utils/array.h"
 
 
 PG_MODULE_MAGIC;
diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c
index 58d2ae4ac9..2d6778f747 100644
--- a/contrib/pg_upgrade/version.c
+++ b/contrib/pg_upgrade/version.c
@@ -11,7 +11,6 @@
 
 #include "pg_upgrade.h"
 
-#include "access/transam.h"
 
 
 /*
diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c
index 2c23cbab9d..47d65801d7 100644
--- a/contrib/pg_upgrade_support/pg_upgrade_support.c
+++ b/contrib/pg_upgrade_support/pg_upgrade_support.c
@@ -11,10 +11,7 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
-#include "catalog/dependency.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
 #include "commands/extension.h"
 #include "miscadmin.h"
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
index eebf1877cf..7cca92b6ab 100644
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ b/contrib/pgcrypto/crypt-blowfish.c
@@ -34,7 +34,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 #ifdef __i386__
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index 1f497432da..e50c1f4a92 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -62,7 +62,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 /* for ntohl/htonl */
diff --git a/contrib/pgcrypto/crypt-gensalt.c b/contrib/pgcrypto/crypt-gensalt.c
index 84bf27bedb..062ab86416 100644
--- a/contrib/pgcrypto/crypt-gensalt.c
+++ b/contrib/pgcrypto/crypt-gensalt.c
@@ -14,7 +14,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 typedef unsigned int BF_word;
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index fedfe2dd03..5ceb5271bb 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -36,7 +36,6 @@
 #include "px.h"
 #include "md5.h"
 #include "sha1.h"
-#include "sha2.h"
 #include "blf.h"
 #include "rijndael.h"
 #include "fortuna.h"
diff --git a/contrib/pgcrypto/md5.c b/contrib/pgcrypto/md5.c
index b5071fba43..08227a809c 100644
--- a/contrib/pgcrypto/md5.c
+++ b/contrib/pgcrypto/md5.c
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 
-#include "px.h"
 #include "md5.h"
 
 #define SHIFT(X, s) (((X) << (s)) | ((X) >> (32 - (s))))
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index d271ddc302..c7588532a8 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -33,7 +33,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "parser/scansup.h"
 #include "utils/builtins.h"
 
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index f1f09cd83b..c4c6b50977 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,8 +31,6 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
-#include "parser/scansup.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index 4ee4f24559..ac406faf7e 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 
-#include "px.h"
 #include "sha1.h"
 
 /* constant table */
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index 4a49ee342f..20beed2a30 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -24,7 +24,6 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/xact.h"
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 0a787ff946..1c14c49fec 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -13,7 +13,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "utils/builtins.h"
 
 #include "segdata.h"
 
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 4ef9b00a6d..4fd68cd6b0 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -35,14 +35,10 @@
 #include <math.h>
 
 #include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "funcapi.h"
 #include "executor/spi.h"
-#include "lib/stringinfo.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/guc.h"
-#include "utils/lsyscache.h"
 
 #include "tablefunc.h"
 
diff --git a/contrib/tsearch2/tsearch2.c b/contrib/tsearch2/tsearch2.c
index c6ced6396c..9b22d6f99a 100644
--- a/contrib/tsearch2/tsearch2.c
+++ b/contrib/tsearch2/tsearch2.c
@@ -16,10 +16,8 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "commands/trigger.h"
-#include "fmgr.h"
 #include "tsearch/ts_utils.h"
 #include "utils/builtins.h"
-#include "utils/guc.h"
 #include "utils/syscache.h"
 
 PG_MODULE_MAGIC;
diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
index 709f4c4492..d9c2eac2e7 100644
--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@@ -13,10 +13,8 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "mb/pg_wchar.h"
 #include "tsearch/ts_cache.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_public.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 6818d4ac43..21b6dbf96d 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -22,7 +22,6 @@
 #endif
 
 #include "libpq-fe.h"
-#include "libpq/libpq-fs.h"
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))