On 2026-Feb-16, Alvaro Herrera wrote: > I think we should in addition remove some includes that were kept during > recent IWYU hacking "for backwards compatibility", and instead include > them explicitly wherever they are needed. The attached does that.
Sigh, I forgot the attachments. -- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/
>From c7ef70743df6e9525e275c10ee303573e92aa374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= <[email protected]> Date: Mon, 16 Feb 2026 16:50:51 +0100 Subject: [PATCH 2/2] remove inclusions in pgstat.h --- src/backend/access/brin/brin.c | 1 + src/backend/access/gin/gininsert.c | 3 ++- src/backend/access/hash/hash.c | 1 + src/backend/access/hash/hashsort.c | 1 + src/backend/access/heap/heapam_handler.c | 1 + src/backend/access/heap/vacuumlazy.c | 1 + src/backend/access/nbtree/nbtree.c | 2 ++ src/backend/access/nbtree/nbtsort.c | 2 ++ src/backend/access/transam/clog.c | 1 + src/backend/access/transam/parallel.c | 1 + src/backend/access/transam/slru.c | 2 ++ src/backend/access/transam/timeline.c | 1 + src/backend/access/transam/twophase.c | 1 + src/backend/access/transam/xact.c | 1 + src/backend/access/transam/xlog.c | 1 + src/backend/access/transam/xlogarchive.c | 1 + src/backend/access/transam/xlogfuncs.c | 1 + src/backend/access/transam/xlogreader.c | 2 ++ src/backend/access/transam/xlogwait.c | 1 + src/backend/archive/shell_archive.c | 1 + src/backend/backup/basebackup.c | 1 + src/backend/backup/basebackup_progress.c | 1 + src/backend/backup/basebackup_throttle.c | 1 + src/backend/catalog/index.c | 1 + src/backend/commands/analyze.c | 1 + src/backend/commands/cluster.c | 1 + src/backend/commands/copyfrom.c | 1 + src/backend/commands/copyfromparse.c | 1 + src/backend/commands/copyto.c | 1 + src/backend/commands/indexcmds.c | 1 + src/backend/commands/vacuum.c | 1 + src/backend/commands/vacuumparallel.c | 1 + src/backend/executor/execParallel.c | 1 + src/backend/postmaster/autovacuum.c | 1 + src/backend/postmaster/auxprocess.c | 1 + src/backend/postmaster/postmaster.c | 1 + src/backend/replication/logical/applyparallelworker.c | 2 ++ src/backend/replication/logical/worker.c | 1 + src/backend/replication/walreceiver.c | 1 + src/backend/replication/walsender.c | 1 + src/backend/statistics/extended_stats.c | 1 + src/backend/storage/file/fd.c | 1 + src/backend/storage/ipc/ipci.c | 1 + src/backend/storage/lmgr/deadlock.c | 1 + src/backend/storage/lmgr/lmgr.c | 1 + src/backend/tcop/postgres.c | 1 + src/backend/utils/activity/backend_status.c | 1 + src/backend/utils/activity/pgstat.c | 1 + src/backend/utils/activity/pgstat_backend.c | 1 + src/backend/utils/activity/pgstat_database.c | 1 + src/backend/utils/adt/pgstatfuncs.c | 1 + src/backend/utils/error/elog.c | 1 + src/backend/utils/init/postinit.c | 1 + src/backend/utils/misc/guc_tables.c | 1 + src/common/controldata_utils.c | 1 + src/include/pgstat.h | 3 --- src/include/storage/condition_variable.h | 1 + src/test/modules/worker_spi/worker_spi.c | 1 + 58 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index 6887e421442..d5153839f61 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -35,6 +35,7 @@ #include "storage/freespace.h" #include "tcop/tcopprot.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/datum.h" #include "utils/fmgrprotos.h" #include "utils/guc.h" diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index 0d63fb4ba27..5f96ba0b17b 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -29,9 +29,10 @@ #include "storage/bufmgr.h" #include "storage/predicate.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" +#include "utils/builtins.h" #include "utils/datum.h" #include "utils/memutils.h" -#include "utils/builtins.h" #include "utils/rel.h" #include "utils/typcache.h" diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index e88ddb32a05..5ebd3d50aa1 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -30,6 +30,7 @@ #include "nodes/execnodes.h" #include "optimizer/plancat.h" #include "pgstat.h" +#include "utils/backend_progress.h" #include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashsort.c b/src/backend/access/hash/hashsort.c index 77bbfaa461b..9dd6adb716f 100644 --- a/src/backend/access/hash/hashsort.c +++ b/src/backend/access/hash/hashsort.c @@ -30,6 +30,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "port/pg_bitutils.h" +#include "utils/backend_progress.h" #include "utils/tuplesort.h" diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index cbef73e5d4b..aa4851fd7a1 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -43,6 +43,7 @@ #include "storage/predicate.h" #include "storage/procarray.h" #include "storage/smgr.h" +#include "utils/backend_progress.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 4be267ff657..9f7fd7b370a 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -151,6 +151,7 @@ #include "storage/freespace.h" #include "storage/lmgr.h" #include "storage/read_stream.h" +#include "utils/backend_status.h" #include "utils/lsyscache.h" #include "utils/pg_rusage.h" #include "utils/timestamp.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 3dec1ee657d..b8e7392f290 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -31,10 +31,12 @@ #include "storage/ipc.h" #include "storage/lmgr.h" #include "storage/read_stream.h" +#include "utils/backend_progress.h" #include "utils/datum.h" #include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/memutils.h" +#include "utils/wait_event.h" /* diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 3a45508f62e..c77c895718f 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -53,9 +53,11 @@ #include "pgstat.h" #include "storage/bulk_write.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/rel.h" #include "utils/sortsupport.h" #include "utils/tuplesort.h" +#include "utils/wait_event.h" /* Magic numbers for parallel state sharing */ diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index b5c38bbb162..3ee1cfdbc24 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -45,6 +45,7 @@ #include "storage/proc.h" #include "storage/sync.h" #include "utils/guc_hooks.h" +#include "utils/wait_event.h" /* * Defines for CLOG page sizes. A page is the same BLCKSZ as is used diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index fe00488487d..ac03cf31bf1 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -38,6 +38,7 @@ #include "storage/predicate.h" #include "storage/spin.h" #include "tcop/tcopprot.h" +#include "utils/backend_progress.h" #include "utils/combocid.h" #include "utils/guc.h" #include "utils/inval.h" diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 549c7e3e64b..9283af67cb7 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -70,7 +70,9 @@ #include "pgstat.h" #include "storage/fd.h" #include "storage/shmem.h" +#include "utils/backend_progress.h" #include "utils/guc.h" +#include "utils/wait_event.h" /* * Converts segment number to the filename of the segment. diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c index 60ee28665b1..68e5f692d26 100644 --- a/src/backend/access/transam/timeline.c +++ b/src/backend/access/transam/timeline.c @@ -41,6 +41,7 @@ #include "access/xlogdefs.h" #include "pgstat.h" #include "storage/fd.h" +#include "utils/wait_event.h" /* * Copies all timeline history files with id's between 'begin' and 'end' diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index eabc4d48208..47c0ede807e 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -106,6 +106,7 @@ #include "utils/injection_point.h" #include "utils/memutils.h" #include "utils/timestamp.h" +#include "utils/wait_event.h" /* * Directory where Two-phase commit files reside within PGDATA diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index eba4f063168..4e15d81fe42 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -62,6 +62,7 @@ #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/combocid.h" #include "utils/guc.h" diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 13ec6225b85..2eb7d376427 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -105,6 +105,7 @@ #include "utils/timeout.h" #include "utils/timestamp.h" #include "utils/varlena.h" +#include "utils/wait_event.h" #ifdef WAL_DEBUG #include "utils/memutils.h" diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c index aa0c2fe3afd..9a0c8097cb1 100644 --- a/src/backend/access/transam/xlogarchive.c +++ b/src/backend/access/transam/xlogarchive.c @@ -31,6 +31,7 @@ #include "replication/walsender.h" #include "storage/fd.h" #include "storage/ipc.h" +#include "utils/wait_event.h" /* * Attempt to retrieve the specified file from off-line archival storage. diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c index 2efe4105efb..8965be29703 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -34,6 +34,7 @@ #include "utils/memutils.h" #include "utils/pg_lsn.h" #include "utils/timestamp.h" +#include "utils/wait_event.h" /* * Backup-related variables. diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 03ada8aa0c5..f02f5e515b2 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -32,6 +32,8 @@ #include "catalog/pg_control.h" #include "common/pg_lzcompress.h" #include "replication/origin.h" +#include "utils/backend_progress.h" +#include "utils/wait_event.h" #ifndef FRONTEND #include "pgstat.h" diff --git a/src/backend/access/transam/xlogwait.c b/src/backend/access/transam/xlogwait.c index d286ff63123..bf4630677b4 100644 --- a/src/backend/access/transam/xlogwait.c +++ b/src/backend/access/transam/xlogwait.c @@ -60,6 +60,7 @@ #include "utils/fmgrprotos.h" #include "utils/pg_lsn.h" #include "utils/snapmgr.h" +#include "utils/wait_event.h" static int waitlsn_cmp(const pairingheap_node *a, const pairingheap_node *b, diff --git a/src/backend/archive/shell_archive.c b/src/backend/archive/shell_archive.c index 5b565968818..0b427a68809 100644 --- a/src/backend/archive/shell_archive.c +++ b/src/backend/archive/shell_archive.c @@ -22,6 +22,7 @@ #include "archive/shell_archive.h" #include "common/percentrepl.h" #include "pgstat.h" +#include "utils/wait_event.h" static bool shell_archive_configured(ArchiveModuleState *state); static bool shell_archive_file(ArchiveModuleState *state, diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index 2d74c648335..ab1fbae8001 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -48,6 +48,7 @@ #include "utils/ps_status.h" #include "utils/relcache.h" #include "utils/resowner.h" +#include "utils/wait_event.h" /* * How much data do we want to send in one CopyData message? Note that diff --git a/src/backend/backup/basebackup_progress.c b/src/backend/backup/basebackup_progress.c index fb9e57f04df..a195dd6c627 100644 --- a/src/backend/backup/basebackup_progress.c +++ b/src/backend/backup/basebackup_progress.c @@ -34,6 +34,7 @@ #include "backup/basebackup_sink.h" #include "commands/progress.h" #include "pgstat.h" +#include "utils/backend_progress.h" static void bbsink_progress_begin_backup(bbsink *sink); static void bbsink_progress_archive_contents(bbsink *sink, size_t len); diff --git a/src/backend/backup/basebackup_throttle.c b/src/backend/backup/basebackup_throttle.c index e112eed7485..4d8d90f356b 100644 --- a/src/backend/backup/basebackup_throttle.c +++ b/src/backend/backup/basebackup_throttle.c @@ -19,6 +19,7 @@ #include "pgstat.h" #include "storage/latch.h" #include "utils/timestamp.h" +#include "utils/wait_event.h" typedef struct bbsink_throttle { diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 43de42ce39e..44c22dc1a91 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -69,6 +69,7 @@ #include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/smgr.h" +#include "utils/backend_progress.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/guc.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index a483424152c..82ffd658537 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -45,6 +45,7 @@ #include "storage/bufmgr.h" #include "storage/procarray.h" #include "utils/attoptcache.h" +#include "utils/backend_status.h" #include "utils/datum.h" #include "utils/guc.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 60a4617a585..6b28a204a84 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -46,6 +46,7 @@ #include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/acl.h" +#include "utils/backend_progress.h" #include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/inval.h" diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index c0597266a82..f6dbad052a1 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -45,6 +45,7 @@ #include "rewrite/rewriteHandler.h" #include "storage/fd.h" #include "tcop/tcopprot.h" +#include "utils/backend_progress.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/portal.h" diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c index 94d6f415a06..0235410c1df 100644 --- a/src/backend/commands/copyfromparse.c +++ b/src/backend/commands/copyfromparse.c @@ -72,6 +72,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "port/pg_bswap.h" +#include "utils/backend_progress.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index 9ceeff6d99e..0f7c99a4204 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -33,6 +33,7 @@ #include "pgstat.h" #include "storage/fd.h" #include "tcop/tcopprot.h" +#include "utils/backend_progress.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 635679cc1f2..f50f3dc8b9a 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -58,6 +58,7 @@ #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" +#include "utils/backend_progress.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/guc.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 03932f45c8a..104a7574d19 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -53,6 +53,7 @@ #include "storage/pmsignal.h" #include "storage/proc.h" #include "storage/procarray.h" +#include "utils/backend_progress.h" #include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/guc.h" diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c index c3b3c9ea21a..de37e7c7d05 100644 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@ -36,6 +36,7 @@ #include "pgstat.h" #include "storage/bufmgr.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c index f87978c137e..4f10cc7df7b 100644 --- a/src/backend/executor/execParallel.c +++ b/src/backend/executor/execParallel.c @@ -46,6 +46,7 @@ #include "nodes/nodeFuncs.h" #include "pgstat.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/datum.h" #include "utils/dsa.h" #include "utils/lsyscache.h" diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 6fde740465f..2bc49153532 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -97,6 +97,7 @@ #include "storage/procsignal.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/fmgroids.h" #include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" diff --git a/src/backend/postmaster/auxprocess.c b/src/backend/postmaster/auxprocess.c index 8ea800c0bbd..316d227bef8 100644 --- a/src/backend/postmaster/auxprocess.c +++ b/src/backend/postmaster/auxprocess.c @@ -22,6 +22,7 @@ #include "storage/ipc.h" #include "storage/proc.h" #include "storage/procsignal.h" +#include "utils/backend_status.h" #include "utils/memutils.h" #include "utils/ps_status.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index d6133bfebc6..acb792dcb21 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -117,6 +117,7 @@ #include "storage/proc.h" #include "tcop/backend_startup.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/datetime.h" #include "utils/memutils.h" #include "utils/pidfile.h" diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c index 8a01f16a2ca..f38dc4419dc 100644 --- a/src/backend/replication/logical/applyparallelworker.c +++ b/src/backend/replication/logical/applyparallelworker.c @@ -159,6 +159,7 @@ #include "libpq/pqformat.h" #include "libpq/pqmq.h" +#include "libpq/protocol.h" #include "pgstat.h" #include "postmaster/interrupt.h" #include "replication/logicallauncher.h" @@ -168,6 +169,7 @@ #include "storage/ipc.h" #include "storage/lmgr.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/inval.h" #include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 32725c48623..9eb4a15ca05 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -285,6 +285,7 @@ #include "storage/procarray.h" #include "tcop/tcopprot.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 10e64a7d1f4..58d5c5ff994 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -62,6 +62,7 @@ #include "funcapi.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" +#include "libpq/protocol.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/auxprocess.h" diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 2cde8ebc729..3cbcb18e311 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -89,6 +89,7 @@ #include "tcop/dest.h" #include "tcop/tcopprot.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/guc.h" #include "utils/lsyscache.h" diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 3895ed72ef7..d6a37eb7b38 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -37,6 +37,7 @@ #include "utils/acl.h" #include "utils/array.h" #include "utils/attoptcache.h" +#include "utils/backend_progress.h" #include "utils/builtins.h" #include "utils/datum.h" #include "utils/fmgroids.h" diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 5d07b64a1ef..de2a2b64406 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -97,6 +97,7 @@ #include "storage/aio.h" #include "storage/fd.h" #include "storage/ipc.h" +#include "utils/backend_status.h" #include "utils/guc.h" #include "utils/guc_hooks.h" #include "utils/resowner.h" diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 1f7e933d500..22b756d43ee 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -50,6 +50,7 @@ #include "storage/procarray.h" #include "storage/procsignal.h" #include "storage/sinvaladt.h" +#include "utils/backend_status.h" #include "utils/guc.h" #include "utils/injection_point.h" diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index c0c4ed57d9e..4af4ed7baed 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -31,6 +31,7 @@ #include "storage/lmgr.h" #include "storage/proc.h" #include "storage/procnumber.h" +#include "utils/backend_status.h" #include "utils/memutils.h" diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 2ccf7237fee..5f8ce14b99f 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -24,6 +24,7 @@ #include "storage/lmgr.h" #include "storage/proc.h" #include "storage/procarray.h" +#include "utils/backend_progress.h" #include "utils/inval.h" diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 21de158adbb..356000c8a69 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -73,6 +73,7 @@ #include "tcop/pquery.h" #include "tcop/tcopprot.h" #include "tcop/utility.h" +#include "utils/backend_status.h" #include "utils/guc_hooks.h" #include "utils/injection_point.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/activity/backend_status.c b/src/backend/utils/activity/backend_status.c index cd087129469..5b0f3de4bb3 100644 --- a/src/backend/utils/activity/backend_status.c +++ b/src/backend/utils/activity/backend_status.c @@ -20,6 +20,7 @@ #include "storage/proc.h" /* for MyProc */ #include "storage/procarray.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 11bb71cad5a..e5e7dc7d727 100644 --- a/src/backend/utils/activity/pgstat.c +++ b/src/backend/utils/activity/pgstat.c @@ -110,6 +110,7 @@ #include "storage/ipc.h" #include "storage/lwlock.h" #include "utils/guc_hooks.h" +#include "utils/backend_status.h" #include "utils/memutils.h" #include "utils/pgstat_internal.h" #include "utils/timestamp.h" diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c index f2f8d3ff75f..c380298defd 100644 --- a/src/backend/utils/activity/pgstat_backend.c +++ b/src/backend/utils/activity/pgstat_backend.c @@ -29,6 +29,7 @@ #include "storage/bufmgr.h" #include "storage/proc.h" #include "storage/procarray.h" +#include "utils/backend_status.h" #include "utils/memutils.h" #include "utils/pgstat_internal.h" diff --git a/src/backend/utils/activity/pgstat_database.c b/src/backend/utils/activity/pgstat_database.c index 933dcb5cae5..e67ed2821f0 100644 --- a/src/backend/utils/activity/pgstat_database.c +++ b/src/backend/utils/activity/pgstat_database.c @@ -18,6 +18,7 @@ #include "postgres.h" #include "storage/standby.h" +#include "utils/backend_status.h" #include "utils/pgstat_internal.h" #include "utils/timestamp.h" diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index b1df96e7b0b..46af5ba2e10 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -29,6 +29,7 @@ #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/timestamp.h" diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 1e5b0531f3a..e80696e0917 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -83,6 +83,7 @@ #include "storage/ipc.h" #include "storage/proc.h" #include "tcop/tcopprot.h" +#include "utils/backend_status.h" #include "utils/guc_hooks.h" #include "utils/memutils.h" #include "utils/ps_status.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index b59e08605cc..f2b63d3a636 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -58,6 +58,7 @@ #include "tcop/backend_startup.h" #include "tcop/tcopprot.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/guc_hooks.h" diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 741fce8dede..e0af705e95f 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -90,6 +90,7 @@ #include "tcop/backend_startup.h" #include "tcop/tcopprot.h" #include "tsearch/ts_cache.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/bytea.h" #include "utils/float.h" diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c index 14530c6489a..4ab116afcde 100644 --- a/src/common/controldata_utils.c +++ b/src/common/controldata_utils.c @@ -37,6 +37,7 @@ #ifndef FRONTEND #include "pgstat.h" #include "storage/fd.h" +#include "utils/wait_event.h" #endif /* diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 775ecf37c1a..c897d233c16 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -16,11 +16,8 @@ #include "postmaster/pgarch.h" /* for MAX_XFN_CHARS */ #include "replication/conflict.h" #include "replication/worker_internal.h" -#include "utils/backend_progress.h" /* for backward compatibility */ /* IWYU pragma: export */ -#include "utils/backend_status.h" /* for backward compatibility */ /* IWYU pragma: export */ #include "utils/pgstat_kind.h" #include "utils/relcache.h" -#include "utils/wait_event.h" /* for backward compatibility */ /* IWYU pragma: export */ struct FullTransactionId; diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h index 14bd6dd55c0..73d02b4f02f 100644 --- a/src/include/storage/condition_variable.h +++ b/src/include/storage/condition_variable.h @@ -24,6 +24,7 @@ #include "storage/proclist_types.h" #include "storage/spin.h" +#include "utils/wait_event.h" /* IWYU pragma: keep */ typedef struct { diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index d1e4a2bd952..8908e88fde1 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -37,6 +37,7 @@ #include "pgstat.h" #include "tcop/utility.h" #include "utils/acl.h" +#include "utils/backend_status.h" #include "utils/builtins.h" #include "utils/snapmgr.h" -- 2.47.3
