Hi Andres, > > Apparently touching collationcmds.c, restricted_token.c and > > fe-auth-oauth.c was a mistake. Here is the corrected patch v4. > > Clearly this approach is not bulletproof enough to actually yield something > reliable enough to actually be applied.
I'm open to suggestions. I only have three machines to test my patches (Linux, MacOS and Windows, and I've just discovered that the master branch doesn't compile on Windows 11 at the moment). > > Reviewed-by: Andres Freund <[email protected]> > > I've not reviewed this. Apologies. Fixed. -- Best regards, Aleksander Alekseev
From cc377b7bfa8edc4ff65bbb4759ff99fb9c4b5652 Mon Sep 17 00:00:00 2001 From: Aleksander Alekseev <[email protected]> Date: Wed, 8 Oct 2025 15:58:38 +0300 Subject: [PATCH v5] Remove unused #include's Author: Aleksander Alekseev <[email protected]> Reviewed-by: Nathan Bossart <[email protected]> Discussion: https://postgr.es/m/CAJ7c6TMykDnFQRi2vOYonB82Oyz0MajYADi%3D2qr11p1EW_%3DmZg%40mail.gmail.com --- src/backend/access/common/detoast.c | 1 - src/backend/access/common/tidstore.c | 1 - src/backend/access/heap/heapam_handler.c | 1 - src/backend/backup/basebackup.c | 1 - src/backend/catalog/aclchk.c | 4 ---- src/backend/catalog/pg_constraint.c | 1 - src/backend/commands/event_trigger.c | 1 - src/backend/commands/explain.c | 4 ---- src/backend/commands/indexcmds.c | 1 - src/backend/commands/matview.c | 1 - src/backend/commands/tablecmds.c | 1 - src/backend/executor/execMain.c | 1 - src/backend/executor/execReplication.c | 2 -- src/backend/executor/execScan.c | 1 - src/backend/executor/functions.c | 1 - src/backend/executor/nodeIndexscan.c | 1 - src/backend/executor/nodeSetOp.c | 1 - src/backend/nodes/queryjumblefuncs.c | 3 --- src/backend/optimizer/path/equivclass.c | 1 - src/backend/optimizer/path/pathkeys.c | 1 - src/backend/optimizer/plan/initsplan.c | 1 - src/backend/optimizer/prep/prepjointree.c | 2 -- src/backend/optimizer/prep/prepunion.c | 2 -- src/backend/optimizer/util/clauses.c | 2 -- src/backend/optimizer/util/plancat.c | 1 - src/backend/replication/logical/launcher.c | 2 -- src/backend/statistics/extended_stats.c | 2 -- src/backend/statistics/relation_stats.c | 3 --- src/backend/statistics/stat_utils.c | 1 - src/backend/storage/aio/aio_init.c | 1 - src/backend/storage/aio/aio_io.c | 1 - src/backend/storage/aio/method_sync.c | 1 - src/backend/tcop/utility.c | 1 - src/backend/utils/activity/pgstat_backend.c | 1 - src/backend/utils/activity/pgstat_io.c | 1 - src/backend/utils/cache/syscache.c | 1 - src/backend/utils/time/snapmgr.c | 1 - src/bin/pg_dump/connectdb.c | 1 - src/bin/psql/crosstabview.c | 2 -- src/bin/scripts/vacuuming.c | 1 - src/fe_utils/cancel.c | 2 -- src/interfaces/libpq/fe-auth-oauth.c | 2 -- src/test/modules/dummy_index_am/dummy_index_am.c | 1 - src/test/modules/injection_points/injection_stats_fixed.c | 2 -- 44 files changed, 64 deletions(-) diff --git a/src/backend/access/common/detoast.c b/src/backend/access/common/detoast.c index 62651787742..008b1ca321c 100644 --- a/src/backend/access/common/detoast.c +++ b/src/backend/access/common/detoast.c @@ -20,7 +20,6 @@ #include "common/int.h" #include "common/pg_lzcompress.h" #include "utils/expandeddatum.h" -#include "utils/rel.h" static struct varlena *toast_fetch_datum(struct varlena *attr); static struct varlena *toast_fetch_datum_slice(struct varlena *attr, diff --git a/src/backend/access/common/tidstore.c b/src/backend/access/common/tidstore.c index 5bd75fb499c..c629aa4b98d 100644 --- a/src/backend/access/common/tidstore.c +++ b/src/backend/access/common/tidstore.c @@ -22,7 +22,6 @@ #include "postgres.h" #include "access/tidstore.h" -#include "miscadmin.h" #include "nodes/bitmapset.h" #include "storage/lwlock.h" #include "utils/dsa.h" diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index bcbac844bb6..d68431b6b1b 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -27,7 +27,6 @@ #include "access/syncscan.h" #include "access/tableam.h" #include "access/tsmapi.h" -#include "access/visibilitymap.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/index.h" diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index bb7d90aa5d9..0a8d621a373 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -36,7 +36,6 @@ #include "postmaster/syslogger.h" #include "postmaster/walsummarizer.h" #include "replication/slot.h" -#include "replication/walsender.h" #include "replication/walsender_private.h" #include "storage/bufpage.h" #include "storage/checksum.h" diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index cd139bd65a6..24cd9094539 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -67,13 +67,9 @@ #include "commands/defrem.h" #include "commands/event_trigger.h" #include "commands/extension.h" -#include "commands/proclang.h" -#include "commands/tablespace.h" -#include "foreign/foreign.h" #include "miscadmin.h" #include "nodes/makefuncs.h" #include "parser/parse_func.h" -#include "parser/parse_type.h" #include "storage/lmgr.h" #include "utils/acl.h" #include "utils/aclchk_internal.h" diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 6002fd0002f..448ad6fc244 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/genam.h" -#include "access/gist.h" #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index f34868da5ab..5594d5d7897 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/table.h" #include "access/xact.h" diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index e6edae0845c..1a4488e5b01 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -24,8 +24,6 @@ #include "commands/prepare.h" #include "foreign/fdwapi.h" #include "jit/jit.h" -#include "libpq/pqformat.h" -#include "libpq/protocol.h" #include "nodes/extensible.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" @@ -36,14 +34,12 @@ #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/guc_tables.h" -#include "utils/json.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/ruleutils.h" #include "utils/snapmgr.h" #include "utils/tuplesort.h" #include "utils/typcache.h" -#include "utils/xml.h" /* Hook for plugins to get control in ExplainOneQuery() */ diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index ca2bde62e82..abad568f402 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/amapi.h" -#include "access/gist.h" #include "access/heapam.h" #include "access/htup_details.h" #include "access/reloptions.h" diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index 441de55ac24..c6677651984 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -22,7 +22,6 @@ #include "access/xact.h" #include "catalog/indexing.h" #include "catalog/namespace.h" -#include "catalog/pg_am.h" #include "catalog/pg_opclass.h" #include "commands/cluster.h" #include "commands/matview.h" diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index fc89352b661..322b3a90378 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -16,7 +16,6 @@ #include "access/attmap.h" #include "access/genam.h" -#include "access/gist.h" #include "access/heapam.h" #include "access/heapam_xlog.h" #include "access/multixact.h" diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 831c55ce787..be0c0b2029e 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -51,7 +51,6 @@ #include "foreign/fdwapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/queryjumble.h" #include "parser/parse_relation.h" #include "pgstat.h" #include "rewrite/rewriteHandler.h" diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index b409d4ecbf5..d2613c3c439 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -16,13 +16,11 @@ #include "access/commit_ts.h" #include "access/genam.h" -#include "access/gist.h" #include "access/relscan.h" #include "access/tableam.h" #include "access/transam.h" #include "access/xact.h" #include "access/heapam.h" -#include "catalog/pg_am_d.h" #include "commands/trigger.h" #include "executor/executor.h" #include "executor/nodeModifyTable.h" diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c index 90726949a87..2e87f731dac 100644 --- a/src/backend/executor/execScan.c +++ b/src/backend/executor/execScan.c @@ -20,7 +20,6 @@ #include "executor/executor.h" #include "executor/execScan.h" -#include "miscadmin.h" /* ---------------------------------------------------------------- * ExecScan diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 630d708d2a3..b551daea047 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -27,7 +27,6 @@ #include "parser/parse_collate.h" #include "parser/parse_func.h" #include "rewrite/rewriteHandler.h" -#include "storage/proc.h" #include "tcop/utility.h" #include "utils/builtins.h" #include "utils/datum.h" diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 7fcaa37fe62..6bc1219c8fd 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -32,7 +32,6 @@ #include "access/nbtree.h" #include "access/relscan.h" #include "access/tableam.h" -#include "catalog/pg_am.h" #include "executor/executor.h" #include "executor/nodeIndexscan.h" #include "lib/pairingheap.h" diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 4068481a523..d13ed2b9535 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -45,7 +45,6 @@ #include "postgres.h" -#include "access/htup_details.h" #include "executor/executor.h" #include "executor/nodeSetOp.h" #include "miscadmin.h" diff --git a/src/backend/nodes/queryjumblefuncs.c b/src/backend/nodes/queryjumblefuncs.c index 31f97151977..c910692a416 100644 --- a/src/backend/nodes/queryjumblefuncs.c +++ b/src/backend/nodes/queryjumblefuncs.c @@ -38,12 +38,9 @@ #include "postgres.h" #include "access/transam.h" -#include "catalog/pg_proc.h" #include "common/hashfn.h" #include "miscadmin.h" -#include "nodes/nodeFuncs.h" #include "nodes/queryjumble.h" -#include "utils/lsyscache.h" #include "parser/scansup.h" #define JUMBLE_SIZE 1024 /* query serialization buffer size */ diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index 441f12f6c50..09b87aa422a 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -18,7 +18,6 @@ #include <limits.h> -#include "access/stratnum.h" #include "catalog/pg_type.h" #include "common/hashfn.h" #include "nodes/makefuncs.h" diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index 879dcb4608e..62dfe51d03a 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -17,7 +17,6 @@ */ #include "postgres.h" -#include "access/stratnum.h" #include "catalog/pg_opfamily.h" #include "nodes/nodeFuncs.h" #include "optimizer/cost.h" diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 65d473d95b6..94fe0945d51 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/nbtree.h" -#include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index 481d8011791..0ba8ec6f731 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -27,7 +27,6 @@ #include "postgres.h" #include "access/table.h" -#include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" #include "nodes/makefuncs.h" @@ -40,7 +39,6 @@ #include "optimizer/prep.h" #include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "parser/parse_relation.h" #include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 55665824179..46a27eb1212 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -25,8 +25,6 @@ #include <math.h> -#include "access/htup_details.h" -#include "catalog/pg_type.h" #include "miscadmin.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 81d768ff2a2..272e7d829e1 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -42,9 +42,7 @@ #include "optimizer/planmain.h" #include "parser/analyze.h" #include "parser/parse_coerce.h" -#include "parser/parse_collate.h" #include "parser/parse_func.h" -#include "parser/parse_oper.h" #include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index da5d901ec3c..d47da2e8d04 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -19,7 +19,6 @@ #include "access/genam.h" #include "access/htup_details.h" -#include "access/nbtree.h" #include "access/sysattr.h" #include "access/table.h" #include "access/tableam.h" diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c index 218cefe86e2..ae7f2e5159e 100644 --- a/src/backend/replication/logical/launcher.c +++ b/src/backend/replication/logical/launcher.c @@ -42,8 +42,6 @@ #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/pg_lsn.h" -#include "utils/snapmgr.h" -#include "utils/syscache.h" /* max sleep time between cycles (3min) */ #define DEFAULT_NAPTIME_PER_CYCLE 180000L diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 3c3d2d315c6..e57b50091a5 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -31,10 +31,8 @@ #include "optimizer/optimizer.h" #include "parser/parsetree.h" #include "pgstat.h" -#include "postmaster/autovacuum.h" #include "statistics/extended_stats_internal.h" #include "statistics/statistics.h" -#include "utils/acl.h" #include "utils/array.h" #include "utils/attoptcache.h" #include "utils/builtins.h" diff --git a/src/backend/statistics/relation_stats.c b/src/backend/statistics/relation_stats.c index a59f0c519a4..3d14537b2aa 100644 --- a/src/backend/statistics/relation_stats.c +++ b/src/backend/statistics/relation_stats.c @@ -19,12 +19,9 @@ #include "access/heapam.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "statistics/stat_utils.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/fmgrprotos.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/statistics/stat_utils.c b/src/backend/statistics/stat_utils.c index ef7e5168bed..0544dcf07c6 100644 --- a/src/backend/statistics/stat_utils.c +++ b/src/backend/statistics/stat_utils.c @@ -23,7 +23,6 @@ #include "funcapi.h" #include "miscadmin.h" #include "statistics/stat_utils.h" -#include "storage/lmgr.h" #include "utils/acl.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/storage/aio/aio_init.c b/src/backend/storage/aio/aio_init.c index 54ab84dd6f0..3ca78502c51 100644 --- a/src/backend/storage/aio/aio_init.c +++ b/src/backend/storage/aio/aio_init.c @@ -19,7 +19,6 @@ #include "storage/aio_internal.h" #include "storage/aio_subsys.h" #include "storage/bufmgr.h" -#include "storage/io_worker.h" #include "storage/ipc.h" #include "storage/proc.h" #include "storage/shmem.h" diff --git a/src/backend/storage/aio/aio_io.c b/src/backend/storage/aio/aio_io.c index 7d11d40284a..d6fff000e10 100644 --- a/src/backend/storage/aio/aio_io.c +++ b/src/backend/storage/aio/aio_io.c @@ -21,7 +21,6 @@ #include "miscadmin.h" #include "storage/aio.h" #include "storage/aio_internal.h" -#include "storage/fd.h" #include "utils/wait_event.h" diff --git a/src/backend/storage/aio/method_sync.c b/src/backend/storage/aio/method_sync.c index 902c2428d41..1fd8cf02d0f 100644 --- a/src/backend/storage/aio/method_sync.c +++ b/src/backend/storage/aio/method_sync.c @@ -18,7 +18,6 @@ #include "postgres.h" -#include "storage/aio.h" #include "storage/aio_internal.h" static bool pgaio_sync_needs_synchronous_execution(PgAioHandle *ioh); diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 918db53dd5e..e4605c2ca9f 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -21,7 +21,6 @@ #include "access/xact.h" #include "access/xlog.h" #include "catalog/namespace.h" -#include "catalog/pg_authid.h" #include "catalog/pg_inherits.h" #include "catalog/toasting.h" #include "commands/alter.h" diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c index a864ae8e6a6..d5c9cae1e23 100644 --- a/src/backend/utils/activity/pgstat_backend.c +++ b/src/backend/utils/activity/pgstat_backend.c @@ -29,7 +29,6 @@ #include "storage/bufmgr.h" #include "storage/proc.h" #include "storage/procarray.h" -#include "utils/memutils.h" #include "utils/pgstat_internal.h" /* diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c index 13ae57ed649..f0ddca0acf2 100644 --- a/src/backend/utils/activity/pgstat_io.c +++ b/src/backend/utils/activity/pgstat_io.c @@ -17,7 +17,6 @@ #include "postgres.h" #include "executor/instrument.h" -#include "storage/bufmgr.h" #include "utils/pgstat_internal.h" static PgStat_PendingIO PendingIOStats; diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 0e70a8020b7..25dc6b9f375 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -35,7 +35,6 @@ #include "utils/catcache.h" #include "utils/inval.h" #include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/syscache.h" /*--------------------------------------------------------------------------- diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 65561cc6bc3..e1acc717310 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -110,7 +110,6 @@ #include "access/subtrans.h" #include "access/transam.h" #include "access/xact.h" -#include "datatype/timestamp.h" #include "lib/pairingheap.h" #include "miscadmin.h" #include "port/pg_lfind.h" diff --git a/src/bin/pg_dump/connectdb.c b/src/bin/pg_dump/connectdb.c index d55d53dbeea..40dd747242b 100644 --- a/src/bin/pg_dump/connectdb.c +++ b/src/bin/pg_dump/connectdb.c @@ -18,7 +18,6 @@ #include "common/logging.h" #include "common/string.h" #include "connectdb.h" -#include "dumputils.h" #include "fe_utils/string_utils.h" static char *constructConnStr(const char **keywords, const char **values); diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c index 3e5cd0a96d4..474e032da11 100644 --- a/src/bin/psql/crosstabview.c +++ b/src/bin/psql/crosstabview.c @@ -7,11 +7,9 @@ */ #include "postgres_fe.h" -#include "common.h" #include "common/int.h" #include "common/logging.h" #include "crosstabview.h" -#include "pqexpbuffer.h" #include "psqlscanslash.h" #include "settings.h" diff --git a/src/bin/scripts/vacuuming.c b/src/bin/scripts/vacuuming.c index e2c6ae1dc7c..1be6b81db6d 100644 --- a/src/bin/scripts/vacuuming.c +++ b/src/bin/scripts/vacuuming.c @@ -17,7 +17,6 @@ #include "common/connect.h" #include "common/logging.h" #include "fe_utils/cancel.h" -#include "fe_utils/option_utils.h" #include "fe_utils/parallel_slot.h" #include "fe_utils/query_utils.h" #include "fe_utils/string_utils.h" diff --git a/src/fe_utils/cancel.c b/src/fe_utils/cancel.c index f434718eac8..a63c3546f33 100644 --- a/src/fe_utils/cancel.c +++ b/src/fe_utils/cancel.c @@ -18,9 +18,7 @@ #include <unistd.h> -#include "common/connect.h" #include "fe_utils/cancel.h" -#include "fe_utils/string_utils.h" /* diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index d146c5f567c..bdc6a6b78ef 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -19,8 +19,6 @@ #include <dlfcn.h> #endif -#include "common/base64.h" -#include "common/hmac.h" #include "common/jsonapi.h" #include "common/oauth-common.h" #include "fe-auth.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 94ef639b6fc..81f8696d727 100644 --- a/src/test/modules/dummy_index_am/dummy_index_am.c +++ b/src/test/modules/dummy_index_am/dummy_index_am.c @@ -15,7 +15,6 @@ #include "access/amapi.h" #include "access/reloptions.h" -#include "catalog/index.h" #include "commands/vacuum.h" #include "nodes/pathnodes.h" diff --git a/src/test/modules/injection_points/injection_stats_fixed.c b/src/test/modules/injection_points/injection_stats_fixed.c index b493e8f77a3..64d48149dbd 100644 --- a/src/test/modules/injection_points/injection_stats_fixed.c +++ b/src/test/modules/injection_points/injection_stats_fixed.c @@ -17,11 +17,9 @@ #include "fmgr.h" #include "access/htup_details.h" -#include "common/hashfn.h" #include "funcapi.h" #include "injection_stats.h" #include "pgstat.h" -#include "utils/builtins.h" #include "utils/pgstat_internal.h" /* Structures for statistics of injection points, fixed-size */ -- 2.43.0
