From 9be4e5d293b554d8a0800790c57fc707a3b5cf0f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 28 Oct 2024 08:02:17 +0100 Subject: [PATCH] Remove unused #include's from contrib, pl, test .c files as determined by IWYU Similar to commit dbbca2cf299, but for contrib, pl, and src/test/. Reviewed-by: Alvaro Herrera Discussion: https://www.postgresql.org/message-id/flat/0df1d5b1-8ca8-4f84-93be-121081bde049%40eisentraut.org --- contrib/amcheck/verify_heapam.c | 6 ++- contrib/amcheck/verify_nbtree.c | 2 - contrib/auth_delay/auth_delay.c | 2 - contrib/auto_explain/auto_explain.c | 2 - contrib/basic_archive/basic_archive.c | 1 - contrib/bloom/blcost.c | 1 - contrib/bloom/blinsert.c | 4 +- contrib/bloom/blscan.c | 4 -- contrib/bloom/blutils.c | 5 +-- contrib/bloom/blvacuum.c | 4 -- contrib/bloom/blvalidate.c | 2 - contrib/btree_gin/btree_gin.c | 3 -- contrib/btree_gist/btree_bit.c | 3 +- contrib/btree_gist/btree_bool.c | 1 - contrib/btree_gist/btree_bytea.c | 3 +- contrib/btree_gist/btree_date.c | 2 +- contrib/btree_gist/btree_enum.c | 2 +- contrib/btree_gist/btree_inet.c | 1 - contrib/btree_gist/btree_interval.c | 2 +- contrib/btree_gist/btree_macaddr.c | 2 +- contrib/btree_gist/btree_macaddr8.c | 2 +- contrib/btree_gist/btree_text.c | 3 +- contrib/btree_gist/btree_time.c | 2 +- contrib/btree_gist/btree_ts.c | 4 +- contrib/btree_gist/btree_utils_num.h | 1 - contrib/btree_gist/btree_utils_var.c | 3 +- contrib/btree_gist/btree_utils_var.h | 1 - contrib/citext/citext.c | 2 +- contrib/dict_xsyn/dict_xsyn.c | 2 +- contrib/fuzzystrmatch/fuzzystrmatch.c | 1 - contrib/intarray/_int_bool.c | 1 - contrib/intarray/_int_selfuncs.c | 3 +- contrib/isn/isn.c | 1 - contrib/lo/lo.c | 2 +- contrib/ltree/ltree_io.c | 1 - contrib/ltree/ltree_op.c | 4 +- contrib/pageinspect/brinfuncs.c | 4 -- contrib/pageinspect/fsmfuncs.c | 2 +- contrib/pageinspect/ginfuncs.c | 3 -- contrib/pageinspect/gistfuncs.c | 3 -- contrib/pageinspect/heapfuncs.c | 1 - contrib/pg_freespacemap/pg_freespacemap.c | 2 +- contrib/pg_prewarm/autoprewarm.c | 9 +---- .../pg_stat_statements/pg_stat_statements.c | 3 -- contrib/pg_surgery/heap_surgery.c | 4 +- contrib/pg_visibility/pg_visibility.c | 2 - contrib/pgcrypto/pgcrypto.c | 1 - contrib/pgrowlocks/pgrowlocks.c | 2 +- contrib/pgstattuple/pgstatapprox.c | 6 --- contrib/pgstattuple/pgstatindex.c | 3 -- contrib/pgstattuple/pgstattuple.c | 1 - contrib/postgres_fdw/connection.c | 4 -- contrib/postgres_fdw/deparse.c | 2 - contrib/postgres_fdw/option.c | 1 - contrib/postgres_fdw/postgres_fdw.c | 3 -- contrib/spi/moddatetime.c | 2 +- contrib/tablefunc/tablefunc.c | 2 +- contrib/tablefunc/tablefunc.h | 39 ------------------- contrib/tsm_system_rows/tsm_system_rows.c | 1 - contrib/tsm_system_time/tsm_system_time.c | 1 - contrib/unaccent/unaccent.c | 2 - contrib/xml2/xpath.c | 1 - contrib/xml2/xslt_proc.c | 3 -- src/pl/plperl/plperl.c | 1 - src/pl/plpgsql/src/pl_comp.c | 3 +- src/pl/plpgsql/src/pl_exec.c | 5 --- src/pl/plpython/plpy_cursorobject.c | 2 - src/pl/plpython/plpy_exec.c | 4 +- src/pl/plpython/plpy_planobject.c | 1 - src/pl/plpython/plpy_plpymodule.c | 3 -- src/pl/plpython/plpy_procedure.c | 3 -- src/pl/plpython/plpy_spi.c | 3 -- src/pl/plpython/plpy_util.c | 1 - src/pl/tcl/pltcl.c | 3 +- .../modules/delay_execution/delay_execution.c | 2 +- .../modules/dummy_index_am/dummy_index_am.c | 2 - .../ldap_password_func/ldap_password_func.c | 4 +- .../modules/libpq_pipeline/libpq_pipeline.c | 2 - src/test/modules/plsample/plsample.c | 2 +- .../test_ddl_deparse/test_ddl_deparse.c | 1 - .../modules/test_integerset/test_integerset.c | 4 -- .../modules/test_oat_hooks/test_oat_hooks.c | 1 - .../modules/test_radixtree/test_radixtree.c | 2 - src/test/modules/test_regex/test_regex.c | 1 - .../test_resowner/test_resowner_basic.c | 2 - .../test_resowner/test_resowner_many.c | 1 - .../modules/test_rls_hooks/test_rls_hooks.c | 1 - src/test/modules/test_shm_mq/setup.c | 1 - src/test/modules/test_slru/test_multixact.c | 2 +- .../modules/test_tidstore/test_tidstore.c | 1 - src/test/modules/worker_spi/worker_spi.c | 4 -- src/test/regress/pg_regress.c | 1 - src/test/regress/regress.c | 3 -- 93 files changed, 40 insertions(+), 218 deletions(-) delete mode 100644 contrib/tablefunc/tablefunc.h diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c index f2526ed63a..9c74daacee 100644 --- a/contrib/amcheck/verify_heapam.c +++ b/contrib/amcheck/verify_heapam.c @@ -12,18 +12,22 @@ #include "access/detoast.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/heaptoast.h" #include "access/multixact.h" +#include "access/relation.h" +#include "access/table.h" #include "access/toast_internals.h" #include "access/visibilitymap.h" +#include "access/xact.h" #include "catalog/pg_am.h" +#include "catalog/pg_class.h" #include "funcapi.h" #include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/procarray.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" PG_FUNCTION_INFO_V1(verify_heapam); diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index 7cfb136763..8b82797c10 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -33,11 +33,9 @@ #include "catalog/index.h" #include "catalog/pg_am.h" #include "catalog/pg_opfamily_d.h" -#include "commands/tablecmds.h" #include "common/pg_prng.h" #include "lib/bloomfilter.h" #include "miscadmin.h" -#include "storage/lmgr.h" #include "storage/smgr.h" #include "utils/guc.h" #include "utils/memutils.h" diff --git a/contrib/auth_delay/auth_delay.c b/contrib/auth_delay/auth_delay.c index ff0e1fd461..e8dfef3290 100644 --- a/contrib/auth_delay/auth_delay.c +++ b/contrib/auth_delay/auth_delay.c @@ -14,9 +14,7 @@ #include #include "libpq/auth.h" -#include "port.h" #include "utils/guc.h" -#include "utils/timestamp.h" PG_MODULE_MAGIC; diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c index 677c135f59..623a674f99 100644 --- a/contrib/auto_explain/auto_explain.c +++ b/contrib/auto_explain/auto_explain.c @@ -18,8 +18,6 @@ #include "commands/explain.h" #include "common/pg_prng.h" #include "executor/instrument.h" -#include "jit/jit.h" -#include "nodes/params.h" #include "utils/guc.h" PG_MODULE_MAGIC; diff --git a/contrib/basic_archive/basic_archive.c b/contrib/basic_archive/basic_archive.c index 028cf51c25..36e2feb4fb 100644 --- a/contrib/basic_archive/basic_archive.c +++ b/contrib/basic_archive/basic_archive.c @@ -36,7 +36,6 @@ #include "storage/copydir.h" #include "storage/fd.h" #include "utils/guc.h" -#include "utils/memutils.h" PG_MODULE_MAGIC; diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c index 9b629b2c3d..0f2cf1546c 100644 --- a/contrib/bloom/blcost.c +++ b/contrib/bloom/blcost.c @@ -13,7 +13,6 @@ #include "postgres.h" #include "bloom.h" -#include "fmgr.h" #include "utils/selfuncs.h" /* diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index f8a1061abb..dbb79a51ed 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -16,11 +16,9 @@ #include "access/generic_xlog.h" #include "access/tableam.h" #include "bloom.h" -#include "catalog/index.h" #include "miscadmin.h" +#include "nodes/execnodes.h" #include "storage/bufmgr.h" -#include "storage/indexfsm.h" -#include "storage/smgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c index 94b6b449c8..bf455e579f 100644 --- a/contrib/bloom/blscan.c +++ b/contrib/bloom/blscan.c @@ -15,11 +15,7 @@ #include "access/relscan.h" #include "bloom.h" #include "miscadmin.h" -#include "pgstat.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" -#include "utils/memutils.h" -#include "utils/rel.h" /* * Begin scan of bloom index. diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c index a29330afcd..af10199394 100644 --- a/contrib/bloom/blutils.c +++ b/contrib/bloom/blutils.c @@ -17,14 +17,11 @@ #include "access/generic_xlog.h" #include "access/reloptions.h" #include "bloom.h" -#include "catalog/index.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" +#include "varatt.h" /* Signature dealing macros - note i is assumed to be of type int */ #define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) ) diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c index 0998240fea..2a268fe007 100644 --- a/contrib/bloom/blvacuum.c +++ b/contrib/bloom/blvacuum.c @@ -14,13 +14,9 @@ #include "access/genam.h" #include "bloom.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/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c index 88c5a79197..20d3ab9109 100644 --- a/contrib/bloom/blvalidate.c +++ b/contrib/bloom/blvalidate.c @@ -20,8 +20,6 @@ #include "catalog/pg_opclass.h" #include "catalog/pg_opfamily.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/regproc.h" #include "utils/syscache.h" diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c index 5e27906f80..533c55e9ea 100644 --- a/contrib/btree_gin/btree_gin.c +++ b/contrib/btree_gin/btree_gin.c @@ -7,15 +7,12 @@ #include "access/stratnum.h" #include "utils/builtins.h" -#include "utils/bytea.h" -#include "utils/cash.h" #include "utils/date.h" #include "utils/float.h" #include "utils/inet.h" #include "utils/numeric.h" #include "utils/timestamp.h" #include "utils/uuid.h" -#include "utils/varbit.h" PG_MODULE_MAGIC; diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 6790f22b4b..9d5e01a197 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -5,8 +5,7 @@ #include "btree_gist.h" #include "btree_utils_var.h" -#include "utils/builtins.h" -#include "utils/bytea.h" +#include "utils/fmgrprotos.h" #include "utils/varbit.h" diff --git a/contrib/btree_gist/btree_bool.c b/contrib/btree_gist/btree_bool.c index 8b2af129b5..bdc7834bb6 100644 --- a/contrib/btree_gist/btree_bool.c +++ b/contrib/btree_gist/btree_bool.c @@ -5,7 +5,6 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "common/int.h" typedef struct boolkey { diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c index 6b005f0157..394e40ed16 100644 --- a/contrib/btree_gist/btree_bytea.c +++ b/contrib/btree_gist/btree_bytea.c @@ -5,8 +5,7 @@ #include "btree_gist.h" #include "btree_utils_var.h" -#include "utils/builtins.h" -#include "utils/bytea.h" +#include "utils/fmgrprotos.h" /* diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c index 68a4107dbf..5efb5ef96f 100644 --- a/contrib/btree_gist/btree_date.c +++ b/contrib/btree_gist/btree_date.c @@ -5,7 +5,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/date.h" typedef struct diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c index d4dc38a38e..26682122f8 100644 --- a/contrib/btree_gist/btree_enum.c +++ b/contrib/btree_gist/btree_enum.c @@ -6,7 +6,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" #include "fmgr.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" /* enums are really Oids, so we just use the same structure */ diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c index 2fb952dca8..c66ca99e0c 100644 --- a/contrib/btree_gist/btree_inet.c +++ b/contrib/btree_gist/btree_inet.c @@ -7,7 +7,6 @@ #include "btree_utils_num.h" #include "catalog/pg_type.h" #include "utils/builtins.h" -#include "utils/inet.h" typedef struct inetkey { diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index 156f2cebac..c2f6eede22 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -5,7 +5,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/timestamp.h" typedef struct diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c index 17290529c0..1367eaba73 100644 --- a/contrib/btree_gist/btree_macaddr.c +++ b/contrib/btree_gist/btree_macaddr.c @@ -5,7 +5,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" typedef struct diff --git a/contrib/btree_gist/btree_macaddr8.c b/contrib/btree_gist/btree_macaddr8.c index 796cc4efee..9676e5a15b 100644 --- a/contrib/btree_gist/btree_macaddr8.c +++ b/contrib/btree_gist/btree_macaddr8.c @@ -5,7 +5,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" typedef struct diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c index be0eac7975..28d6b5c9c2 100644 --- a/contrib/btree_gist/btree_text.c +++ b/contrib/btree_gist/btree_text.c @@ -5,7 +5,8 @@ #include "btree_gist.h" #include "btree_utils_var.h" -#include "utils/builtins.h" +#include "mb/pg_wchar.h" +#include "utils/fmgrprotos.h" /* ** Text ops diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c index d89401c0f5..3034bbb456 100644 --- a/contrib/btree_gist/btree_time.c +++ b/contrib/btree_gist/btree_time.c @@ -5,7 +5,7 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/date.h" #include "utils/timestamp.h" diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c index 3f5ba91891..b3cf2d6f60 100644 --- a/contrib/btree_gist/btree_ts.c +++ b/contrib/btree_gist/btree_ts.c @@ -7,8 +7,8 @@ #include "btree_gist.h" #include "btree_utils_num.h" -#include "utils/builtins.h" -#include "utils/datetime.h" +#include "utils/fmgrprotos.h" +#include "utils/timestamp.h" #include "utils/float.h" typedef struct diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h index 11e892311e..53e477d8b1 100644 --- a/contrib/btree_gist/btree_utils_num.h +++ b/contrib/btree_gist/btree_utils_num.h @@ -9,7 +9,6 @@ #include "access/gist.h" #include "btree_gist.h" -#include "utils/rel.h" typedef char GBT_NUMKEY; diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 0c0e952f73..d9df2356cd 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -9,8 +9,7 @@ #include "btree_gist.h" #include "btree_utils_var.h" -#include "utils/builtins.h" -#include "utils/pg_locale.h" +#include "mb/pg_wchar.h" #include "utils/rel.h" /* used for key sorting */ diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h index 2f8def655c..9302d41ced 100644 --- a/contrib/btree_gist/btree_utils_var.h +++ b/contrib/btree_gist/btree_utils_var.h @@ -6,7 +6,6 @@ #include "access/gist.h" #include "btree_gist.h" -#include "mb/pg_wchar.h" /* Variable length key */ typedef bytea GBT_VARKEY; diff --git a/contrib/citext/citext.c b/contrib/citext/citext.c index 26af935a70..3c461ff2ff 100644 --- a/contrib/citext/citext.c +++ b/contrib/citext/citext.c @@ -5,7 +5,7 @@ #include "catalog/pg_collation.h" #include "common/hashfn.h" -#include "utils/builtins.h" +#include "fmgr.h" #include "utils/formatting.h" #include "utils/varlena.h" #include "varatt.h" diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c index 62d2d84141..3635ed1df8 100644 --- a/contrib/dict_xsyn/dict_xsyn.c +++ b/contrib/dict_xsyn/dict_xsyn.c @@ -16,7 +16,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" +#include "tsearch/ts_public.h" PG_MODULE_MAGIC; diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index 72ae2ab91b..f243e2caed 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -40,7 +40,6 @@ #include -#include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/varlena.h" #include "varatt.h" diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 8fc6ad87fc..8cf02c0e5d 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -5,7 +5,6 @@ #include "_int.h" #include "miscadmin.h" -#include "utils/builtins.h" PG_FUNCTION_INFO_V1(bqarr_in); PG_FUNCTION_INFO_V1(bqarr_out); diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c index bc1ad3a804..99179d0c6f 100644 --- a/contrib/intarray/_int_selfuncs.c +++ b/contrib/intarray/_int_selfuncs.c @@ -20,10 +20,9 @@ #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" #include "miscadmin.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" PG_FUNCTION_INFO_V1(_int_overlap_sel); PG_FUNCTION_INFO_V1(_int_contains_sel); diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index 71a543b947..15bcda200c 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -21,7 +21,6 @@ #include "UPC.h" #include "fmgr.h" #include "isn.h" -#include "utils/builtins.h" PG_MODULE_MAGIC; diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 457be26c4e..62488e45f3 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -9,7 +9,7 @@ #include "commands/trigger.h" #include "executor/spi.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" PG_MODULE_MAGIC; diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c index 0a12c77a62..11eefc809b 100644 --- a/contrib/ltree/ltree_io.c +++ b/contrib/ltree/ltree_io.c @@ -10,7 +10,6 @@ #include "crc32.h" #include "libpq/pqformat.h" #include "ltree.h" -#include "utils/memutils.h" #include "varatt.h" diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c index 24a21d3ea0..0e30dee465 100644 --- a/contrib/ltree/ltree_op.c +++ b/contrib/ltree/ltree_op.c @@ -7,13 +7,11 @@ #include -#include "access/htup_details.h" -#include "catalog/pg_statistic.h" #include "common/hashfn.h" #include "ltree.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/selfuncs.h" +#include "varatt.h" PG_MODULE_MAGIC; diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c index 5a38d92668..22621d584f 100644 --- a/contrib/pageinspect/brinfuncs.c +++ b/contrib/pageinspect/brinfuncs.c @@ -9,20 +9,16 @@ */ #include "postgres.h" -#include "access/brin.h" #include "access/brin_internal.h" #include "access/brin_page.h" -#include "access/brin_revmap.h" #include "access/brin_tuple.h" #include "access/htup_details.h" -#include "catalog/index.h" #include "catalog/pg_am_d.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "lib/stringinfo.h" #include "miscadmin.h" #include "pageinspect.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c index f8ae088624..3118214438 100644 --- a/contrib/pageinspect/fsmfuncs.c +++ b/contrib/pageinspect/fsmfuncs.c @@ -19,7 +19,7 @@ #include "postgres.h" -#include "funcapi.h" +#include "fmgr.h" #include "lib/stringinfo.h" #include "miscadmin.h" #include "pageinspect.h" diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c index 1dabbdb588..7182d225d9 100644 --- a/contrib/pageinspect/ginfuncs.c +++ b/contrib/pageinspect/ginfuncs.c @@ -9,17 +9,14 @@ */ #include "postgres.h" -#include "access/gin.h" #include "access/gin_private.h" #include "access/htup_details.h" -#include "catalog/namespace.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" #include "pageinspect.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/rel.h" PG_FUNCTION_INFO_V1(gin_metapage_info); diff --git a/contrib/pageinspect/gistfuncs.c b/contrib/pageinspect/gistfuncs.c index 1cc3b8c9e9..029072567a 100644 --- a/contrib/pageinspect/gistfuncs.c +++ b/contrib/pageinspect/gistfuncs.c @@ -10,10 +10,8 @@ #include "postgres.h" #include "access/gist.h" -#include "access/gist_private.h" #include "access/htup.h" #include "access/relation.h" -#include "catalog/namespace.h" #include "catalog/pg_am_d.h" #include "funcapi.h" #include "miscadmin.h" @@ -25,7 +23,6 @@ #include "utils/pg_lsn.h" #include "utils/rel.h" #include "utils/ruleutils.h" -#include "utils/varlena.h" PG_FUNCTION_INFO_V1(gist_page_opaque_info); PG_FUNCTION_INFO_V1(gist_page_items); diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 38a539dad1..3dc705e43f 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -32,7 +32,6 @@ #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "pageinspect.h" #include "port/pg_bitutils.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c index b82cab2d97..565167aaef 100644 --- a/contrib/pg_freespacemap/pg_freespacemap.c +++ b/contrib/pg_freespacemap/pg_freespacemap.c @@ -9,7 +9,7 @@ #include "postgres.h" #include "access/relation.h" -#include "funcapi.h" +#include "fmgr.h" #include "storage/freespace.h" PG_MODULE_MAGIC; diff --git a/contrib/pg_prewarm/autoprewarm.c b/contrib/pg_prewarm/autoprewarm.c index d061731706..fac4051e1a 100644 --- a/contrib/pg_prewarm/autoprewarm.c +++ b/contrib/pg_prewarm/autoprewarm.c @@ -30,8 +30,6 @@ #include "access/relation.h" #include "access/xact.h" -#include "catalog/pg_class.h" -#include "catalog/pg_type.h" #include "pgstat.h" #include "postmaster/bgworker.h" #include "postmaster/interrupt.h" @@ -42,18 +40,13 @@ #include "storage/ipc.h" #include "storage/latch.h" #include "storage/lwlock.h" -#include "storage/proc.h" #include "storage/procsignal.h" -#include "storage/shmem.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" -#include "utils/acl.h" -#include "utils/datetime.h" #include "utils/guc.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/relfilenumbermap.h" -#include "utils/resowner.h" +#include "utils/timestamp.h" #define AUTOPREWARM_FILE "autoprewarm.blocks" diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 21b26b7b6e..1798e1d016 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -49,7 +49,6 @@ #include "access/parallel.h" #include "catalog/pg_authid.h" -#include "common/hashfn.h" #include "common/int.h" #include "executor/instrument.h" #include "funcapi.h" @@ -59,9 +58,7 @@ #include "nodes/queryjumble.h" #include "optimizer/planner.h" #include "parser/analyze.h" -#include "parser/parsetree.h" #include "parser/scanner.h" -#include "parser/scansup.h" #include "pgstat.h" #include "storage/fd.h" #include "storage/ipc.h" diff --git a/contrib/pg_surgery/heap_surgery.c b/contrib/pg_surgery/heap_surgery.c index 37dffe3f7d..1513d76e4b 100644 --- a/contrib/pg_surgery/heap_surgery.c +++ b/contrib/pg_surgery/heap_surgery.c @@ -12,11 +12,11 @@ */ #include "postgres.h" -#include "access/heapam.h" +#include "access/htup_details.h" +#include "access/relation.h" #include "access/visibilitymap.h" #include "access/xloginsert.h" #include "catalog/pg_am_d.h" -#include "catalog/pg_proc_d.h" #include "miscadmin.h" #include "storage/bufmgr.h" #include "utils/acl.h" diff --git a/contrib/pg_visibility/pg_visibility.c b/contrib/pg_visibility/pg_visibility.c index 724122b1bc..5d0deaba61 100644 --- a/contrib/pg_visibility/pg_visibility.c +++ b/contrib/pg_visibility/pg_visibility.c @@ -19,12 +19,10 @@ #include "funcapi.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "storage/read_stream.h" #include "storage/smgr.h" #include "utils/rel.h" -#include "utils/snapmgr.h" PG_MODULE_MAGIC; diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c index 96447c5757..ebd76eed70 100644 --- a/contrib/pgcrypto/pgcrypto.c +++ b/contrib/pgcrypto/pgcrypto.c @@ -38,7 +38,6 @@ #include "px-crypt.h" #include "px.h" #include "utils/builtins.h" -#include "utils/uuid.h" #include "varatt.h" PG_MODULE_MAGIC; diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index adbc8279c3..7e40ab21dd 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -37,7 +37,7 @@ #include "storage/bufmgr.h" #include "storage/procarray.h" #include "utils/acl.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/varlena.h" diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c index 04457f4b79..3a5aad30ae 100644 --- a/contrib/pgstattuple/pgstatapprox.c +++ b/contrib/pgstattuple/pgstatapprox.c @@ -14,21 +14,15 @@ #include "access/heapam.h" #include "access/htup_details.h" -#include "access/multixact.h" #include "access/relation.h" -#include "access/transam.h" #include "access/visibilitymap.h" -#include "access/xact.h" -#include "catalog/namespace.h" #include "catalog/pg_am_d.h" #include "commands/vacuum.h" #include "funcapi.h" #include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/freespace.h" -#include "storage/lmgr.h" #include "storage/procarray.h" -#include "utils/builtins.h" PG_FUNCTION_INFO_V1(pgstattuple_approx); PG_FUNCTION_INFO_V1(pgstattuple_approx_v1_5); diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c index 1b6b768cf8..4b9d76ec4e 100644 --- a/contrib/pgstattuple/pgstatindex.c +++ b/contrib/pgstattuple/pgstatindex.c @@ -32,14 +32,11 @@ #include "access/htup_details.h" #include "access/nbtree.h" #include "access/relation.h" -#include "access/table.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "funcapi.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" -#include "utils/builtins.h" #include "utils/rel.h" #include "utils/varlena.h" diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 1fff762753..48cb8f59c4 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -36,7 +36,6 @@ #include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "utils/builtins.h" #include "utils/varlena.h" PG_MODULE_MAGIC; diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 2e5303eac1..2326f391d3 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -16,7 +16,6 @@ #include #endif -#include "access/htup_details.h" #include "access/xact.h" #include "catalog/pg_user_mapping.h" #include "commands/defrem.h" @@ -27,13 +26,10 @@ #include "miscadmin.h" #include "pgstat.h" #include "postgres_fdw.h" -#include "storage/fd.h" #include "storage/latch.h" #include "utils/builtins.h" -#include "utils/datetime.h" #include "utils/hsearch.h" #include "utils/inval.h" -#include "utils/memutils.h" #include "utils/syscache.h" /* diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index fb590c87e6..4680d51733 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -47,8 +47,6 @@ #include "catalog/pg_ts_dict.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "commands/tablecmds.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/plannodes.h" #include "optimizer/optimizer.h" diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c index d740893918..ed11126c09 100644 --- a/contrib/postgres_fdw/option.c +++ b/contrib/postgres_fdw/option.c @@ -20,7 +20,6 @@ #include "commands/extension.h" #include "libpq/libpq-be.h" #include "postgres_fdw.h" -#include "utils/builtins.h" #include "utils/guc.h" #include "utils/varlena.h" diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index adc62576d1..53733d642d 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -17,11 +17,9 @@ #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" -#include "catalog/pg_class.h" #include "catalog/pg_opfamily.h" #include "commands/defrem.h" #include "commands/explain.h" -#include "commands/vacuum.h" #include "executor/execAsync.h" #include "foreign/fdwapi.h" #include "funcapi.h" @@ -29,7 +27,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/appendinfo.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/inherit.h" #include "optimizer/optimizer.h" diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index 3eb7004de9..5130804ce2 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -19,7 +19,7 @@ OH, me, I'm Terry Mackintosh #include "catalog/pg_type.h" #include "commands/trigger.h" #include "executor/spi.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" PG_MODULE_MAGIC; diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c index 2a25607a2a..4b6ae2fe5c 100644 --- a/contrib/tablefunc/tablefunc.c +++ b/contrib/tablefunc/tablefunc.c @@ -38,10 +38,10 @@ #include "catalog/pg_type.h" #include "common/pg_prng.h" #include "executor/spi.h" +#include "fmgr.h" #include "funcapi.h" #include "lib/stringinfo.h" #include "miscadmin.h" -#include "tablefunc.h" #include "utils/builtins.h" PG_MODULE_MAGIC; diff --git a/contrib/tablefunc/tablefunc.h b/contrib/tablefunc/tablefunc.h deleted file mode 100644 index 2009382ce7..0000000000 --- a/contrib/tablefunc/tablefunc.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * contrib/tablefunc/tablefunc.h - * - * - * tablefunc - * - * Sample to demonstrate C functions which return setof scalar - * and setof composite. - * Joe Conway - * And contributors: - * Nabil Sayegh - * - * Copyright (c) 2002-2024, PostgreSQL Global Development Group - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose, without fee, and without a written agreement - * is hereby granted, provided that the above copyright notice and this - * paragraph and the following two paragraphs appear in all copies. - * - * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING - * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS - * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - */ - -#ifndef TABLEFUNC_H -#define TABLEFUNC_H - -#include "fmgr.h" - -#endif /* TABLEFUNC_H */ diff --git a/contrib/tsm_system_rows/tsm_system_rows.c b/contrib/tsm_system_rows/tsm_system_rows.c index a9f5d657d1..ecfd1102d7 100644 --- a/contrib/tsm_system_rows/tsm_system_rows.c +++ b/contrib/tsm_system_rows/tsm_system_rows.c @@ -28,7 +28,6 @@ #include "postgres.h" -#include "access/relscan.h" #include "access/tsmapi.h" #include "catalog/pg_type.h" #include "miscadmin.h" diff --git a/contrib/tsm_system_time/tsm_system_time.c b/contrib/tsm_system_time/tsm_system_time.c index f187fd7765..093682a915 100644 --- a/contrib/tsm_system_time/tsm_system_time.c +++ b/contrib/tsm_system_time/tsm_system_time.c @@ -26,7 +26,6 @@ #include -#include "access/relscan.h" #include "access/tsmapi.h" #include "catalog/pg_type.h" #include "miscadmin.h" diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c index 707962305f..0217696aac 100644 --- a/contrib/unaccent/unaccent.c +++ b/contrib/unaccent/unaccent.c @@ -13,7 +13,6 @@ #include "postgres.h" -#include "catalog/namespace.h" #include "catalog/pg_ts_dict.h" #include "commands/defrem.h" #include "lib/stringinfo.h" @@ -22,7 +21,6 @@ #include "tsearch/ts_public.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/regproc.h" #include "utils/syscache.h" PG_MODULE_MAGIC; diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index ef78aa00c8..f7e3f485fe 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -11,7 +11,6 @@ #include "fmgr.h" #include "funcapi.h" #include "lib/stringinfo.h" -#include "miscadmin.h" #include "utils/builtins.h" #include "utils/xml.h" diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c index e761ca5cb5..b720d89f75 100644 --- a/contrib/xml2/xslt_proc.c +++ b/contrib/xml2/xslt_proc.c @@ -7,10 +7,7 @@ */ #include "postgres.h" -#include "executor/spi.h" #include "fmgr.h" -#include "funcapi.h" -#include "miscadmin.h" #include "utils/builtins.h" #include "utils/xml.h" diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index fe719935c6..1b1677e333 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -24,7 +24,6 @@ #include "executor/spi.h" #include "funcapi.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "parser/parse_type.h" #include "storage/ipc.h" #include "tcop/tcopprot.h" diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index f1bce708d6..5633e3c790 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -23,7 +23,7 @@ #include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/makefuncs.h" -#include "parser/parse_type.h" +#include "parser/parse_node.h" #include "plpgsql.h" #include "utils/builtins.h" #include "utils/fmgroids.h" @@ -31,7 +31,6 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/regproc.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index e69559b980..86c5bd324a 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -19,11 +19,9 @@ #include "access/detoast.h" #include "access/htup_details.h" -#include "access/transam.h" #include "access/tupconvert.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/defrem.h" #include "executor/execExpr.h" #include "executor/spi.h" #include "executor/tstoreReceiver.h" @@ -34,13 +32,10 @@ #include "optimizer/optimizer.h" #include "parser/parse_coerce.h" #include "parser/parse_type.h" -#include "parser/scansup.h" #include "plpgsql.h" #include "storage/proc.h" #include "tcop/cmdtag.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" -#include "tcop/utility.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/datum.h" diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c index 24f2ac8c46..6108384c9a 100644 --- a/src/pl/plpython/plpy_cursorobject.c +++ b/src/pl/plpython/plpy_cursorobject.c @@ -8,14 +8,12 @@ #include -#include "access/xact.h" #include "catalog/pg_type.h" #include "mb/pg_wchar.h" #include "plpy_cursorobject.h" #include "plpy_elog.h" #include "plpy_main.h" #include "plpy_planobject.h" -#include "plpy_procedure.h" #include "plpy_resultobject.h" #include "plpy_spi.h" #include "plpython.h" diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c index 157229e96f..9d59473d6a 100644 --- a/src/pl/plpython/plpy_exec.c +++ b/src/pl/plpython/plpy_exec.c @@ -18,10 +18,8 @@ #include "plpy_procedure.h" #include "plpy_subxactobject.h" #include "plpython.h" -#include "utils/builtins.h" -#include "utils/lsyscache.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" -#include "utils/typcache.h" /* saved state for a set-returning function */ typedef struct PLySRFState diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c index ec2439c6a1..bbef889329 100644 --- a/src/pl/plpython/plpy_planobject.c +++ b/src/pl/plpython/plpy_planobject.c @@ -7,7 +7,6 @@ #include "postgres.h" #include "plpy_cursorobject.h" -#include "plpy_elog.h" #include "plpy_planobject.h" #include "plpy_spi.h" #include "plpython.h" diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c index fa08f0dbfb..ea06d9a52b 100644 --- a/src/pl/plpython/plpy_plpymodule.c +++ b/src/pl/plpython/plpy_plpymodule.c @@ -6,11 +6,9 @@ #include "postgres.h" -#include "access/xact.h" #include "mb/pg_wchar.h" #include "plpy_cursorobject.h" #include "plpy_elog.h" -#include "plpy_main.h" #include "plpy_planobject.h" #include "plpy_plpymodule.h" #include "plpy_resultobject.h" @@ -18,7 +16,6 @@ #include "plpy_subxactobject.h" #include "plpython.h" #include "utils/builtins.h" -#include "utils/snapmgr.h" HTAB *PLy_spi_exceptions = NULL; diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c index ba7786d31c..c35a3b801a 100644 --- a/src/pl/plpython/plpy_procedure.c +++ b/src/pl/plpython/plpy_procedure.c @@ -7,7 +7,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/transam.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "funcapi.h" @@ -17,8 +16,6 @@ #include "plpython.h" #include "utils/builtins.h" #include "utils/hsearch.h" -#include "utils/inval.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c index ff87b27de0..bcbd07b70a 100644 --- a/src/pl/plpython/plpy_spi.c +++ b/src/pl/plpython/plpy_spi.c @@ -8,7 +8,6 @@ #include -#include "access/htup_details.h" #include "access/xact.h" #include "catalog/pg_type.h" #include "executor/spi.h" @@ -18,12 +17,10 @@ #include "plpy_main.h" #include "plpy_planobject.h" #include "plpy_plpymodule.h" -#include "plpy_procedure.h" #include "plpy_resultobject.h" #include "plpy_spi.h" #include "plpython.h" #include "utils/memutils.h" -#include "utils/syscache.h" static PyObject *PLy_spi_execute_query(char *query, long limit); static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c index 22e2a599ad..6d89b1cb60 100644 --- a/src/pl/plpython/plpy_util.c +++ b/src/pl/plpython/plpy_util.c @@ -10,7 +10,6 @@ #include "plpy_elog.h" #include "plpy_util.h" #include "plpython.h" -#include "utils/memutils.h" /* * Convert a Python unicode object to a Python string/bytes object in diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index e2ccaa84f3..80de0db40d 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -25,13 +25,12 @@ #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "parser/parse_func.h" #include "parser/parse_type.h" #include "pgstat.h" -#include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/regproc.h" diff --git a/src/test/modules/delay_execution/delay_execution.c b/src/test/modules/delay_execution/delay_execution.c index 155c8a8d55..fa4693a3f5 100644 --- a/src/test/modules/delay_execution/delay_execution.c +++ b/src/test/modules/delay_execution/delay_execution.c @@ -23,7 +23,7 @@ #include #include "optimizer/planner.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/guc.h" #include "utils/inval.h" diff --git a/src/test/modules/dummy_index_am/dummy_index_am.c b/src/test/modules/dummy_index_am/dummy_index_am.c index 2841cf2eb4..beb2c1d254 100644 --- a/src/test/modules/dummy_index_am/dummy_index_am.c +++ b/src/test/modules/dummy_index_am/dummy_index_am.c @@ -18,8 +18,6 @@ #include "catalog/index.h" #include "commands/vacuum.h" #include "nodes/pathnodes.h" -#include "utils/guc.h" -#include "utils/rel.h" PG_MODULE_MAGIC; diff --git a/src/test/modules/ldap_password_func/ldap_password_func.c b/src/test/modules/ldap_password_func/ldap_password_func.c index 24d9c63781..84057d955a 100644 --- a/src/test/modules/ldap_password_func/ldap_password_func.c +++ b/src/test/modules/ldap_password_func/ldap_password_func.c @@ -15,10 +15,8 @@ #include #include +#include "fmgr.h" #include "libpq/auth.h" -#include "libpq/libpq.h" -#include "libpq/libpq-be.h" -#include "utils/guc.h" PG_MODULE_MAGIC; diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index 999a7f57a7..1323e4c598 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -19,10 +19,8 @@ #include #include "catalog/pg_type_d.h" -#include "common/fe_memutils.h" #include "libpq-fe.h" #include "pg_getopt.h" -#include "portability/instr_time.h" static void exit_nicely(PGconn *conn); diff --git a/src/test/modules/plsample/plsample.c b/src/test/modules/plsample/plsample.c index 89ea166a67..25f7814f1f 100644 --- a/src/test/modules/plsample/plsample.c +++ b/src/test/modules/plsample/plsample.c @@ -21,7 +21,7 @@ #include "commands/trigger.h" #include "executor/spi.h" #include "funcapi.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c index 2758ae82d7..97cf52d133 100644 --- a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c +++ b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c @@ -10,7 +10,6 @@ */ #include "postgres.h" -#include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/execnodes.h" #include "tcop/deparse_utility.h" diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c index 61f8d0b663..73a97b8116 100644 --- a/src/test/modules/test_integerset/test_integerset.c +++ b/src/test/modules/test_integerset/test_integerset.c @@ -15,10 +15,6 @@ #include "common/pg_prng.h" #include "fmgr.h" #include "lib/integerset.h" -#include "miscadmin.h" -#include "nodes/bitmapset.h" -#include "storage/block.h" -#include "storage/itemptr.h" #include "utils/memutils.h" #include "utils/timestamp.h" diff --git a/src/test/modules/test_oat_hooks/test_oat_hooks.c b/src/test/modules/test_oat_hooks/test_oat_hooks.c index 05c3371225..ca4aa7e669 100644 --- a/src/test/modules/test_oat_hooks/test_oat_hooks.c +++ b/src/test/modules/test_oat_hooks/test_oat_hooks.c @@ -16,7 +16,6 @@ #include "access/parallel.h" #include "catalog/dependency.h" #include "catalog/objectaccess.h" -#include "catalog/pg_proc.h" #include "executor/executor.h" #include "fmgr.h" #include "miscadmin.h" diff --git a/src/test/modules/test_radixtree/test_radixtree.c b/src/test/modules/test_radixtree/test_radixtree.c index 1d9165a3a2..3e072fa5ec 100644 --- a/src/test/modules/test_radixtree/test_radixtree.c +++ b/src/test/modules/test_radixtree/test_radixtree.c @@ -15,8 +15,6 @@ #include "common/int.h" #include "common/pg_prng.h" #include "fmgr.h" -#include "miscadmin.h" -#include "storage/lwlock.h" #include "utils/memutils.h" #include "utils/timestamp.h" diff --git a/src/test/modules/test_regex/test_regex.c b/src/test/modules/test_regex/test_regex.c index c4ef15d742..cd503a2cd8 100644 --- a/src/test/modules/test_regex/test_regex.c +++ b/src/test/modules/test_regex/test_regex.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "funcapi.h" -#include "miscadmin.h" #include "regex/regex.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/test/modules/test_resowner/test_resowner_basic.c b/src/test/modules/test_resowner/test_resowner_basic.c index 558cf1de56..1d9c1cd025 100644 --- a/src/test/modules/test_resowner/test_resowner_basic.c +++ b/src/test/modules/test_resowner/test_resowner_basic.c @@ -13,8 +13,6 @@ #include "postgres.h" #include "fmgr.h" -#include "lib/ilist.h" -#include "utils/memutils.h" #include "utils/resowner.h" PG_MODULE_MAGIC; diff --git a/src/test/modules/test_resowner/test_resowner_many.c b/src/test/modules/test_resowner/test_resowner_many.c index 7808c9e5df..4f3f5ebf87 100644 --- a/src/test/modules/test_resowner/test_resowner_many.c +++ b/src/test/modules/test_resowner/test_resowner_many.c @@ -14,7 +14,6 @@ #include "fmgr.h" #include "lib/ilist.h" -#include "utils/memutils.h" #include "utils/resowner.h" /* diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c index 358e28edb4..d18d5815cf 100644 --- a/src/test/modules/test_rls_hooks/test_rls_hooks.c +++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c @@ -15,7 +15,6 @@ #include "catalog/pg_type.h" #include "fmgr.h" -#include "miscadmin.h" #include "nodes/makefuncs.h" #include "parser/parse_clause.h" #include "parser/parse_collate.h" diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c index b3dac44d97..fb23560439 100644 --- a/src/test/modules/test_shm_mq/setup.c +++ b/src/test/modules/test_shm_mq/setup.c @@ -18,7 +18,6 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgworker.h" -#include "storage/procsignal.h" #include "storage/shm_toc.h" #include "test_shm_mq.h" #include "utils/memutils.h" diff --git a/src/test/modules/test_slru/test_multixact.c b/src/test/modules/test_slru/test_multixact.c index 22cc441a38..1cc89aa116 100644 --- a/src/test/modules/test_slru/test_multixact.c +++ b/src/test/modules/test_slru/test_multixact.c @@ -16,7 +16,7 @@ #include "access/multixact.h" #include "access/xact.h" -#include "utils/builtins.h" +#include "fmgr.h" #include "utils/injection_point.h" PG_FUNCTION_INFO_V1(test_create_multixact); diff --git a/src/test/modules/test_tidstore/test_tidstore.c b/src/test/modules/test_tidstore/test_tidstore.c index 94ddcf1de8..6da1cb2452 100644 --- a/src/test/modules/test_tidstore/test_tidstore.c +++ b/src/test/modules/test_tidstore/test_tidstore.c @@ -18,7 +18,6 @@ #include "access/tidstore.h" #include "fmgr.h" -#include "funcapi.h" #include "storage/block.h" #include "storage/itemptr.h" #include "storage/lwlock.h" diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index de8f46902b..d4403b24d9 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -26,11 +26,7 @@ #include "miscadmin.h" #include "postmaster/bgworker.h" #include "postmaster/interrupt.h" -#include "storage/ipc.h" #include "storage/latch.h" -#include "storage/lwlock.h" -#include "storage/proc.h" -#include "storage/shmem.h" /* these headers are used by this particular worker's code */ #include "access/xact.h" diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 6c188954b1..0e40ed32a2 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -28,7 +28,6 @@ #include "common/logging.h" #include "common/restricted_token.h" -#include "common/string.h" #include "common/username.h" #include "getopt_long.h" #include "lib/stringinfo.h" diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 9e81371be4..8bae56a977 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -21,8 +21,6 @@ #include "access/detoast.h" #include "access/htup_details.h" -#include "access/transam.h" -#include "access/xact.h" #include "catalog/namespace.h" #include "catalog/pg_operator.h" #include "catalog/pg_type.h" @@ -39,7 +37,6 @@ #include "parser/parse_coerce.h" #include "port/atomics.h" #include "storage/spin.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/geo_decls.h" #include "utils/memutils.h" -- 2.30.2