Remove unnecessary #include references, per pgrminclude script.

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;
 

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"

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

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>

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 */

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"
 

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"

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"

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;

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"
 

contrib/fuzzystrmatch/fuzzystrmatch.c

@@ -40,7 +40,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 

contrib/hstore/hstore_compat.c

@@ -83,7 +83,6 @@
  */
 #include "postgres.h"
 
-#include "funcapi.h"
 
 #include "hstore.h"
 

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"
 

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"

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"

contrib/intarray/_int_op.c

@@ -3,7 +3,6 @@
  */
 #include "postgres.h"
 
-#include "lib/stringinfo.h"
 
 #include "_int.h"
 

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"
 
 

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"
 

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);

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"
 

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"
 

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;

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"
 

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"

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"
 

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"

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

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"
 
 

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;

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);

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);

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;

contrib/pg_upgrade/version.c

@@ -11,7 +11,6 @@
 
 #include "pg_upgrade.h"
 
-#include "access/transam.h"
 
 
 /*

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"

contrib/pgcrypto/crypt-blowfish.c

@@ -34,7 +34,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 #ifdef __i386__

contrib/pgcrypto/crypt-des.c

@@ -62,7 +62,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 /* for ntohl/htonl */

contrib/pgcrypto/crypt-gensalt.c

@@ -14,7 +14,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 typedef unsigned int BF_word;

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"

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))))

contrib/pgcrypto/pgcrypto.c

@@ -33,7 +33,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "parser/scansup.h"
 #include "utils/builtins.h"
 

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"
 

contrib/pgcrypto/sha1.c

@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 
-#include "px.h"
 #include "sha1.h"
 
 /* constant table */

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"

contrib/seg/seg.c

@@ -13,7 +13,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "utils/builtins.h"
 
 #include "segdata.h"
 

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"
 

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;

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"

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))