diff options
308 files changed, 22 insertions, 647 deletions
diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c index b3206987484..42b45377fec 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 5c4f58b8b1f..5e6003f63cb 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 a6613039772..dcffbb51784 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 8935ed66306..d7a61d22426 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 57d10e80f19..7a3eeec01a0 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 31b952b3f74..a584f57455e 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 4a207ccb988..b0564f75a4d 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 3963329655a..62c810a772a 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 c4ad6ef343e..9f614471605 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 ded20facd47..a6b413bb554 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 dbce1c10197..98b95bf6f11 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 5778f74a805..88764b1b698 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 88d89ece23b..800de48247e 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 0d6f0b6b138..fc39bebc58f 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 5b278c14ffe..fee2c3c5aea 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 392e227cff8..4c2aa7af8b5 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 6946150fed5..9dbbbcebd23 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 c1f509ed8b1..f03f6332906 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 f4f0451fd88..1b53af816d9 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 da1086a8ebf..31d150db40f 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 26c34753dcf..1c0fa88c3af 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 2b048d4b7c5..4290ad4e63b 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 514406a67a8..dbb2158ba8d 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 38c4e23fc2c..0d6bc14e9c3 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 20bca0dc539..fa50655d60b 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 8fc3a48d562..362ad84cef2 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 ed882881abd..27e52b3b35f 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 bf6b0df8f9f..f6f7d2e7437 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 0236b87498f..582c8d6ccea 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 43ac0b0c657..114fb784c47 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 b328a09f41f..aee060bab73 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 dfb2df50488..4e32c6f654c 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 58d2ae4ac93..2d6778f7476 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 2c23cbab9df..47d65801d75 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 eebf1877cfd..7cca92b6ab5 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 1f497432da7..e50c1f4a925 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 84bf27bedb9..062ab864167 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 fedfe2dd039..5ceb5271bbb 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 b5071fba430..08227a809c7 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 d271ddc3029..c7588532a8e 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 f1f09cd83b7..c4c6b509776 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 4ee4f24559b..ac406faf7e9 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 4a49ee342fe..20beed2a300 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 0a787ff9462..1c14c49feca 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 4ef9b00a6d3..4fd68cd6b03 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 c6ced6396c8..9b22d6f99a0 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 709f4c4492a..d9c2eac2e74 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 6818d4ac436..21b6dbf96de 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)) diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 175e6ea2f2e..36b3af82021 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -57,7 +57,6 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/tuptoaster.h" #include "executor/tuptable.h" diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 900b222865e..7c63298cb01 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -23,10 +23,8 @@ #include "commands/defrem.h" #include "commands/tablespace.h" #include "nodes/makefuncs.h" -#include "utils/array.h" #include "utils/attoptcache.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index 2de58604eee..3e4b43d4758 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -15,7 +15,6 @@ #include "access/gin.h" #include "access/skey.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 739fa8afff7..eefbd10e9b9 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -16,7 +16,6 @@ #include "access/gin_private.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/rel.h" /* diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 41dbe9fd11e..790609801e0 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/gin_private.h" -#include "storage/bufmgr.h" #include "utils/rel.h" int diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index fa134f9fc3f..d4de91f05a3 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/gin_private.h" -#include "storage/bufmgr.h" #include "utils/rel.h" /* diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 60a6d80a189..8ae09c308af 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -19,10 +19,8 @@ #include "postgres.h" #include "access/gin_private.h" -#include "catalog/index.h" #include "commands/vacuum.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index 866785837f5..a6504c958d9 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -16,9 +16,7 @@ #include "access/gin_private.h" #include "access/relscan.h" -#include "catalog/index.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/datum.h" #include "utils/memutils.h" diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index f8d54b1b462..73f72f288b2 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -17,7 +17,6 @@ #include "access/gin_private.h" #include "access/relscan.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index ba142bc874d..f18b3699cf6 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -19,8 +19,6 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c index 79c54f16b8d..e5d61b5a0b7 100644 --- a/src/backend/access/gin/ginvacuum.c +++ b/src/backend/access/gin/ginvacuum.c @@ -15,11 +15,9 @@ #include "postgres.h" #include "access/gin_private.h" -#include "catalog/storage.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "postmaster/autovacuum.h" -#include "storage/bufmgr.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c index c954bcb12fc..01297c36092 100644 --- a/src/backend/access/gin/ginxlog.c +++ b/src/backend/access/gin/ginxlog.c @@ -15,7 +15,6 @@ #include "access/gin_private.h" #include "access/xlogutils.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" static MemoryContext opCtx; /* working memory for operations */ diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 5d5fd5b738e..60116dfd46e 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -16,10 +16,8 @@ #include "access/gist_private.h" #include "access/relscan.h" -#include "executor/execdebug.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 5662a3a4aab..97a19aa2ac9 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -14,11 +14,9 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/gist_private.h" #include "access/gistscan.h" #include "access/relscan.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 1754a103699..448d8bce05c 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -17,11 +17,8 @@ #include "access/gist_private.h" #include "access/reloptions.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" -#include "storage/bufmgr.h" -#include "utils/rel.h" /* * static *S used for temrorary storage (saves stack and palloc() call) diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c index 50c6270b005..d6506458644 100644 --- a/src/backend/access/gist/gistvacuum.c +++ b/src/backend/access/gist/gistvacuum.c @@ -16,14 +16,10 @@ #include "access/genam.h" #include "access/gist_private.h" -#include "catalog/storage.h" #include "commands/vacuum.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" -#include "utils/memutils.h" /* diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 02c4ec3a6f5..09b1d489928 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -15,10 +15,7 @@ #include "access/gist_private.h" #include "access/xlogutils.h" -#include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" -#include "utils/rel.h" typedef struct { diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index dd58f168401..54158f4679a 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index ae8b2b1cfd4..a2a5bb77a83 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -18,7 +18,6 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index fe991cf27bb..66d43469762 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -28,13 +28,10 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/hash.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/smgr.h" -#include "utils/lsyscache.h" static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock, diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index bf42be103f1..2ce81312e7c 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -18,7 +18,6 @@ #include "access/relscan.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index aa68be596ea..06651502810 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -17,8 +17,6 @@ #include "access/hash.h" #include "access/reloptions.h" #include "access/relscan.h" -#include "executor/execdebug.h" -#include "storage/bufmgr.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 0cfa8661082..61f2ce4cded 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -15,12 +15,10 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/htup.h" #include "access/transam.h" #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" -#include "storage/off.h" #include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c index 957d1a12f30..0f11786d11b 100644 --- a/src/backend/access/heap/syncscan.c +++ b/src/backend/access/heap/syncscan.c @@ -48,8 +48,6 @@ #include "access/heapam.h" #include "miscadmin.h" -#include "storage/block.h" -#include "storage/relfilenode.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index a19352021dc..8bed6edc76e 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -73,7 +73,6 @@ #include "access/visibilitymap.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/bufpage.h" #include "storage/lmgr.h" #include "storage/smgr.h" diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index fe3aa3c9c1d..98832adb8a3 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -23,7 +23,6 @@ #include "access/transam.h" #include "catalog/index.h" #include "miscadmin.h" -#include "pgstat.h" #include "storage/bufmgr.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 13e68d644ea..230af9bfa3a 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -64,13 +64,11 @@ #include "access/relscan.h" #include "access/transam.h" -#include "access/xact.h" #include "catalog/index.h" #include "pgstat.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/tqual.h" diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index d758659c314..872988dd98a 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -19,7 +19,6 @@ #include "access/nbtree.h" #include "access/transam.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/inval.h" diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 4b1a2e912b6..f9b3e1feafe 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -25,8 +25,6 @@ #include "access/nbtree.h" #include "access/transam.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" #include "storage/predicate.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index ac86eb494f6..996611516fe 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -18,14 +18,10 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "catalog/index.h" -#include "catalog/storage.h" #include "commands/vacuum.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/ipc.h" #include "storage/lmgr.h" diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 5c00fac533b..313e574f969 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -15,12 +15,10 @@ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "storage/predicate.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 93a928c66b2..77341903fb9 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -66,7 +66,6 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/nbtree.h" #include "miscadmin.h" #include "storage/smgr.h" diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 3996203a7ef..3ca75b79ccb 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -17,15 +17,10 @@ #include <time.h> -#include "access/genam.h" #include "access/nbtree.h" #include "access/reloptions.h" #include "access/relscan.h" -#include "executor/execdebug.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/lwlock.h" -#include "storage/shmem.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 2775ae6d292..e2ed50feacf 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -16,10 +16,7 @@ #include "access/nbtree.h" #include "access/transam.h" -#include "access/xact.h" -#include "storage/bufmgr.h" #include "storage/procarray.h" -#include "storage/standby.h" #include "miscadmin.h" /* diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index d3de8934eee..3a6c39164ce 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -36,7 +36,6 @@ #include "access/slru.h" #include "access/transam.h" #include "pg_trace.h" -#include "postmaster/bgwriter.h" /* * Defines for CLOG page sizes. A page is the same BLCKSZ as is used diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index bb3afd6000c..1d159bc89cb 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -56,7 +56,6 @@ #include "access/xact.h" #include "miscadmin.h" #include "pg_trace.h" -#include "storage/backendid.h" #include "storage/lmgr.h" #include "storage/procarray.h" #include "utils/builtins.h" diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c index f8f797c33d3..6a0a2d9b477 100644 --- a/src/backend/access/transam/rmgr.c +++ b/src/backend/access/transam/rmgr.c @@ -20,7 +20,6 @@ #include "commands/dbcommands.h" #include "commands/sequence.h" #include "commands/tablespace.h" -#include "storage/freespace.h" #include "storage/standby.h" #include "utils/relmapper.h" diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 69e5245beba..a83962b4f0a 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -55,7 +55,6 @@ #include "access/transam.h" #include "access/xlog.h" #include "storage/fd.h" -#include "storage/shmem.h" #include "miscadmin.h" diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c index eeb445da9d7..088c8373583 100644 --- a/src/backend/access/transam/twophase_rmgr.c +++ b/src/backend/access/transam/twophase_rmgr.c @@ -17,7 +17,6 @@ #include "access/multixact.h" #include "access/twophase_rmgr.h" #include "pgstat.h" -#include "storage/lock.h" #include "storage/predicate.h" diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 555bb134f55..41f261a4b63 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -21,8 +21,6 @@ #include "miscadmin.h" #include "postmaster/autovacuum.h" #include "storage/pmsignal.h" -#include "storage/proc.h" -#include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index e8821f72832..7922f7ac209 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -36,21 +36,14 @@ #include "libpq/be-fsstubs.h" #include "miscadmin.h" #include "pgstat.h" -#include "replication/walsender.h" -#include "replication/syncrep.h" -#include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" -#include "storage/standby.h" #include "utils/combocid.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" #include "pg_trace.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 879123013c5..038d593eea5 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -20,10 +20,7 @@ #include "access/xlog.h" #include "access/xlogutils.h" #include "catalog/catalog.h" -#include "storage/bufmgr.h" #include "storage/smgr.h" -#include "utils/guc.h" -#include "utils/hsearch.h" #include "utils/rel.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 08ae863f549..ab148404b03 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -21,9 +21,6 @@ #include <getopt.h> #endif -#include "access/genam.h" -#include "access/heapam.h" -#include "access/xact.h" #include "bootstrap/bootstrap.h" #include "catalog/index.h" #include "catalog/pg_collation.h" @@ -36,8 +33,6 @@ #include "replication/walreceiver.h" #include "storage/bufmgr.h" #include "storage/ipc.h" -#include "storage/proc.h" -#include "storage/procsignal.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 0526555ac3b..2bce663e516 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -14,14 +14,11 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" @@ -39,7 +36,6 @@ #include "catalog/pg_extension.h" #include "catalog/pg_foreign_data_wrapper.h" #include "catalog/pg_foreign_server.h" -#include "catalog/pg_foreign_table.h" #include "catalog/pg_language.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_namespace.h" @@ -75,7 +71,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 7ec658146f0..2aaf77523fe 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -29,8 +29,6 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/transam.h" #include "access/xact.h" @@ -38,8 +36,6 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/pg_attrdef.h" #include "catalog/pg_collation.h" @@ -61,8 +57,6 @@ #include "parser/parse_collate.h" #include "parser/parse_expr.h" #include "parser/parse_relation.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/predicate.h" #include "storage/smgr.h" #include "utils/acl.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 75b4c146f5f..509a86df69a 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -23,8 +23,6 @@ #include <unistd.h> -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/sysattr.h" #include "access/transam.h" @@ -34,8 +32,6 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" #include "catalog/pg_operator.h" @@ -59,11 +55,9 @@ #include "storage/smgr.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/syscache.h" #include "utils/tuplesort.h" #include "utils/snapmgr.h" diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index 351e6f63ac6..e2e635e358e 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -15,7 +15,6 @@ */ #include "postgres.h" -#include "access/genam.h" #include "catalog/index.h" #include "catalog/indexing.h" #include "executor/executor.h" diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index d42f944cc4e..16568976a2c 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -21,7 +21,6 @@ #include "access/xact.h" #include "catalog/dependency.h" -#include "catalog/namespace.h" #include "catalog/pg_authid.h" #include "catalog/pg_collation.h" #include "catalog/pg_conversion.h" @@ -42,17 +41,14 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "parser/parse_func.h" -#include "storage/backendid.h" #include "storage/ipc.h" #include "storage/lmgr.h" #include "storage/sinval.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 7f16212c9e5..8feb6015789 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -15,16 +15,12 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/catalog.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaddress.h" #include "catalog/pg_authid.h" #include "catalog/pg_cast.h" -#include "catalog/pg_class.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" #include "catalog/pg_conversion.h" @@ -68,7 +64,6 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "utils/rel.h" #include "utils/tqual.h" static ObjectAddress get_object_address_unqualified(ObjectType objtype, diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 69979942af4..e1cff30f8d8 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -23,7 +23,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c index c84dbc6ae4c..e480aebe58f 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -24,8 +24,6 @@ #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "mb/pg_wchar.h" -#include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/rel.h" diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c index 494704f5d09..8162990c324 100644 --- a/src/backend/catalog/pg_db_role_setting.c +++ b/src/backend/catalog/pg_db_role_setting.c @@ -12,8 +12,6 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/htup.h" -#include "access/skey.h" #include "catalog/indexing.h" #include "catalog/pg_db_role_setting.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index 61a9322d901..3665846269a 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -24,7 +24,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c index 2ed6f1d07f3..ed275d85aad 100644 --- a/src/backend/catalog/pg_inherits.c +++ b/src/backend/catalog/pg_inherits.c @@ -22,7 +22,6 @@ #include "access/genam.h" #include "access/heapam.h" #include "catalog/indexing.h" -#include "catalog/pg_class.h" #include "catalog/pg_inherits.h" #include "catalog/pg_inherits_fn.h" #include "parser/parse_type.h" diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index 6d6c9e9f662..24cc0d47b32 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -17,16 +17,12 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/sysattr.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/pg_authid.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" -#include "catalog/toasting.h" #include "miscadmin.h" #include "utils/acl.h" -#include "utils/bytea.h" #include "utils/fmgroids.h" #include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index f2f08721599..f2b78b66a44 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index a09a3adb20d..a938c98190e 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -14,13 +14,11 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/tuptoaster.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index e1be451e35c..c3212246643 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -33,9 +33,7 @@ #include "commands/typecmds.h" #include "commands/user.h" #include "miscadmin.h" -#include "parser/parse_clause.h" #include "tcop/utility.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index a68da590ce8..1d6301bac16 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -16,14 +16,12 @@ #include <math.h> -#include "access/heapam.h" #include "access/transam.h" #include "access/tupconvert.h" #include "access/tuptoaster.h" #include "access/xact.h" #include "catalog/index.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_collation.h" #include "catalog/pg_inherits_fn.h" #include "catalog/pg_namespace.h" @@ -38,12 +36,10 @@ #include "postmaster/autovacuum.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/attoptcache.h" #include "utils/datum.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 670d29ea831..8200d2095a7 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -17,8 +17,6 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/rewriteheap.h" #include "access/transam.h" @@ -27,20 +25,15 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" -#include "catalog/pg_namespace.h" #include "catalog/toasting.h" #include "commands/cluster.h" #include "commands/tablecmds.h" -#include "commands/trigger.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "optimizer/planner.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "storage/procarray.h" #include "storage/smgr.h" #include "utils/acl.h" #include "utils/fmgroids.h" @@ -48,7 +41,6 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 9e6138b92a6..c43f663ad24 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -27,7 +27,6 @@ #include "commands/defrem.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/pg_locale.h" diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 2c1c6da9009..cd7ae600ff6 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -19,14 +19,12 @@ #include "catalog/indexing.h" #include "catalog/pg_conversion.h" #include "catalog/pg_conversion_fn.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_type.h" #include "commands/alter.h" #include "commands/conversioncmds.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "parser/parse_func.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 93240efbd71..2c0581481b0 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -26,7 +26,6 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/transam.h" #include "access/xact.h" #include "access/xlogutils.h" #include "catalog/catalog.h" @@ -45,18 +44,14 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "storage/bufmgr.h" #include "storage/copydir.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/ipc.h" #include "storage/procarray.h" #include "storage/smgr.h" -#include "storage/standby.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/pg_locale.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c index 85a2ef85821..fae726a9876 100644 --- a/src/backend/commands/discard.c +++ b/src/backend/commands/discard.c @@ -18,8 +18,6 @@ #include "commands/async.h" #include "commands/discard.h" #include "commands/prepare.h" -#include "commands/variable.h" -#include "utils/plancache.h" #include "utils/portal.h" static void DiscardAll(bool isTopLevel); diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index fee829f9606..6408d1653b3 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -14,23 +14,17 @@ #include "postgres.h" #include "access/xact.h" -#include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "commands/explain.h" #include "commands/prepare.h" -#include "commands/trigger.h" #include "executor/hashjoin.h" #include "executor/instrument.h" #include "foreign/fdwapi.h" #include "optimizer/clauses.h" -#include "optimizer/planner.h" -#include "optimizer/var.h" #include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index d591bf00f96..9ffce8529bb 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -41,16 +41,12 @@ #include "commands/comment.h" #include "commands/extension.h" #include "commands/schemacmds.h" -#include "commands/trigger.h" -#include "executor/executor.h" #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 3a3c1313668..d9c27d187a7 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -16,7 +16,6 @@ #include "access/heapam.h" #include "access/xact.h" #include "access/reloptions.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 92abd44a600..bee4313a52c 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -58,7 +58,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 77648b47743..80925d58a42 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -15,13 +15,9 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/reloptions.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/catalog.h" -#include "catalog/heap.h" #include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/pg_opclass.h" @@ -29,7 +25,6 @@ #include "catalog/pg_tablespace.h" #include "commands/dbcommands.h" #include "commands/defrem.h" -#include "commands/tablecmds.h" #include "commands/tablespace.h" #include "mb/pg_wchar.h" #include "miscadmin.h" @@ -39,9 +34,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" -#include "parser/parsetree.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/builtins.h" @@ -49,7 +42,6 @@ #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 2bb0d4c3b5f..3dbc9329267 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -37,7 +37,6 @@ #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index c99de4b240f..c5c18ee4fcc 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -37,9 +37,7 @@ #include "access/heapam.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_operator.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_type.h" #include "commands/alter.h" #include "commands/defrem.h" @@ -47,7 +45,6 @@ #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" -#include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index dfa2ab00262..6cf6da3f21a 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -28,10 +28,8 @@ #include "parser/parse_type.h" #include "rewrite/rewriteHandler.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/builtins.h" -#include "utils/memutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 5dd5763a7bc..9d1d6535fd9 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -28,7 +27,6 @@ #include "tcop/utility.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c index 0041734b62b..e0fd7acb875 100644 --- a/src/backend/commands/seclabel.c +++ b/src/backend/commands/seclabel.c @@ -14,18 +14,14 @@ #include "access/heapam.h" #include "catalog/catalog.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_seclabel.h" #include "catalog/pg_shseclabel.h" #include "commands/seclabel.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/syscache.h" #include "utils/tqual.h" typedef struct diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index de6e2a3e33f..c23a39f7580 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -14,9 +14,7 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/transam.h" -#include "access/xact.h" #include "access/xlogutils.h" #include "catalog/dependency.h" #include "catalog/namespace.h" @@ -27,9 +25,7 @@ #include "funcapi.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/smgr.h" #include "utils/acl.h" #include "utils/builtins.h" diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 09ecabb7723..c8c9337b56e 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -54,7 +54,6 @@ #include "access/heapam.h" #include "access/reloptions.h" #include "access/sysattr.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -62,22 +61,17 @@ #include "catalog/objectaccess.h" #include "catalog/pg_tablespace.h" #include "commands/comment.h" -#include "commands/defrem.h" #include "commands/seclabel.h" #include "commands/tablespace.h" #include "miscadmin.h" #include "postmaster/bgwriter.h" #include "storage/fd.h" -#include "storage/procarray.h" #include "storage/standby.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index deac1062ef9..16e6940d131 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -22,7 +22,6 @@ #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" @@ -38,11 +37,8 @@ #include "nodes/makefuncs.h" #include "parser/parse_func.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/acl.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 0367b200fef..10f44877473 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -32,7 +32,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 7fe787ecb74..005d72997ba 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -37,11 +37,9 @@ #include "postmaster/autovacuum.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index 17098efa670..cc046f7f304 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -20,10 +20,8 @@ #include "executor/executor.h" #include "miscadmin.h" -#include "parser/parse_oper.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/syscache.h" static TupleHashTable CurTupleHashTable = NULL; diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 63e3d927726..4dbf10b8da9 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -42,8 +42,6 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/transam.h" #include "catalog/index.h" @@ -52,7 +50,6 @@ #include "parser/parsetree.h" #include "storage/lmgr.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/tqual.h" diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 13946cab23d..398bc40c490 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -17,7 +17,6 @@ #include "access/xact.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/trigger.h" #include "executor/functions.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index c9b540e0798..8e50fb1aaef 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -35,7 +35,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/transam.h" #include "executor/execdebug.h" diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 4de54ea55f6..9a56fd4b9fd 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -21,7 +21,6 @@ */ #include "postgres.h" -#include "access/genam.h" #include "executor/execdebug.h" #include "executor/instrument.h" #include "executor/nodeBitmapIndexscan.h" diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index dedd2550102..5d5727e3eee 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -25,7 +25,6 @@ #include "executor/nodeFunctionscan.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" -#include "utils/builtins.h" static TupleTableSlot *FunctionNext(FunctionScanState *node); diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 1af98c81a69..2ade2d7fad6 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -32,7 +32,6 @@ #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" #include "miscadmin.h" -#include "parser/parse_expr.h" #include "utils/dynahash.h" #include "utils/memutils.h" #include "utils/lsyscache.h" diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 263f3b946ba..9a74a8135d0 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -24,13 +24,11 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeIndexscan.h" #include "optimizer/clauses.h" -#include "utils/array.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index fa0ecc81769..43059664b93 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -42,7 +42,6 @@ #include "executor/execdebug.h" #include "executor/nodeMergeAppend.h" #include "utils/lsyscache.h" -#include "utils/rel.h" /* * It gets quite confusing having a heap array (indexed by integers) which diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 7d27123cf05..e23dd6c9f54 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -93,14 +93,12 @@ #include "postgres.h" #include "access/nbtree.h" -#include "catalog/pg_amop.h" #include "executor/execdebug.h" #include "executor/nodeMergejoin.h" #include "miscadmin.h" #include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/syscache.h" /* diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index e2cea0eecb2..5b652c92f00 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -24,7 +24,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeSeqscan.h" diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 0e12bb5afbd..b0fb70488e8 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -24,7 +24,6 @@ #include "executor/nodeSubplan.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" -#include "utils/array.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 28244a1a3d0..a54bb9dba3e 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -24,14 +24,12 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/pg_type.h" #include "executor/execdebug.h" #include "executor/nodeTidscan.h" #include "optimizer/clauses.h" #include "storage/bufmgr.h" -#include "utils/array.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 766407388f5..d5260e40b32 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -25,7 +25,6 @@ #include "executor/executor.h" #include "executor/nodeValuesscan.h" -#include "utils/memutils.h" static TupleTableSlot *ValuesNext(ValuesScanState *node); diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c index 4a7b2c30cf3..67a4597c382 100644 --- a/src/backend/foreign/foreign.c +++ b/src/backend/foreign/foreign.c @@ -13,22 +13,14 @@ #include "postgres.h" #include "access/reloptions.h" -#include "catalog/namespace.h" #include "catalog/pg_foreign_data_wrapper.h" #include "catalog/pg_foreign_server.h" #include "catalog/pg_foreign_table.h" -#include "catalog/pg_type.h" #include "catalog/pg_user_mapping.h" #include "foreign/fdwapi.h" #include "foreign/foreign.h" -#include "funcapi.h" #include "miscadmin.h" -#include "nodes/parsenodes.h" -#include "utils/acl.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 155385f0b99..f2a2d2d3a94 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -42,7 +42,6 @@ #include <sys/stat.h> #include <unistd.h> -#include "catalog/pg_largeobject_metadata.h" #include "libpq/be-fsstubs.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c index 5546034694d..e1e9a35b426 100644 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@ -20,7 +20,6 @@ */ #include "postgres.h" -#include "nodes/bitmapset.h" #include "access/hash.h" diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 108baa6144f..afc1c61876c 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -24,8 +24,6 @@ #include "miscadmin.h" #include "foreign/fdwapi.h" -#include "nodes/plannodes.h" -#include "nodes/relation.h" #include "utils/datum.h" diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 627a8f51ee8..93ab08a7d77 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -23,10 +23,7 @@ #include <ctype.h> -#include "lib/stringinfo.h" #include "foreign/fdwapi.h" -#include "nodes/plannodes.h" -#include "nodes/relation.h" #include "utils/datum.h" diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c index 62d766a2827..047d27c8bec 100644 --- a/src/backend/nodes/params.c +++ b/src/backend/nodes/params.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "nodes/params.h" -#include "parser/parse_param.h" #include "utils/datum.h" #include "utils/lsyscache.h" diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index e22824a7dcd..0b0cf384829 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -20,12 +20,10 @@ #include "postgres.h" #include "access/printtup.h" -#include "lib/stringinfo.h" #include "nodes/print.h" #include "optimizer/clauses.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" -#include "utils/rel.h" /* diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c index 6f806fda851..2363ec22a43 100644 --- a/src/backend/nodes/tidbitmap.c +++ b/src/backend/nodes/tidbitmap.c @@ -43,7 +43,6 @@ #include "access/htup.h" #include "nodes/bitmapset.h" #include "nodes/tidbitmap.h" -#include "storage/bufpage.h" #include "utils/hsearch.h" /* diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index ca068991c16..eb9b29311dc 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -20,7 +20,6 @@ #include "optimizer/cost.h" #include "optimizer/pathnode.h" #include "optimizer/plancat.h" -#include "parser/parsetree.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index acc4fb1a185..4a52ecfa730 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -21,7 +21,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" #include "optimizer/prep.h" diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 9cfc56ea541..5b170b399c5 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -14,11 +14,9 @@ */ #include "postgres.h" -#include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/joininfo.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" @@ -27,11 +25,7 @@ #include "optimizer/prep.h" #include "optimizer/restrictinfo.h" #include "optimizer/var.h" -#include "parser/parse_expr.h" -#include "parser/parse_oper.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" /* These parameters are set by GUC */ diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 7230fb4326d..484d44108ef 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -17,7 +17,6 @@ #include <limits.h> -#include "catalog/pg_operator.h" #include "executor/executor.h" #include "executor/nodeAgg.h" #include "miscadmin.h" @@ -32,17 +31,12 @@ #include "optimizer/prep.h" #include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #ifdef OPTIMIZER_DEBUG #include "nodes/print.h" #endif #include "parser/analyze.h" -#include "parser/parse_expr.h" -#include "parser/parse_oper.h" #include "parser/parsetree.h" -#include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/syscache.h" /* GUC parameter */ diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index c3a5aac2fab..8508d25316c 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -20,10 +20,8 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/planmain.h" #include "optimizer/tlist.h" -#include "parser/parsetree.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 71ffc17b599..4d4e6bf78e7 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -27,7 +27,6 @@ #include "optimizer/subselect.h" #include "optimizer/var.h" #include "parser/parse_relation.h" -#include "parser/parsetree.h" #include "rewrite/rewriteManip.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index 63a52f2d976..aeaae8c8d87 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -31,7 +31,6 @@ #include "optimizer/prep.h" #include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index fa2514d2a43..077ac49631f 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -29,9 +29,7 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "optimizer/prep.h" -#include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parsetree.h" #include "parser/parse_coerce.h" #include "utils/rel.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index f82ab27b9aa..31b101b7a11 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -31,7 +31,6 @@ #include "access/heapam.h" #include "access/sysattr.h" -#include "catalog/namespace.h" #include "catalog/pg_inherits_fn.h" #include "catalog/pg_type.h" #include "miscadmin.h" @@ -39,12 +38,10 @@ #include "nodes/nodeFuncs.h" #include "optimizer/cost.h" #include "optimizer/pathnode.h" -#include "optimizer/paths.h" #include "optimizer/planmain.h" #include "optimizer/planner.h" #include "optimizer/prep.h" #include "optimizer/tlist.h" -#include "parser/parse_clause.h" #include "parser/parse_coerce.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 161d5ab122e..4a1c94affbd 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -16,7 +16,6 @@ #include <math.h> -#include "catalog/pg_operator.h" #include "foreign/fdwapi.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" @@ -25,12 +24,9 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" -#include "parser/parse_expr.h" #include "parser/parsetree.h" #include "utils/selfuncs.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" static List *translate_sub_tlist(List *tlist, int relid); diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 6259170b0e7..8a3a5d85e2a 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -24,7 +24,6 @@ #include "catalog/catalog.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c index cb10a31b077..304ca407ed4 100644 --- a/src/backend/optimizer/util/predtest.c +++ b/src/backend/optimizer/util/predtest.c @@ -15,17 +15,13 @@ */ #include "postgres.h" -#include "catalog/pg_am.h" -#include "catalog/pg_amop.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/executor.h" #include "miscadmin.h" -#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/planmain.h" #include "optimizer/predtest.h" -#include "utils/array.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index b7a5845bb15..b59eb090aa0 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -19,8 +19,6 @@ #include "optimizer/paths.h" #include "optimizer/placeholder.h" #include "optimizer/plancat.h" -#include "optimizer/restrictinfo.h" -#include "parser/parsetree.h" #include "utils/hsearch.h" diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c index 93f9aa846a6..63ff431900e 100644 --- a/src/backend/optimizer/util/restrictinfo.c +++ b/src/backend/optimizer/util/restrictinfo.c @@ -15,8 +15,6 @@ #include "postgres.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" -#include "optimizer/paths.h" #include "optimizer/predtest.h" #include "optimizer/restrictinfo.h" #include "optimizer/var.h" diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 718057a773f..552540a73d4 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -17,7 +17,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" /***************************************************************************** diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 83561337966..ed720ddfd9d 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -18,13 +18,11 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parse_agg.h" #include "parser/parse_clause.h" #include "parser/parsetree.h" #include "rewrite/rewriteManip.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" typedef struct diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index a8549e0c2a7..978417d6ca7 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -23,7 +23,6 @@ #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/analyze.h" #include "parser/parsetree.h" #include "parser/parse_clause.h" @@ -34,7 +33,6 @@ #include "parser/parse_relation.h" #include "parser/parse_target.h" #include "rewrite/rewriteManip.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index f26c69abddd..127818abdea 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -22,11 +22,9 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "parser/parse_coerce.h" -#include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_type.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 7b5c040cb40..494ef5fb4ba 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -24,7 +24,6 @@ #include "parser/parse_expr.h" #include "parser/parse_relation.h" #include "utils/builtins.h" -#include "utils/int8.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/varbit.h" diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index d4cd1efa64a..73a91ea5086 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -24,7 +24,6 @@ #include "parser/parse_oper.h" #include "parser/parse_type.h" #include "utils/builtins.h" -#include "utils/hsearch.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 3840c2f3ed5..9ac28c916cd 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -16,7 +16,6 @@ #include <ctype.h> -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/heap.h" #include "catalog/namespace.h" diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 21b54f7f153..a2a54db6ea1 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -26,8 +26,6 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/reloptions.h" #include "catalog/dependency.h" #include "catalog/heap.h" @@ -55,7 +53,6 @@ #include "parser/parse_utilcmd.h" #include "parser/parser.h" #include "rewrite/rewriteManip.h" -#include "storage/lock.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index a6ff723e7bc..e9a481883bf 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -16,7 +16,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 12daffa8512..f7ecb0a8eb7 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -13,7 +13,7 @@ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ #ifdef HAVE_DLOPEN diff --git a/src/backend/port/dynloader/cygwin.h b/src/backend/port/dynloader/cygwin.h index 67ae4b0ab59..5f47d1f8a83 100644 --- a/src/backend/port/dynloader/cygwin.h +++ b/src/backend/port/dynloader/cygwin.h @@ -13,7 +13,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index 5c1e3b39a81..d7f887392ea 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -13,7 +13,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on DG/UX. diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index c10ffe6cbf8..6b621cb2fb7 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.h @@ -18,7 +18,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/irix.h b/src/backend/port/dynloader/irix.h index ae9377df645..035f75cba23 100644 --- a/src/backend/port/dynloader/irix.h +++ b/src/backend/port/dynloader/irix.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SunOS 4. diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 2e1330cd3f1..99667e49547 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -14,7 +14,7 @@ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ #ifdef HAVE_DLOPEN #include <dlfcn.h> #endif diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 71d9260a7ce..9c65146bab4 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.h @@ -19,7 +19,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index 55fc1062921..d20c0b3e450 100644 --- a/src/backend/port/dynloader/openbsd.h +++ b/src/backend/port/dynloader/openbsd.h @@ -18,7 +18,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index f211ebf43ca..e6b8f03097a 100644 --- a/src/backend/port/dynloader/osf.h +++ b/src/backend/port/dynloader/osf.h @@ -16,7 +16,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Alpha OSF/1.x diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index 2774e9efde4..6bffc3552b2 100644 --- a/src/backend/port/dynloader/sco.h +++ b/src/backend/port/dynloader/sco.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SCO 3.2v5.0.2 diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index 75c1255f8ad..99ab13e97fa 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index c65ad43dd54..f5a043bd9c9 100644 --- a/src/backend/port/dynloader/sunos4.h +++ b/src/backend/port/dynloader/sunos4.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SunOS 4. diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index 2f34fed6782..790fde1abce 100644 --- a/src/backend/port/dynloader/svr4.h +++ b/src/backend/port/dynloader/svr4.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 68e5c40e1a5..359e2ed87a2 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -18,7 +18,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index b046968afa6..f8fb105c10d 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -18,7 +18,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 14e592d7bca..7443d807718 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -50,22 +50,14 @@ #include <unistd.h> #include "access/xlog_internal.h" -#include "catalog/pg_control.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "replication/syncrep.h" #include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.h" #include "storage/pmsignal.h" -#include "storage/shmem.h" #include "storage/smgr.h" -#include "storage/spin.h" -#include "tcop/tcopprot.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c index 141167786d9..a5161994845 100644 --- a/src/backend/postmaster/walwriter.c +++ b/src/backend/postmaster/walwriter.c @@ -50,13 +50,9 @@ #include "miscadmin.h" #include "postmaster/walwriter.h" #include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.h" #include "storage/pmsignal.h" #include "storage/smgr.h" -#include "utils/guc.h" -#include "utils/hsearch.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 56deeeb7a19..65e0a59d08a 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -46,20 +46,10 @@ #include <unistd.h> #include "access/xact.h" -#include "access/xlog_internal.h" #include "miscadmin.h" -#include "postmaster/autovacuum.h" -#include "replication/syncrep.h" -#include "replication/walsender.h" -#include "storage/latch.h" -#include "storage/ipc.h" #include "storage/pmsignal.h" -#include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/guc.h" -#include "utils/guc_tables.h" -#include "utils/memutils.h" #include "utils/ps_status.h" /* User-settable parameters for sync rep */ diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index b4ece49a109..f4c6cc36722 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -38,19 +38,14 @@ #include <signal.h> #include <unistd.h> -#include "access/transam.h" #include "access/xlog_internal.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "replication/walprotocol.h" #include "replication/walreceiver.h" -#include "replication/walsender.h" #include "storage/ipc.h" #include "storage/pmsignal.h" #include "storage/procarray.h" -#include "utils/builtins.h" -#include "utils/guc.h" -#include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/resowner.h" diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index 587949bfdb9..fe009b5332b 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -25,10 +25,7 @@ #include "access/xlog_internal.h" #include "replication/walreceiver.h" -#include "storage/fd.h" #include "storage/pmsignal.h" -#include "storage/shmem.h" -#include "utils/guc.h" WalRcvData *WalRcv = NULL; diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 84b5037bb3c..3b311087756 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/pg_type.h" #include "commands/trigger.h" diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index cec22ac6a80..917bb464933 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -27,7 +27,6 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 4d6f508e0b6..a0b43006afd 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -16,7 +16,6 @@ #include "access/heapam.h" #include "catalog/indexing.h" -#include "catalog/pg_class.h" #include "catalog/pg_rewrite.h" #include "rewrite/rewriteSupport.h" #include "utils/fmgroids.h" diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index c59ad1cb652..88843b1c273 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -13,11 +13,8 @@ #include "postgres.h" #include "commands/defrem.h" -#include "fmgr.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" /* Some platforms define MAXINT and/or MININT, causing conflicts */ #ifdef MAXINT diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 8816a5dfab4..6acb6eb0e24 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -19,7 +19,6 @@ #include "executor/instrument.h" #include "storage/buf_internals.h" #include "storage/bufmgr.h" -#include "storage/smgr.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 1a5a874c86a..931b8814967 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -26,14 +26,10 @@ #include "access/htup.h" #include "access/xlogutils.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/bufpage.h" #include "storage/freespace.h" #include "storage/fsm_internals.h" #include "storage/lmgr.h" -#include "storage/lwlock.h" #include "storage/smgr.h" -#include "utils/rel.h" /* diff --git a/src/backend/storage/freespace/indexfsm.c b/src/backend/storage/freespace/indexfsm.c index 0994e61bbb9..fa8f49e881f 100644 --- a/src/backend/storage/freespace/indexfsm.c +++ b/src/backend/storage/freespace/indexfsm.c @@ -24,7 +24,6 @@ #include "storage/freespace.h" #include "storage/indexfsm.h" -#include "storage/smgr.h" /* * Exported routines diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index e7593fa2ebe..ba0cfde28a3 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -52,8 +52,6 @@ #include "access/twophase.h" #include "miscadmin.h" #include "storage/procarray.h" -#include "storage/spin.h" -#include "storage/standby.h" #include "utils/builtins.h" #include "utils/snapmgr.h" diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c index 28bcaa7e1ea..c8a9e867276 100644 --- a/src/backend/storage/ipc/procsignal.c +++ b/src/backend/storage/ipc/procsignal.c @@ -21,11 +21,7 @@ #include "commands/async.h" #include "miscadmin.h" #include "storage/ipc.h" -#include "storage/latch.h" -#include "storage/procsignal.h" -#include "storage/shmem.h" #include "storage/sinval.h" -#include "storage/standby.h" #include "tcop/tcopprot.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index e0441f5bf1c..fed6d2e9fae 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -35,21 +35,17 @@ #include "access/sysattr.h" #include "access/tuptoaster.h" #include "access/xact.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" -#include "commands/comment.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" #include "storage/large_object.h" #include "utils/fmgroids.h" #include "utils/rel.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" -#include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 8fae67ebbb5..2fe610532c4 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -29,8 +29,6 @@ #include "pg_trace.h" #include "storage/ipc.h" #include "storage/predicate.h" -#include "storage/proc.h" -#include "storage/spin.h" /* We use the ShmemLock spinlock to protect LWLockAssign */ diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 6bd38127105..018f9c102d3 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/htup.h" -#include "storage/bufpage.h" /* ---------------------------------------------------------------- diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index be89ee6d919..5f1497d5f46 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -17,13 +17,10 @@ */ #include "postgres.h" -#include "access/xlogutils.h" -#include "catalog/catalog.h" #include "commands/tablespace.h" #include "storage/bufmgr.h" #include "storage/ipc.h" #include "storage/smgr.h" -#include "utils/hsearch.h" #include "utils/inval.h" diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index b7649c68fcf..466727b7b82 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -17,12 +17,10 @@ #include "access/xact.h" #include "commands/prepare.h" -#include "commands/trigger.h" #include "executor/tstoreReceiver.h" #include "miscadmin.h" #include "pg_trace.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/memutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c index 31929c00acf..dd22e3aa4b1 100644 --- a/src/backend/tsearch/dict_ispell.c +++ b/src/backend/tsearch/dict_ispell.c @@ -16,9 +16,7 @@ #include "commands/defrem.h" #include "tsearch/dicts/spell.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index 24e9732cde5..d6fac0e1218 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -15,9 +15,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c index d2298b37387..0788b3da847 100644 --- a/src/backend/tsearch/dict_synonym.c +++ b/src/backend/tsearch/dict_synonym.c @@ -15,9 +15,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct { diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c index 7ff28b80b36..509420f70d0 100644 --- a/src/backend/tsearch/dict_thesaurus.c +++ b/src/backend/tsearch/dict_thesaurus.c @@ -17,7 +17,6 @@ #include "commands/defrem.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 5284c9c7149..d143aaebfac 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -13,11 +13,9 @@ */ #include "postgres.h" -#include "catalog/namespace.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/syscache.h" Datum diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index 5c2962c011e..ddd08c79990 100644 --- a/src/backend/tsearch/ts_parse.c +++ b/src/backend/tsearch/ts_parse.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #define IGNORE_LONGLEXEME 1 diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c index 2654d644579..1ca5cf0cb1d 100644 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@ -18,7 +18,6 @@ #include "commands/vacuum.h" #include "tsearch/ts_type.h" #include "utils/builtins.h" -#include "utils/hsearch.h" /* A hash key for lexemes */ diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index abf53c00197..c728ee2d2ac 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -18,9 +18,7 @@ #include "miscadmin.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" /* diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index bda8d2632d9..f81d42eaf0c 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -14,20 +14,12 @@ #include "postgres.h" #include "funcapi.h" -#include "access/genam.h" -#include "access/skey.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" -#include "catalog/pg_ts_parser.h" #include "catalog/pg_type.h" #include "commands/defrem.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" -#include "utils/rel.h" -#include "utils/syscache.h" /******sql-level interface******/ diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 3e43e951e10..8705725580d 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -18,8 +18,6 @@ #include "funcapi.h" #include "libpq/pqformat.h" -#include "parser/parse_coerce.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/datum.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c index c178fd0bddb..674229a84ea 100644 --- a/src/backend/utils/adt/domains.c +++ b/src/backend/utils/adt/domains.c @@ -33,7 +33,6 @@ #include "commands/typecmds.h" #include "executor/executor.h" -#include "lib/stringinfo.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 8f65c84d305..f9ab3581299 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -17,9 +17,7 @@ #include "access/heapam.h" #include "catalog/indexing.h" #include "catalog/pg_enum.h" -#include "fmgr.h" #include "libpq/pqformat.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 6b3f77fec14..dfe38f555f5 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -28,7 +28,6 @@ #include "storage/fd.h" #include "utils/builtins.h" #include "utils/memutils.h" -#include "utils/timestamp.h" typedef struct { diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index 1d32d2f04f6..0ef217b110d 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -30,7 +30,6 @@ static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 m #include <assert.h> #include <ctype.h> -#include "utils/builtins.h" #include "utils/inet.h" diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index a367421f82b..fadcf7ace0f 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -34,7 +34,6 @@ #include "catalog/pg_type.h" #include "funcapi.h" #include "libpq/pqformat.h" -#include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 0d9f482f330..0d21f9299e1 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -16,7 +16,6 @@ #include "funcapi.h" #include "miscadmin.h" #include "storage/predicate_internals.h" -#include "storage/proc.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 5bda4af50fd..5a77340bdb0 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -19,7 +19,6 @@ #include <dirent.h> #include <math.h> -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/pg_type.h" #include "catalog/pg_tablespace.h" diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 0dbbd6715c9..61362c97e1b 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -33,7 +33,6 @@ #include "funcapi.h" #include "regex/regex.h" #include "utils/builtins.h" -#include "utils/guc.h" #define PG_GETARG_TEXT_PP_IF_EXISTS(_n) \ (PG_NARGS() > (_n) ? PG_GETARG_TEXT_PP(_n) : NULL) diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 4b85b9b4021..bf9b2bc5f03 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -42,10 +42,8 @@ #include "parser/parse_coerce.h" #include "parser/parse_relation.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 3fd99e00e36..f25c50f9a49 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -18,7 +18,6 @@ #include <unistd.h> #include <fcntl.h> -#include "access/genam.h" #include "access/sysattr.h" #include "catalog/dependency.h" #include "catalog/indexing.h" @@ -48,7 +47,6 @@ #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" #include "rewrite/rewriteSupport.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c index 474878de7d9..c2b4a927efd 100644 --- a/src/backend/utils/adt/trigfuncs.c +++ b/src/backend/utils/adt/trigfuncs.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "access/htup.h" #include "commands/trigger.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index 2189a1a20ec..1ac2b17237f 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -16,9 +16,7 @@ #include "access/gist.h" #include "access/tuptoaster.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" -#include "utils/pg_crc.h" #define SIGLENINT 31 /* >121 => key will toast, so it will not work diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 5baa02b1c03..a60989abd3b 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -17,11 +17,9 @@ #include "libpq/pqformat.h" #include "miscadmin.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" #include "utils/memutils.h" -#include "utils/pg_crc.h" struct TSQueryParserStateData diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 9feb4b796a6..3e0b99afeb8 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -15,7 +15,6 @@ #include "postgres.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 2ecb13e3b9f..bef86036dc1 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -16,7 +16,6 @@ #include "access/skey.h" #include "access/gist.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #define GETENTRY(vec,pos) DatumGetTSQuerySign((vec)->vector[pos].key) diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c index 4cf628772c5..59d9d20b7e5 100644 --- a/src/backend/utils/adt/tsquery_op.c +++ b/src/backend/utils/adt/tsquery_op.c @@ -14,10 +14,7 @@ #include "postgres.h" -#include "tsearch/ts_type.h" -#include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" -#include "utils/pg_crc.h" Datum tsquery_numnode(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index e2faed26d36..974ce6a0197 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -17,7 +17,6 @@ #include "catalog/pg_type.h" #include "executor/spi.h" #include "miscadmin.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index 53093f1e864..003b83e7704 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -14,7 +14,6 @@ #include "postgres.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 8f5941c1476..564d855817a 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -15,7 +15,6 @@ #include <math.h> -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/array.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 6810615a253..cb9a87d03ec 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "libpq/pqformat.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index be7978561f7..285a484aa43 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -21,7 +21,6 @@ #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c index 65eec005639..20349a63d97 100644 --- a/src/backend/utils/adt/tsvector_parser.c +++ b/src/backend/utils/adt/tsvector_parser.c @@ -14,11 +14,8 @@ #include "postgres.h" -#include "libpq/pqformat.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" -#include "utils/memutils.h" /* diff --git a/src/backend/utils/cache/attoptcache.c b/src/backend/utils/cache/attoptcache.c index ba39aa8ee7f..179e6a6cc3d 100644 --- a/src/backend/utils/cache/attoptcache.c +++ b/src/backend/utils/cache/attoptcache.c @@ -17,12 +17,9 @@ #include "postgres.h" #include "access/reloptions.h" -#include "catalog/pg_attribute.h" #include "utils/attoptcache.h" -#include "utils/catcache.h" #include "utils/hsearch.h" #include "utils/inval.h" -#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 8792ec40842..337fe64e10c 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -86,10 +86,8 @@ */ #include "postgres.h" -#include "access/twophase_rmgr.h" #include "access/xact.h" #include "catalog/catalog.h" -#include "catalog/pg_tablespace.h" #include "miscadmin.h" #include "storage/sinval.h" #include "storage/smgr.h" diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index 1410dec1e90..68b6783e196 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -41,7 +41,6 @@ */ #include "postgres.h" -#include "utils/plancache.h" #include "access/transam.h" #include "catalog/namespace.h" #include "executor/executor.h" @@ -52,11 +51,9 @@ #include "parser/parsetree.h" #include "storage/lmgr.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index d969510cab3..6101ef8071e 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -30,7 +30,6 @@ #include <fcntl.h> #include <unistd.h> -#include "access/genam.h" #include "access/reloptions.h" #include "access/sysattr.h" #include "access/transam.h" @@ -61,16 +60,13 @@ #include "optimizer/prep.h" #include "optimizer/var.h" #include "rewrite/rewriteDefine.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/smgr.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/resowner.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index b04dc9e3497..9337181f687 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -49,9 +49,7 @@ #include "catalog/storage.h" #include "miscadmin.h" #include "storage/fd.h" -#include "storage/lwlock.h" #include "utils/inval.h" -#include "utils/pg_crc.h" #include "utils/relmapper.h" diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c index b505f219243..54d8d6f8080 100644 --- a/src/backend/utils/cache/spccache.c +++ b/src/backend/utils/cache/spccache.c @@ -23,8 +23,6 @@ #include "commands/tablespace.h" #include "miscadmin.h" #include "optimizer/cost.h" -#include "utils/catcache.h" -#include "utils/hsearch.h" #include "utils/inval.h" #include "utils/spccache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c index cffa2384385..be29a910ea2 100644 --- a/src/backend/utils/cache/ts_cache.c +++ b/src/backend/utils/cache/ts_cache.c @@ -36,11 +36,8 @@ #include "catalog/pg_ts_dict.h" #include "catalog/pg_ts_parser.h" #include "catalog/pg_ts_template.h" -#include "catalog/pg_type.h" #include "commands/defrem.h" -#include "miscadmin.h" #include "tsearch/ts_cache.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/inval.h" diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index b16ed6a2089..924ee573025 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -60,7 +60,6 @@ #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "utils/tqual.h" #include "utils/typcache.h" diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 02ee92b7159..3861f402c3d 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -13,14 +13,12 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "catalog/namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" #include "parser/parse_coerce.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index d9027291ee3..dad7994923c 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -64,8 +64,6 @@ #include "postgres.h" #include "access/xact.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "utils/dynahash.h" #include "utils/memutils.h" diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index 7406d266db5..898475514af 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -22,7 +22,6 @@ #include "postgres.h" #include "access/hash.h" -#include "nodes/bitmapset.h" /* diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index e5461e660ef..773a0d82ef8 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -21,12 +21,9 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "storage/predicate.h" -#include "storage/proc.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index dcfb8f957a9..3505236e5d3 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -100,11 +100,8 @@ #include <limits.h> -#include "access/genam.h" #include "access/nbtree.h" #include "catalog/index.h" -#include "catalog/pg_amop.h" -#include "catalog/pg_operator.h" #include "commands/tablespace.h" #include "executor/executor.h" #include "miscadmin.h" @@ -115,7 +112,6 @@ #include "utils/memutils.h" #include "utils/pg_rusage.h" #include "utils/rel.h" -#include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index 4d6e3aa0e4b..b28532be578 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -59,7 +59,6 @@ #include "storage/buffile.h" #include "utils/memutils.h" #include "utils/resowner.h" -#include "utils/tuplestore.h" /* diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c index d9b37b2ba3f..28c8a172204 100644 --- a/src/backend/utils/time/combocid.c +++ b/src/backend/utils/time/combocid.c @@ -41,10 +41,8 @@ #include "postgres.h" -#include "access/htup.h" #include "access/xact.h" #include "utils/combocid.h" -#include "utils/hsearch.h" #include "utils/memutils.h" diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index ef66466baf1..4b674c7c425 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -28,11 +28,9 @@ #include "access/transam.h" #include "access/xact.h" #include "storage/predicate.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/memutils.h" #include "utils/memutils.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/tqual.h" diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index 9224d7bbe2e..55ff39a4fe8 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -24,7 +24,6 @@ *------------------------------------------------------------------------- */ -#include "pg_backup_archiver.h" #include "compress_io.h" /*-------- diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index 111c3e822a8..2e110acfff0 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -33,7 +33,6 @@ *------------------------------------------------------------------------- */ -#include "pg_backup_archiver.h" #include "compress_io.h" #include <dirent.h> diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index 248a4db0428..ff9293a07a7 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -12,7 +12,6 @@ #include "postgres_fe.h" #include "mbprint.h" -#include "libpq-fe.h" #ifndef PGSCRIPTS #include "settings.h" #endif diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index 2bb3f3153b8..cec216fbc07 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -8,7 +8,6 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include "libpq-fe.h" #include "variables.h" #include "print.h" diff --git a/src/include/access/genam.h b/src/include/access/genam.h index a95b3d745bc..7154ae385ba 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -17,7 +17,6 @@ #include "access/sdir.h" #include "access/skey.h" #include "nodes/tidbitmap.h" -#include "storage/buf.h" #include "storage/lock.h" #include "utils/relcache.h" #include "utils/snapshot.h" diff --git a/src/include/access/gin.h b/src/include/access/gin.h index 31e9733546a..aeba4c1e080 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -11,7 +11,6 @@ #define GIN_H #include "access/xlog.h" -#include "storage/block.h" #include "utils/relcache.h" diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 56036a83702..b8d06abf1f3 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -14,13 +14,9 @@ #ifndef HEAPAM_H #define HEAPAM_H -#include "access/htup.h" #include "access/sdir.h" #include "access/skey.h" #include "access/xlog.h" -#include "nodes/primnodes.h" -#include "storage/bufpage.h" -#include "storage/lock.h" #include "utils/relcache.h" #include "utils/snapshot.h" diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index 977e0b47481..1ae44e0e695 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -14,7 +14,6 @@ #define TUPTOASTER_H #include "access/htup.h" -#include "storage/bufpage.h" #include "utils/relcache.h" /* diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index 799bf8bf38e..0019df5f0c0 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -14,10 +14,7 @@ #ifndef TWOPHASE_H #define TWOPHASE_H -#include "access/xlogdefs.h" -#include "storage/backendid.h" #include "storage/proc.h" -#include "utils/timestamp.h" /* * GlobalTransactionData is defined in twophase.c; other places have no diff --git a/src/include/access/xact.h b/src/include/access/xact.h index c585752b004..575bcd3cde1 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -15,9 +15,6 @@ #define XACT_H #include "access/xlog.h" -#include "nodes/pg_list.h" -#include "storage/relfilenode.h" -#include "utils/timestamp.h" /* diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 4eaa243948b..097072ced13 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -17,10 +17,6 @@ #define XLOG_INTERNAL_H #include "access/xlog.h" -#include "fmgr.h" -#include "pgtime.h" -#include "storage/block.h" -#include "storage/relfilenode.h" /* diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index bc3db143eb5..5a26d268896 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -11,11 +11,7 @@ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H -#include "storage/buf.h" #include "storage/bufmgr.h" -#include "storage/relfilenode.h" -#include "storage/block.h" -#include "utils/relcache.h" extern void XLogCheckInvalidPages(void); diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index e4f1535db3a..1e1e12d36de 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -14,7 +14,6 @@ #ifndef CATALOG_H #define CATALOG_H -#include "catalog/catversion.h" #include "catalog/pg_class.h" #include "storage/relfilenode.h" #include "utils/relcache.h" diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h index 5dfb25fee74..5302e50b4e3 100644 --- a/src/include/catalog/dependency.h +++ b/src/include/catalog/dependency.h @@ -14,7 +14,6 @@ #ifndef DEPENDENCY_H #define DEPENDENCY_H -#include "nodes/parsenodes.h" /* for DropBehavior */ #include "catalog/objectaddress.h" diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h index cda9b72827d..438635c31a4 100644 --- a/src/include/catalog/pg_db_role_setting.h +++ b/src/include/catalog/pg_db_role_setting.h @@ -21,8 +21,6 @@ #ifndef PG_DB_ROLE_SETTING_H #define PG_DB_ROLE_SETTING_H -#include "catalog/genbki.h" -#include "nodes/parsenodes.h" #include "utils/guc.h" #include "utils/relcache.h" diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h index 6907d836708..5b4d674e5df 100644 --- a/src/include/catalog/storage.h +++ b/src/include/catalog/storage.h @@ -15,9 +15,6 @@ #define STORAGE_H #include "access/xlog.h" -#include "lib/stringinfo.h" -#include "storage/block.h" -#include "storage/relfilenode.h" #include "utils/relcache.h" extern void RelationCreateStorage(RelFileNode rnode, char relpersistence); diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h index e942b538af9..6cf9de1eca6 100644 --- a/src/include/commands/alter.h +++ b/src/include/commands/alter.h @@ -14,7 +14,6 @@ #ifndef ALTER_H #define ALTER_H -#include "nodes/parsenodes.h" #include "utils/acl.h" #include "utils/relcache.h" diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index a31479defb5..06337e61149 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -15,8 +15,6 @@ #define COPY_H #include "nodes/execnodes.h" -#include "nodes/parsenodes.h" -#include "tcop/dest.h" /* CopyStateData is private in commands/copy.c */ typedef struct CopyStateData *CopyState; diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 21dacff39c7..e704380b604 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -15,7 +15,6 @@ #define DBCOMMANDS_H #include "access/xlog.h" -#include "nodes/parsenodes.h" /* XLOG stuff */ #define XLOG_DBASE_CREATE 0x00 diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index c64aabf0bad..49605da63eb 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -14,8 +14,6 @@ #ifndef PORTALCMDS_H #define PORTALCMDS_H -#include "nodes/parsenodes.h" -#include "nodes/plannodes.h" #include "utils/portal.h" diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index 4375fdbafe7..63c06ad8d69 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -15,7 +15,6 @@ #include "commands/explain.h" #include "utils/plancache.h" -#include "utils/timestamp.h" /* * The data structure representing a prepared statement. This is now just diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h index 1a0282c8ca7..8c7ecbf76b0 100644 --- a/src/include/commands/seclabel.h +++ b/src/include/commands/seclabel.h @@ -10,8 +10,6 @@ #define SECLABEL_H #include "catalog/objectaddress.h" -#include "nodes/primnodes.h" -#include "nodes/parsenodes.h" /* * Internal APIs diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 3f3ba529484..1ef0f91e95a 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -13,10 +13,7 @@ #ifndef SEQUENCE_H #define SEQUENCE_H -#include "nodes/parsenodes.h" -#include "storage/relfilenode.h" #include "access/xlog.h" -#include "fmgr.h" typedef struct FormData_pg_sequence diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h index 4692098a65f..5b1fb6eddc5 100644 --- a/src/include/commands/tablespace.h +++ b/src/include/commands/tablespace.h @@ -15,7 +15,6 @@ #define TABLESPACE_H #include "access/xlog.h" -#include "nodes/parsenodes.h" /* XLOG stuff */ #define XLOG_TBLSPC_CREATE 0x00 diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index fe21298b648..3ac4a823ec1 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -14,7 +14,6 @@ #define TRIGGER_H #include "nodes/execnodes.h" -#include "nodes/parsenodes.h" /* * TriggerData is the node type that is passed as fmgr "context" info diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 1a636a09870..1c00b0dd27d 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -16,8 +16,6 @@ #define EXECDESC_H #include "nodes/execnodes.h" -#include "nodes/plannodes.h" -#include "tcop/dest.h" /* ---------------- diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index aaa36c5826d..d565469b267 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -15,7 +15,6 @@ #define FUNCTIONS_H #include "nodes/execnodes.h" -#include "tcop/dest.h" /* This struct is known only within executor/functions.c */ typedef struct SQLFunctionParseInfo *SQLFunctionParseInfoPtr; diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 0c6e06f8ff5..85e595be1b7 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -14,7 +14,6 @@ #ifndef HASHJOIN_H #define HASHJOIN_H -#include "fmgr.h" #include "nodes/execnodes.h" #include "storage/buffile.h" diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 98d194a37d3..d0c7696d34c 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -13,10 +13,7 @@ #ifndef SPI_H #define SPI_H -#include "nodes/parsenodes.h" #include "utils/portal.h" -#include "utils/relcache.h" -#include "utils/snapshot.h" typedef struct SPITupleTable diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index f774f2d0ab6..69ade2fd4c9 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -15,7 +15,6 @@ #define TUPTABLE_H #include "access/htup.h" -#include "access/tupdesc.h" #include "storage/buf.h" /*---------- diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 1e490441912..c49f30c61d9 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -12,7 +12,6 @@ #define HBA_H #include "nodes/pg_list.h" -#include "libpq/pqcomm.h" typedef enum UserAuth diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h index 149c1ff9b48..0b5d2e364f6 100644 --- a/src/include/libpq/ip.h +++ b/src/include/libpq/ip.h @@ -15,8 +15,8 @@ #ifndef IP_H #define IP_H -#include "getaddrinfo.h" -#include "libpq/pqcomm.h" +#include "getaddrinfo.h" /* pgrminclude ignore */ +#include "libpq/pqcomm.h" /* pgrminclude ignore */ #ifdef HAVE_UNIX_SOCKETS diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 6ed739c290c..b3eed7d189c 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -16,13 +16,9 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/skey.h" #include "nodes/params.h" #include "nodes/plannodes.h" -#include "nodes/tidbitmap.h" -#include "utils/hsearch.h" #include "utils/reltrigger.h" -#include "utils/snapshot.h" #include "utils/tuplestore.h" diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 3b87e181bd1..8bac7b024b9 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -14,7 +14,6 @@ #ifndef PRINT_H #define PRINT_H -#include "nodes/parsenodes.h" #include "executor/tuptable.h" diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index f6592697e44..722567df5c0 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -15,7 +15,6 @@ #define RELATION_H #include "access/sdir.h" -#include "nodes/bitmapset.h" #include "nodes/params.h" #include "nodes/parsenodes.h" #include "storage/block.h" diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 83d80671f34..fcafbcd515c 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -22,7 +22,6 @@ #ifndef GEQO_MISC_H #define GEQO_MISC_H -#include "optimizer/geqo.h" #include "optimizer/geqo_recombination.h" #ifdef GEQO_DEBUG diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h index cf82363ce76..682cabe2c6d 100644 --- a/src/include/postmaster/autovacuum.h +++ b/src/include/postmaster/autovacuum.h @@ -14,7 +14,6 @@ #ifndef AUTOVACUUM_H #define AUTOVACUUM_H -#include "storage/lock.h" /* GUC variables */ extern bool autovacuum_start_daemon; diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h index 876d2aa61f9..465072d17ae 100644 --- a/src/include/replication/walsender.h +++ b/src/include/replication/walsender.h @@ -16,9 +16,9 @@ #include "nodes/nodes.h" #include "storage/latch.h" #include "replication/syncrep.h" +#include "storage/shmem.h" #include "storage/spin.h" - typedef enum WalSndState { WALSNDSTATE_STARTUP = 0, diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 1c15db8f101..54dc6499a3d 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -15,7 +15,6 @@ #define FREESPACE_H_ #include "storage/block.h" -#include "storage/bufpage.h" #include "storage/relfilenode.h" #include "utils/relcache.h" diff --git a/src/include/storage/fsm_internals.h b/src/include/storage/fsm_internals.h index 4508b7c9c62..8b5a2dbc1b6 100644 --- a/src/include/storage/fsm_internals.h +++ b/src/include/storage/fsm_internals.h @@ -16,7 +16,6 @@ #include "storage/buf.h" #include "storage/bufpage.h" -#include "lib/stringinfo.h" /* * Structure of a FSM page. See src/backend/storage/freespace/README for diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index 3c20fc48f67..a11d4385b7d 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -14,8 +14,6 @@ #ifndef PROCARRAY_H #define PROCARRAY_H -#include "storage/lock.h" -#include "storage/procsignal.h" #include "storage/standby.h" #include "utils/snapshot.h" diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index e4792668c27..96d0642a0ac 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -14,9 +14,7 @@ #ifndef SMGR_H #define SMGR_H -#include "access/xlog.h" #include "fmgr.h" -#include "storage/backendid.h" #include "storage/block.h" #include "storage/relfilenode.h" diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index 6ebac62db54..d2e3e92d19c 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -15,9 +15,7 @@ #define STANDBY_H #include "access/xlog.h" -#include "storage/lock.h" #include "storage/procsignal.h" -#include "storage/relfilenode.h" /* User-settable GUC parameters */ extern int vacuum_defer_cleanup_age; diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 2a5e871c92a..018577ecadc 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -14,7 +14,6 @@ #ifndef PQUERY_H #define PQUERY_H -#include "nodes/parsenodes.h" #include "utils/portal.h" diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index d5192d98558..898c7326816 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -20,9 +20,7 @@ #define TCOPPROT_H #include "executor/execdesc.h" -#include "nodes/parsenodes.h" #include "storage/procsignal.h" -#include "utils/guc.h" /* Required daylight between max_stack_depth and the kernel limit, in bytes */ diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h index 01550eddfe3..84e451ce6d8 100644 --- a/src/include/tsearch/ts_cache.h +++ b/src/include/tsearch/ts_cache.h @@ -13,7 +13,6 @@ #ifndef TS_CACHE_H #define TS_CACHE_H -#include "fmgr.h" #include "utils/guc.h" diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index 606b778f10e..fbcddbc245e 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -15,7 +15,6 @@ #define INVAL_H #include "access/htup.h" -#include "storage/relfilenode.h" #include "utils/relcache.h" diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index f4490adc318..215951589af 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -13,9 +13,7 @@ #ifndef LSYSCACHE_H #define LSYSCACHE_H -#include "access/attnum.h" #include "access/htup.h" -#include "nodes/pg_list.h" /* Result list element for get_op_btree_interpretation */ typedef struct OpBtreeInterpretation diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index fc49ee3acc0..9aaf9695f53 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -16,7 +16,6 @@ #include "access/tupdesc.h" #include "nodes/bitmapset.h" -#include "nodes/pg_list.h" typedef struct RelationData *Relation; diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 2d08312b34f..cff0ac8b495 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -19,7 +19,6 @@ #ifndef RESOWNER_H #define RESOWNER_H -#include "storage/buf.h" #include "storage/fd.h" #include "utils/catcache.h" #include "utils/plancache.h" diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index a7e7d3dc2be..c969a377961 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -14,7 +14,6 @@ #define SNAPMGR_H #include "utils/resowner.h" -#include "utils/snapshot.h" extern bool FirstSnapshotSet; diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index c9f081e99e3..afc745612ec 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -18,17 +18,12 @@ #include <ctype.h> #include "catalog/namespace.h" -#include "catalog/pg_attrdef.h" -#include "catalog/pg_attribute.h" -#include "catalog/pg_class.h" #include "catalog/pg_proc.h" #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/makefuncs.h" #include "parser/parse_type.h" -#include "tcop/tcopprot.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c index e6e71432ff9..a10e418b33a 100644 --- a/src/pl/plpgsql/src/pl_handler.c +++ b/src/pl/plpgsql/src/pl_handler.c @@ -20,7 +20,6 @@ #include "funcapi.h" #include "miscadmin.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index c543f1cf9dd..ed8fcadb207 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -19,12 +19,8 @@ #include "postgres.h" #include "access/xact.h" -#include "fmgr.h" #include "commands/trigger.h" #include "executor/spi.h" -#include "lib/stringinfo.h" -#include "nodes/bitmapset.h" -#include "utils/tuplestore.h" /********************************************************************** * Definitions |