diff options
Diffstat (limited to 'src/backend/utils')
102 files changed, 49 insertions, 164 deletions
diff --git a/src/backend/utils/activity/backend_status.c b/src/backend/utils/activity/backend_status.c index c91ed5a4b64..cef0daa1b51 100644 --- a/src/backend/utils/activity/backend_status.c +++ b/src/backend/utils/activity/backend_status.c @@ -12,7 +12,7 @@ #include "postgres.h" #include "access/xact.h" -#include "libpq/libpq.h" +#include "libpq/libpq-be.h" #include "miscadmin.h" #include "pg_trace.h" #include "pgstat.h" @@ -22,7 +22,6 @@ #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "utils/ascii.h" -#include "utils/backend_status.h" #include "utils/guc.h" /* for application_name */ #include "utils/memutils.h" diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c index 9bfc7a95185..dcc2ad8d954 100644 --- a/src/backend/utils/activity/pgstat.c +++ b/src/backend/utils/activity/pgstat.c @@ -93,7 +93,6 @@ #include <unistd.h> -#include "access/transam.h" #include "access/xact.h" #include "lib/dshash.h" #include "pgstat.h" @@ -101,8 +100,6 @@ #include "storage/fd.h" #include "storage/ipc.h" #include "storage/lwlock.h" -#include "storage/pg_shmem.h" -#include "storage/shmem.h" #include "utils/guc_hooks.h" #include "utils/memutils.h" #include "utils/pgstat_internal.h" diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c index b20a60b5a87..40241e26d6d 100644 --- a/src/backend/utils/activity/pgstat_relation.c +++ b/src/backend/utils/activity/pgstat_relation.c @@ -19,7 +19,6 @@ #include "access/twophase_rmgr.h" #include "access/xact.h" -#include "catalog/partition.h" #include "postmaster/autovacuum.h" #include "utils/memutils.h" #include "utils/pgstat_internal.h" diff --git a/src/backend/utils/activity/pgstat_replslot.c b/src/backend/utils/activity/pgstat_replslot.c index 70cabf28817..c94a3fb5138 100644 --- a/src/backend/utils/activity/pgstat_replslot.c +++ b/src/backend/utils/activity/pgstat_replslot.c @@ -26,7 +26,6 @@ #include "postgres.h" #include "replication/slot.h" -#include "utils/builtins.h" /* for namestrcpy() */ #include "utils/pgstat_internal.h" diff --git a/src/backend/utils/activity/pgstat_xact.c b/src/backend/utils/activity/pgstat_xact.c index 85788ba7957..1877d22f146 100644 --- a/src/backend/utils/activity/pgstat_xact.c +++ b/src/backend/utils/activity/pgstat_xact.c @@ -12,7 +12,6 @@ #include "postgres.h" -#include "access/transam.h" #include "access/xact.h" #include "pgstat.h" #include "utils/memutils.h" diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c index e7dd489cbd9..4ffcb10c8b5 100644 --- a/src/backend/utils/activity/wait_event.c +++ b/src/backend/utils/activity/wait_event.c @@ -22,12 +22,10 @@ */ #include "postgres.h" -#include "miscadmin.h" #include "port/pg_bitutils.h" #include "storage/lmgr.h" /* for GetLockNameFromTagType */ #include "storage/lwlock.h" /* for GetLWLockIdentifier */ #include "storage/spin.h" -#include "utils/memutils.h" #include "utils/wait_event.h" diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 85555d1c5a2..83a11465b34 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -27,7 +27,6 @@ #include "catalog/pg_foreign_server.h" #include "catalog/pg_language.h" #include "catalog/pg_namespace.h" -#include "catalog/pg_parameter_acl.h" #include "catalog/pg_proc.h" #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" @@ -43,7 +42,6 @@ #include "utils/array.h" #include "utils/builtins.h" #include "utils/catcache.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/array_selfuncs.c b/src/backend/utils/adt/array_selfuncs.c index 7779911bd0e..e2af89f5cc5 100644 --- a/src/backend/utils/adt/array_selfuncs.c +++ b/src/backend/utils/adt/array_selfuncs.c @@ -17,11 +17,10 @@ #include <math.h> #include "access/htup_details.h" -#include "catalog/pg_collation.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c index f01726077a1..2c633bee6b1 100644 --- a/src/backend/utils/adt/array_typanalyze.c +++ b/src/backend/utils/adt/array_typanalyze.c @@ -17,8 +17,8 @@ #include "access/detoast.h" #include "commands/vacuum.h" #include "utils/array.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index f3fee54e370..d6641b570d5 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -17,7 +17,6 @@ #include <ctype.h> #include <math.h> -#include "access/htup_details.h" #include "catalog/pg_type.h" #include "common/int.h" #include "funcapi.h" diff --git a/src/backend/utils/adt/arraysubs.c b/src/backend/utils/adt/arraysubs.c index ef0b051a831..6f68dfa5b23 100644 --- a/src/backend/utils/adt/arraysubs.c +++ b/src/backend/utils/adt/arraysubs.c @@ -21,7 +21,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index f36ec49751c..40887e36992 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -13,7 +13,7 @@ #include "mb/pg_wchar.h" #include "utils/ascii.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "varatt.h" static void pg_to_ascii(unsigned char *src, unsigned char *src_end, diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 72f58b85a29..5ee94be0d1e 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -18,7 +18,7 @@ #include <limits.h> #include "libpq/pqformat.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "varatt.h" #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index cccabb0c2ad..1b86fff2fb6 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -20,7 +20,6 @@ #include "access/htup_details.h" #include "access/xact.h" -#include "catalog/pg_type.h" #include "common/int.h" #include "common/string.h" #include "funcapi.h" @@ -31,7 +30,6 @@ #include "utils/date.h" #include "utils/datetime.h" #include "utils/guc.h" -#include "utils/memutils.h" #include "utils/tzparser.h" static int DecodeNumber(int flen, char *str, bool haveTextMonth, diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index 2a9882b0a1c..45b854a0ae7 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -45,9 +45,9 @@ #include "access/detoast.h" #include "common/hashfn.h" #include "fmgr.h" -#include "utils/builtins.h" #include "utils/datum.h" #include "utils/expandeddatum.h" +#include "utils/fmgrprotos.h" /*------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 3e851032786..25d7110c130 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -15,7 +15,6 @@ #include "access/htup_details.h" #include "access/relation.h" -#include "catalog/catalog.h" #include "catalog/namespace.h" #include "catalog/pg_authid.h" #include "catalog/pg_database.h" diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 613575fe6ff..f649ff2c564 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -22,7 +22,6 @@ #include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 829aaa8d0e7..036a463491c 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -83,7 +83,6 @@ #include "utils/builtins.h" #include "utils/date.h" #include "utils/datetime.h" -#include "utils/float.h" #include "utils/formatting.h" #include "utils/memutils.h" #include "utils/numeric.h" diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index c7df98b6f54..340d3065f83 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -18,8 +18,7 @@ */ #include "postgres.h" -#include "utils/builtins.h" -#include "utils/geo_decls.h" +#include "utils/fmgrprotos.h" /* diff --git a/src/backend/utils/adt/hbafuncs.c b/src/backend/utils/adt/hbafuncs.c index dda17fc4a40..beaae88e541 100644 --- a/src/backend/utils/adt/hbafuncs.c +++ b/src/backend/utils/adt/hbafuncs.c @@ -18,7 +18,6 @@ #include "common/ip.h" #include "funcapi.h" #include "libpq/hba.h" -#include "miscadmin.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/guc.h" diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index ede14086aee..54fa3bc3799 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -24,7 +24,6 @@ #include "nodes/supportnodes.h" #include "optimizer/optimizer.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" typedef struct diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index c10b3fbedf1..a5e48744acb 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -13,20 +13,16 @@ #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" #include "libpq/pqformat.h" #include "miscadmin.h" #include "utils/builtins.h" -#include "utils/date.h" -#include "utils/datetime.h" #include "utils/json.h" #include "utils/jsonb.h" #include "utils/jsonfuncs.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" #include "utils/typcache.h" typedef struct JsonbInState diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c index 516a4b02a67..b03d94f82b8 100644 --- a/src/backend/utils/adt/jsonb_gin.c +++ b/src/backend/utils/adt/jsonb_gin.c @@ -65,7 +65,7 @@ #include "catalog/pg_type.h" #include "common/hashfn.h" #include "miscadmin.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/jsonb.h" #include "utils/jsonpath.h" #include "utils/varlena.h" diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c index 7324c22deb9..da0d13992ca 100644 --- a/src/backend/utils/adt/jsonb_op.c +++ b/src/backend/utils/adt/jsonb_op.c @@ -14,8 +14,7 @@ #include "postgres.h" #include "catalog/pg_type.h" -#include "miscadmin.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/jsonb.h" Datum diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index daf51450daf..9941daad2bc 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -14,13 +14,11 @@ #include "postgres.h" #include "catalog/pg_collation.h" -#include "catalog/pg_type.h" #include "common/hashfn.h" -#include "common/jsonapi.h" #include "miscadmin.h" #include "port/pg_bitutils.h" -#include "utils/builtins.h" #include "utils/datetime.h" +#include "utils/fmgrprotos.h" #include "utils/json.h" #include "utils/jsonb.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/jsonbsubs.c b/src/backend/utils/adt/jsonbsubs.c index 79c5d16ff19..d3edb010ed6 100644 --- a/src/backend/utils/adt/jsonbsubs.c +++ b/src/backend/utils/adt/jsonbsubs.c @@ -15,15 +15,12 @@ #include "postgres.h" #include "executor/execExpr.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/subscripting.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "utils/jsonb.h" -#include "utils/jsonfuncs.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" /* SubscriptingRefState.workspace for jsonb subscripting execution */ diff --git a/src/backend/utils/adt/jsonpath.c b/src/backend/utils/adt/jsonpath.c index 258ed8eb117..f4a5d007675 100644 --- a/src/backend/utils/adt/jsonpath.c +++ b/src/backend/utils/adt/jsonpath.c @@ -63,12 +63,11 @@ #include "postgres.h" -#include "funcapi.h" #include "lib/stringinfo.h" #include "libpq/pqformat.h" #include "nodes/miscnodes.h" #include "miscadmin.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/json.h" #include "utils/jsonpath.h" diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 3f30bc6222f..6c8bd575038 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -62,21 +62,16 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "funcapi.h" -#include "lib/stringinfo.h" #include "miscadmin.h" #include "nodes/miscnodes.h" #include "regex/regex.h" #include "utils/builtins.h" #include "utils/date.h" #include "utils/datetime.h" -#include "utils/datum.h" #include "utils/float.h" #include "utils/formatting.h" -#include "utils/guc.h" -#include "utils/json.h" #include "utils/jsonpath.h" #include "utils/timestamp.h" -#include "utils/varlena.h" /* * Represents "base object" and it's "id" for .keyvalue() evaluation. diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 1c3936a7332..57ead66b5aa 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -22,7 +22,7 @@ #include "catalog/pg_collation.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/pg_locale.h" #include "varatt.h" diff --git a/src/backend/utils/adt/like_support.c b/src/backend/utils/adt/like_support.c index b7b9322c6cb..2635050861f 100644 --- a/src/backend/utils/adt/like_support.c +++ b/src/backend/utils/adt/like_support.c @@ -37,7 +37,6 @@ #include <math.h> #include "access/htup_details.h" -#include "access/stratnum.h" #include "catalog/pg_collation.h" #include "catalog/pg_operator.h" #include "catalog/pg_opfamily.h" diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 8624470b1d9..13009cc3d0d 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -13,7 +13,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/xact.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index d00c43c2594..ae4caedef50 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -17,7 +17,7 @@ #include "lib/hyperloglog.h" #include "libpq/pqformat.h" #include "port/pg_bswap.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/guc.h" #include "utils/inet.h" #include "utils/sortsupport.h" diff --git a/src/backend/utils/adt/mac8.c b/src/backend/utils/adt/mac8.c index 717875ac47c..996d912e8d0 100644 --- a/src/backend/utils/adt/mac8.c +++ b/src/backend/utils/adt/mac8.c @@ -23,7 +23,8 @@ #include "common/hashfn.h" #include "libpq/pqformat.h" -#include "utils/builtins.h" +#include "nodes/nodes.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" /* diff --git a/src/backend/utils/adt/mcxtfuncs.c b/src/backend/utils/adt/mcxtfuncs.c index c29320b3785..4d4a70915bb 100644 --- a/src/backend/utils/adt/mcxtfuncs.c +++ b/src/backend/utils/adt/mcxtfuncs.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "funcapi.h" -#include "miscadmin.h" #include "mb/pg_wchar.h" #include "storage/proc.h" #include "storage/procarray.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 2d7d7806d40..d4a92d0b3fa 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -23,7 +23,6 @@ #include "access/sysattr.h" #include "access/table.h" -#include "catalog/catalog.h" #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" #include "catalog/system_fk_info.h" diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c index f82e6f42d98..a6c959a4e15 100644 --- a/src/backend/utils/adt/multirangetypes.c +++ b/src/backend/utils/adt/multirangetypes.c @@ -37,14 +37,13 @@ #include "funcapi.h" #include "lib/stringinfo.h" #include "libpq/pqformat.h" -#include "miscadmin.h" +#include "nodes/nodes.h" #include "port/pg_bitutils.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rangetypes.h" #include "utils/multirangetypes.h" #include "utils/array.h" -#include "utils/memutils.h" /* fn_extra cache entry for one of the range I/O functions */ typedef struct MultirangeIOData diff --git a/src/backend/utils/adt/multirangetypes_selfuncs.c b/src/backend/utils/adt/multirangetypes_selfuncs.c index 981c1fd298a..f97ff575f00 100644 --- a/src/backend/utils/adt/multirangetypes_selfuncs.c +++ b/src/backend/utils/adt/multirangetypes_selfuncs.c @@ -22,7 +22,6 @@ #include "access/htup_details.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" -#include "catalog/pg_type.h" #include "utils/float.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/network_gist.c b/src/backend/utils/adt/network_gist.c index 747341f92b1..15feb449b55 100644 --- a/src/backend/utils/adt/network_gist.c +++ b/src/backend/utils/adt/network_gist.c @@ -49,7 +49,7 @@ #include "access/gist.h" #include "access/stratnum.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" #include "varatt.h" diff --git a/src/backend/utils/adt/network_selfuncs.c b/src/backend/utils/adt/network_selfuncs.c index 84c55977fd2..98eec81b09c 100644 --- a/src/backend/utils/adt/network_selfuncs.c +++ b/src/backend/utils/adt/network_selfuncs.c @@ -23,7 +23,7 @@ #include "access/htup_details.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" diff --git a/src/backend/utils/adt/network_spgist.c b/src/backend/utils/adt/network_spgist.c index 05103596d47..d18cf64c341 100644 --- a/src/backend/utils/adt/network_spgist.c +++ b/src/backend/utils/adt/network_spgist.c @@ -35,7 +35,7 @@ #include "access/spgist.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/inet.h" #include "varatt.h" diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 015a41dc56e..b818189d869 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -26,7 +26,6 @@ #include <limits.h> #include <math.h> -#include "catalog/pg_type.h" #include "common/hashfn.h" #include "common/int.h" #include "funcapi.h" diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 24d4c0e29e9..c08eea452cf 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -18,7 +18,6 @@ #include <limits.h> #include <ctype.h> -#include "common/int.h" #include "utils/builtins.h" #include "port/pg_bitutils.h" diff --git a/src/backend/utils/adt/orderedsetaggs.c b/src/backend/utils/adt/orderedsetaggs.c index f9fc4936f07..04b3f31827e 100644 --- a/src/backend/utils/adt/orderedsetaggs.c +++ b/src/backend/utils/adt/orderedsetaggs.c @@ -24,10 +24,8 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" -#include "utils/timestamp.h" #include "utils/tuplesort.h" diff --git a/src/backend/utils/adt/partitionfuncs.c b/src/backend/utils/adt/partitionfuncs.c index 3ef7c0a8f58..fe19007970d 100644 --- a/src/backend/utils/adt/partitionfuncs.c +++ b/src/backend/utils/adt/partitionfuncs.c @@ -19,7 +19,6 @@ #include "catalog/partition.h" #include "catalog/pg_class.h" #include "catalog/pg_inherits.h" -#include "catalog/pg_type.h" #include "funcapi.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 79b59b0af70..8e6822ee592 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -56,7 +56,6 @@ #include "access/htup_details.h" #include "catalog/pg_collation.h" -#include "catalog/pg_control.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/pg_lsn.c b/src/backend/utils/adt/pg_lsn.c index 26841f7192e..e8b68ef156a 100644 --- a/src/backend/utils/adt/pg_lsn.c +++ b/src/backend/utils/adt/pg_lsn.c @@ -13,9 +13,8 @@ */ #include "postgres.h" -#include "funcapi.h" #include "libpq/pqformat.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/numeric.h" #include "utils/pg_lsn.h" diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index d1e9aa8290f..3876339ee1b 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -24,14 +24,12 @@ #include "funcapi.h" #include "miscadmin.h" #include "pgstat.h" -#include "postmaster/bgworker_internals.h" -#include "postmaster/postmaster.h" +#include "postmaster/bgworker.h" #include "replication/logicallauncher.h" #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/inet.h" #include "utils/timestamp.h" #define UINT32_ACCESS_ONCE(var) ((uint32)(*((volatile uint32 *)&(var)))) diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c index a3a991f634d..e189e9b79d2 100644 --- a/src/backend/utils/adt/pseudotypes.c +++ b/src/backend/utils/adt/pseudotypes.c @@ -23,10 +23,7 @@ #include "postgres.h" #include "libpq/pqformat.h" -#include "utils/array.h" -#include "utils/builtins.h" -#include "utils/rangetypes.h" -#include "utils/multirangetypes.h" +#include "utils/fmgrprotos.h" /* diff --git a/src/backend/utils/adt/rangetypes_selfuncs.c b/src/backend/utils/adt/rangetypes_selfuncs.c index 3431c3cd982..6d35ecd33d0 100644 --- a/src/backend/utils/adt/rangetypes_selfuncs.c +++ b/src/backend/utils/adt/rangetypes_selfuncs.c @@ -22,7 +22,6 @@ #include "access/htup_details.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" -#include "catalog/pg_type.h" #include "utils/float.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/rangetypes_spgist.c b/src/backend/utils/adt/rangetypes_spgist.c index ee1df796cc0..5121835f6b5 100644 --- a/src/backend/utils/adt/rangetypes_spgist.c +++ b/src/backend/utils/adt/rangetypes_spgist.c @@ -39,8 +39,8 @@ #include "access/spgist.h" #include "access/stratnum.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/rangetypes.h" static int16 getQuadrant(TypeCacheEntry *typcache, const RangeType *centroid, diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index ef4a25f6809..0e2519bfd57 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -31,7 +31,6 @@ #include "catalog/pg_type.h" #include "funcapi.h" -#include "miscadmin.h" #include "regex/regex.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 708d9c8efc9..2fe93775003 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -30,8 +30,6 @@ #include "access/xact.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" -#include "catalog/pg_operator.h" -#include "catalog/pg_type.h" #include "commands/trigger.h" #include "executor/executor.h" #include "executor/spi.h" @@ -39,7 +37,6 @@ #include "miscadmin.h" #include "parser/parse_coerce.h" #include "parser/parse_relation.h" -#include "storage/bufmgr.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/datum.h" diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index adc02702fca..0214c23a1d4 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -19,7 +19,6 @@ #include "access/detoast.h" #include "access/htup_details.h" #include "catalog/pg_type.h" -#include "common/hashfn.h" #include "funcapi.h" #include "libpq/pqformat.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index a928a8c55df..75525338320 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -22,7 +22,6 @@ #include "access/amapi.h" #include "access/htup_details.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_am.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 0505034e9dd..8cff1e7a12e 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -20,8 +20,8 @@ #include <math.h> #include <limits.h> -#include "access/heapam.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tableam.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" @@ -30,7 +30,7 @@ #include "miscadmin.h" #include "parser/parsetree.h" #include "utils/acl.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 7a016a69234..963f2ec74a1 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -27,7 +27,6 @@ #include "funcapi.h" #include "libpq/pqformat.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/supportnodes.h" #include "parser/scansup.h" diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c index 6c048fad53a..a1320827223 100644 --- a/src/backend/utils/adt/trigfuncs.c +++ b/src/backend/utils/adt/trigfuncs.c @@ -15,8 +15,7 @@ #include "access/htup_details.h" #include "commands/trigger.h" -#include "utils/builtins.h" -#include "utils/rel.h" +#include "utils/fmgrprotos.h" /* diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c index 3f8262db09e..0d9b0d59013 100644 --- a/src/backend/utils/adt/tsginidx.c +++ b/src/backend/utils/adt/tsginidx.c @@ -14,8 +14,6 @@ #include "postgres.h" #include "access/gin.h" -#include "access/stratnum.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/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index 3fb76964343..5698ee5502b 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -21,7 +21,7 @@ #include "lib/qunique.h" #include "port/pg_bitutils.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/pg_crc.h" diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 2db304b10bd..a19ed4cf376 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -18,7 +18,7 @@ #include "access/stratnum.h" #include "common/int.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.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 82ee863eae1..6f6dc12a118 100644 --- a/src/backend/utils/adt/tsquery_op.c +++ b/src/backend/utils/adt/tsquery_op.c @@ -16,7 +16,7 @@ #include "lib/qunique.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "varatt.h" Datum diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 5f4bbdecb50..c2285cf27e9 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -19,7 +19,7 @@ #include "miscadmin.h" #include "tsearch/ts_utils.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f}; diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 10bc4f2234f..4c6a15757a7 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -19,7 +19,7 @@ #include "nodes/miscnodes.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/memutils.h" #include "varatt.h" diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index 947a592ed28..687adcbd69f 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -29,7 +29,6 @@ #include "tsearch/ts_utils.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/regproc.h" #include "utils/rel.h" diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c index 2ca8fc69943..e9c1ec61537 100644 --- a/src/backend/utils/adt/uuid.c +++ b/src/backend/utils/adt/uuid.c @@ -17,7 +17,7 @@ #include "lib/hyperloglog.h" #include "libpq/pqformat.h" #include "port/pg_bswap.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/guc.h" #include "utils/sortsupport.h" #include "utils/uuid.h" diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 6221bffbf63..8fcf3fb731e 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -38,7 +38,7 @@ #include "nodes/supportnodes.h" #include "port/pg_bitutils.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/varbit.h" #define HEXDIG(z) ((z)<10 ? ((z)+'0') : ((z)-10+'A')) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index aebf57899c2..02dfe219f54 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -25,7 +25,6 @@ #include "nodes/supportnodes.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/pg_locale.h" #include "utils/varlena.h" diff --git a/src/backend/utils/adt/windowfuncs.c b/src/backend/utils/adt/windowfuncs.c index 095de7741dc..473c61569f5 100644 --- a/src/backend/utils/adt/windowfuncs.c +++ b/src/backend/utils/adt/windowfuncs.c @@ -15,7 +15,7 @@ #include "nodes/parsenodes.h" #include "nodes/supportnodes.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "windowapi.h" /* diff --git a/src/backend/utils/adt/xid8funcs.c b/src/backend/utils/adt/xid8funcs.c index aa64a7c8b3f..12d20b72a03 100644 --- a/src/backend/utils/adt/xid8funcs.c +++ b/src/backend/utils/adt/xid8funcs.c @@ -26,10 +26,8 @@ #include "postgres.h" -#include "access/clog.h" #include "access/transam.h" #include "access/xact.h" -#include "access/xlog.h" #include "funcapi.h" #include "lib/qunique.h" #include "libpq/pqformat.h" diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 3e24aba546f..beecd0c2ac1 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -100,7 +100,6 @@ #include "utils/date.h" #include "utils/datetime.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/syscache.h" #include "utils/xml.h" diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index b78011a9653..d5a3c1b5914 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -17,11 +17,9 @@ #include "access/genam.h" #include "access/heaptoast.h" #include "access/relscan.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/xact.h" #include "catalog/pg_collation.h" -#include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "common/hashfn.h" #include "common/pg_prng.h" diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c index b270b5845f1..185b52e669d 100644 --- a/src/backend/utils/cache/evtcache.c +++ b/src/backend/utils/cache/evtcache.c @@ -28,7 +28,6 @@ #include "utils/inval.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/snapmgr.h" #include "utils/syscache.h" typedef enum diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 816b883b6da..603aa4157be 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -119,7 +119,6 @@ #include "storage/sinval.h" #include "storage/smgr.h" #include "utils/catcache.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/memdebug.h" #include "utils/memutils.h" diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index f730aa26c47..6418d1c6eba 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -17,20 +17,22 @@ #include "access/hash.h" #include "access/htup_details.h" -#include "access/nbtree.h" #include "bootstrap/bootstrap.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_cast.h" +#include "catalog/pg_class.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" +#include "catalog/pg_index.h" #include "catalog/pg_language.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" +#include "catalog/pg_publication.h" #include "catalog/pg_range.h" #include "catalog/pg_statistic.h" #include "catalog/pg_subscription.h" @@ -44,7 +46,6 @@ #include "utils/datum.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/cache/partcache.c b/src/backend/utils/cache/partcache.c index ef38da782ff..beec6cddbc4 100644 --- a/src/backend/utils/cache/partcache.c +++ b/src/backend/utils/cache/partcache.c @@ -19,7 +19,6 @@ #include "access/nbtree.h" #include "access/relation.h" #include "catalog/partition.h" -#include "catalog/pg_inherits.h" #include "catalog/pg_opclass.h" #include "catalog/pg_partitioned_table.h" #include "miscadmin.h" @@ -27,9 +26,7 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "partitioning/partbounds.h" -#include "rewrite/rewriteHandler.h" #include "utils/builtins.h" -#include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/partcache.h" diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index 5194cbf2cc8..e16f4c36ec5 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -63,7 +63,6 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "parser/analyze.h" -#include "parser/parsetree.h" #include "storage/lmgr.h" #include "tcop/pquery.h" #include "tcop/utility.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 37c37df56c1..8cb88454c1d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -32,7 +32,6 @@ #include "access/htup_details.h" #include "access/multixact.h" -#include "access/nbtree.h" #include "access/parallel.h" #include "access/reloptions.h" #include "access/sysattr.h" @@ -40,7 +39,6 @@ #include "access/tableam.h" #include "access/tupdesc_details.h" #include "access/xact.h" -#include "access/xlog.h" #include "catalog/binary_upgrade.h" #include "catalog/catalog.h" #include "catalog/indexing.h" diff --git a/src/backend/utils/cache/relfilenumbermap.c b/src/backend/utils/cache/relfilenumbermap.c index b7caa843411..9e76f745297 100644 --- a/src/backend/utils/cache/relfilenumbermap.c +++ b/src/backend/utils/cache/relfilenumbermap.c @@ -19,12 +19,10 @@ #include "catalog/pg_class.h" #include "catalog/pg_tablespace.h" #include "miscadmin.h" -#include "utils/builtins.h" #include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/hsearch.h" #include "utils/inval.h" -#include "utils/rel.h" #include "utils/relfilenumbermap.h" #include "utils/relmapper.h" diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index 292620c60ff..48d344ae3ff 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -46,7 +46,6 @@ #include "access/xact.h" #include "access/xlog.h" #include "access/xloginsert.h" -#include "catalog/catalog.h" #include "catalog/pg_tablespace.h" #include "catalog/storage.h" #include "miscadmin.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 2292237f85f..3e03dfc9910 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -21,7 +21,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "catalog/pg_db_role_setting_d.h" #include "catalog/pg_depend_d.h" #include "catalog/pg_description_d.h" diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index f411e33b8e7..0d4d0b0a154 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -70,7 +70,6 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c index 99a3d862250..855e130a97d 100644 --- a/src/backend/utils/error/csvlog.c +++ b/src/backend/utils/error/csvlog.c @@ -16,16 +16,14 @@ #include "postgres.h" #include "access/xact.h" -#include "libpq/libpq.h" #include "lib/stringinfo.h" +#include "libpq/libpq-be.h" #include "miscadmin.h" -#include "postmaster/bgworker.h" #include "postmaster/syslogger.h" #include "storage/lock.h" #include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/backend_status.h" -#include "utils/elog.h" #include "utils/guc.h" #include "utils/ps_status.h" diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 8d4bc5fbc91..ed8aa5c9fa4 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -66,7 +66,6 @@ #include <execinfo.h> #endif -#include "access/transam.h" #include "access/xact.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c index d52c2143033..bd0124869d5 100644 --- a/src/backend/utils/error/jsonlog.c +++ b/src/backend/utils/error/jsonlog.c @@ -16,16 +16,14 @@ #include "postgres.h" #include "access/xact.h" -#include "libpq/libpq.h" +#include "libpq/libpq-be.h" #include "lib/stringinfo.h" #include "miscadmin.h" -#include "postmaster/bgworker.h" #include "postmaster/syslogger.h" #include "storage/lock.h" #include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/backend_status.h" -#include "utils/elog.h" #include "utils/guc.h" #include "utils/json.h" #include "utils/ps_status.h" diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index ad6ab45c677..537d92c0cfd 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -38,7 +38,6 @@ #include "pgstat.h" #include "postmaster/autovacuum.h" #include "postmaster/interrupt.h" -#include "postmaster/pgarch.h" #include "postmaster/postmaster.h" #include "replication/slotsync.h" #include "storage/fd.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 6a320aaedb7..16f3659fd90 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -23,12 +23,10 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/session.h" -#include "access/sysattr.h" #include "access/tableam.h" #include "access/xact.h" #include "access/xlog.h" #include "access/xloginsert.h" -#include "catalog/catalog.h" #include "catalog/namespace.h" #include "catalog/pg_authid.h" #include "catalog/pg_collation.h" diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 7108ab89836..62777b14c9b 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -37,9 +37,8 @@ #include "access/xact.h" #include "catalog/namespace.h" #include "mb/pg_wchar.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/memutils.h" -#include "utils/syscache.h" #include "varatt.h" /* diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 8f65ef3d896..f12eef75e0c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -25,6 +25,7 @@ #include "postgres.h" #include <limits.h> +#include <math.h> #include <sys/stat.h> #include <unistd.h> @@ -35,6 +36,8 @@ #include "catalog/pg_parameter_acl.h" #include "guc_internal.h" #include "libpq/pqformat.h" +#include "libpq/protocol.h" +#include "miscadmin.h" #include "parser/scansup.h" #include "port/pg_bitutils.h" #include "storage/fd.h" @@ -42,10 +45,8 @@ #include "storage/shmem.h" #include "tcop/tcopprot.h" #include "utils/acl.h" -#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/conffiles.h" -#include "utils/float.h" #include "utils/guc_tables.h" #include "utils/memutils.h" #include "utils/timestamp.h" diff --git a/src/backend/utils/misc/guc_funcs.c b/src/backend/utils/misc/guc_funcs.c index c06dfde34dc..9c9edd3d2f5 100644 --- a/src/backend/utils/misc/guc_funcs.c +++ b/src/backend/utils/misc/guc_funcs.c @@ -24,9 +24,9 @@ #include "catalog/pg_parameter_acl.h" #include "funcapi.h" #include "guc_internal.h" +#include "miscadmin.h" #include "parser/parse_type.h" #include "utils/acl.h" -#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/guc_tables.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 543a87c6596..45013582a74 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -84,7 +84,7 @@ #include "utils/guc_tables.h" #include "utils/memutils.h" #include "utils/pg_locale.h" -#include "utils/portal.h" +#include "utils/plancache.h" #include "utils/ps_status.h" #include "utils/inval.h" #include "utils/xml.h" diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c index 84ad9d9b2e2..2af47e1244f 100644 --- a/src/backend/utils/misc/pg_config.c +++ b/src/backend/utils/misc/pg_config.c @@ -14,7 +14,6 @@ #include "postgres.h" -#include "catalog/pg_type.h" #include "common/config_info.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c index 55435dbcf3a..98c932dc7bd 100644 --- a/src/backend/utils/misc/pg_controldata.c +++ b/src/backend/utils/misc/pg_controldata.c @@ -20,7 +20,6 @@ #include "access/xlog.h" #include "access/xlog_internal.h" #include "catalog/pg_control.h" -#include "catalog/pg_type.h" #include "common/controldata_utils.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index ddb45a6bce8..5d829e6e483 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -19,9 +19,7 @@ #include <crt_externs.h> #endif -#include "libpq/libpq.h" #include "miscadmin.h" -#include "pgstat.h" #include "utils/guc.h" #include "utils/ps_status.h" diff --git a/src/backend/utils/misc/rls.c b/src/backend/utils/misc/rls.c index 93a1592251b..9947e3c2469 100644 --- a/src/backend/utils/misc/rls.c +++ b/src/backend/utils/misc/rls.c @@ -21,7 +21,7 @@ #include "catalog/pg_class.h" #include "miscadmin.h" #include "utils/acl.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/rls.h" #include "utils/syscache.h" diff --git a/src/backend/utils/misc/timeout.c b/src/backend/utils/misc/timeout.c index 4055dd5f8d3..ec7e570920a 100644 --- a/src/backend/utils/misc/timeout.c +++ b/src/backend/utils/misc/timeout.c @@ -17,7 +17,7 @@ #include <sys/time.h> #include "miscadmin.h" -#include "storage/proc.h" +#include "storage/latch.h" #include "utils/timeout.h" #include "utils/timestamp.h" diff --git a/src/backend/utils/mmgr/dsa.c b/src/backend/utils/mmgr/dsa.c index b9e7f224d51..ddc64014c77 100644 --- a/src/backend/utils/mmgr/dsa.c +++ b/src/backend/utils/mmgr/dsa.c @@ -53,9 +53,7 @@ #include "port/atomics.h" #include "port/pg_bitutils.h" #include "storage/dsm.h" -#include "storage/ipc.h" #include "storage/lwlock.h" -#include "storage/shmem.h" #include "utils/dsa.h" #include "utils/freepage.h" #include "utils/memutils.h" diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 41f2390fb8f..1a615becae4 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -23,10 +23,6 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "storage/proc.h" -#include "storage/procarray.h" -#include "storage/procsignal.h" -#include "utils/fmgrprotos.h" #include "utils/memdebug.h" #include "utils/memutils.h" #include "utils/memutils_internal.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 3d4282da03a..4a246135377 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -19,7 +19,6 @@ #include "postgres.h" #include "access/xact.h" -#include "catalog/pg_type.h" #include "commands/portalcmds.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c index 6a5817b5135..137476a7a77 100644 --- a/src/backend/utils/sort/sharedtuplestore.c +++ b/src/backend/utils/sort/sharedtuplestore.c @@ -23,7 +23,6 @@ #include "access/htup.h" #include "access/htup_details.h" -#include "miscadmin.h" #include "storage/buffile.h" #include "storage/lwlock.h" #include "storage/sharedfileset.h" diff --git a/src/backend/utils/sort/sortsupport.c b/src/backend/utils/sort/sortsupport.c index 14d499af926..c8a75487a3a 100644 --- a/src/backend/utils/sort/sortsupport.c +++ b/src/backend/utils/sort/sortsupport.c @@ -17,7 +17,6 @@ #include "access/gist.h" #include "access/nbtree.h" -#include "catalog/pg_am.h" #include "fmgr.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 97e8f93b93e..f50a9c1a8e7 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -101,15 +101,12 @@ #include <limits.h> -#include "catalog/pg_am.h" #include "commands/tablespace.h" -#include "executor/executor.h" #include "miscadmin.h" #include "pg_trace.h" #include "storage/shmem.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" -#include "utils/rel.h" #include "utils/tuplesort.h" /* diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 06735f66709..7d2b34d4f20 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -51,8 +51,6 @@ #include "access/subtrans.h" #include "access/transam.h" #include "access/xact.h" -#include "access/xlog.h" -#include "catalog/catalog.h" #include "datatype/timestamp.h" #include "lib/pairingheap.h" #include "miscadmin.h" @@ -61,16 +59,11 @@ #include "storage/predicate.h" #include "storage/proc.h" #include "storage/procarray.h" -#include "storage/sinval.h" -#include "storage/sinvaladt.h" -#include "storage/spin.h" #include "utils/builtins.h" #include "utils/memutils.h" -#include "utils/rel.h" #include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "utils/timestamp.h" /* |