diff options
Diffstat (limited to 'src')
425 files changed, 230 insertions, 994 deletions
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index 1087a9011ea..0574d81d414 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -35,8 +35,8 @@ #include "storage/freespace.h" #include "tcop/tcopprot.h" /* pgrminclude ignore */ #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/guc.h" #include "utils/index_selfuncs.h" #include "utils/memutils.h" diff --git a/src/backend/access/brin/brin_bloom.c b/src/backend/access/brin/brin_bloom.c index 13c1e681f34..32de039161e 100644 --- a/src/backend/access/brin/brin_bloom.c +++ b/src/backend/access/brin/brin_bloom.c @@ -119,17 +119,14 @@ #include "access/brin_internal.h" #include "access/brin_page.h" #include "access/brin_tuple.h" -#include "access/hash.h" #include "access/htup_details.h" #include "access/reloptions.h" -#include "access/stratnum.h" +#include "catalog/pg_am.h" #include "catalog/pg_type.h" #include "catalog/pg_amop.h" -#include "utils/builtins.h" -#include "utils/datum.h" -#include "utils/lsyscache.h" +#include "common/hashfn.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" -#include "utils/syscache.h" #include <math.h> diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c index e032efe86ee..750276998c5 100644 --- a/src/backend/access/brin/brin_inclusion.c +++ b/src/backend/access/brin/brin_inclusion.c @@ -30,8 +30,8 @@ #include "access/skey.h" #include "catalog/pg_amop.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c index 6b3dd21e42b..caf6991eb1b 100644 --- a/src/backend/access/brin/brin_minmax.c +++ b/src/backend/access/brin/brin_minmax.c @@ -12,12 +12,10 @@ #include "access/brin_internal.h" #include "access/brin_tuple.h" -#include "access/genam.h" #include "access/stratnum.h" #include "catalog/pg_amop.h" -#include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index 2c29aa3d4ef..207a5a15b3d 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -77,7 +77,6 @@ #include "utils/inet.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/numeric.h" #include "utils/pg_lsn.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c index f54fb011974..b69217c1ec6 100644 --- a/src/backend/access/brin/brin_pageops.c +++ b/src/backend/access/brin/brin_pageops.c @@ -19,7 +19,6 @@ #include "storage/bufmgr.h" #include "storage/freespace.h" #include "storage/lmgr.h" -#include "storage/smgr.h" #include "utils/rel.h" /* diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c index 69b8807fc0f..5a9ed40ab64 100644 --- a/src/backend/access/brin/brin_revmap.c +++ b/src/backend/access/brin/brin_revmap.c @@ -29,7 +29,6 @@ #include "access/xloginsert.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/common/attmap.c b/src/backend/access/common/attmap.c index 10ba06426d8..b0fe27ef57d 100644 --- a/src/backend/access/common/attmap.c +++ b/src/backend/access/common/attmap.c @@ -23,7 +23,6 @@ #include "postgres.h" #include "access/attmap.h" -#include "access/htup_details.h" #include "utils/builtins.h" diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 38e544f6dfa..5c89fbbef83 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -61,7 +61,6 @@ #include "access/sysattr.h" #include "access/tupdesc_details.h" #include "common/hashfn.h" -#include "executor/tuptable.h" #include "utils/datum.h" #include "utils/expandeddatum.h" #include "utils/hsearch.h" diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c index ba0f8f5407a..37c5aa2b955 100644 --- a/src/backend/access/common/printtup.c +++ b/src/backend/access/common/printtup.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/printtup.h" -#include "libpq/libpq.h" #include "libpq/pqformat.h" #include "tcop/pquery.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/common/relation.c b/src/backend/access/common/relation.c index 597a278cd9e..d8a313a2c90 100644 --- a/src/backend/access/common/relation.c +++ b/src/backend/access/common/relation.c @@ -23,7 +23,6 @@ #include "access/relation.h" #include "access/xact.h" #include "catalog/namespace.h" -#include "miscadmin.h" #include "pgstat.h" #include "storage/lmgr.h" #include "utils/inval.h" diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 0921a736ab2..d6eb5d85599 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -27,9 +27,7 @@ #include "catalog/pg_type.h" #include "commands/defrem.h" #include "commands/tablespace.h" -#include "commands/view.h" #include "nodes/makefuncs.h" -#include "postmaster/postmaster.h" #include "utils/array.h" #include "utils/attoptcache.h" #include "utils/builtins.h" diff --git a/src/backend/access/common/toast_compression.c b/src/backend/access/common/toast_compression.c index 09d05d97c58..52230f31c68 100644 --- a/src/backend/access/common/toast_compression.c +++ b/src/backend/access/common/toast_compression.c @@ -20,8 +20,6 @@ #include "access/detoast.h" #include "access/toast_compression.h" #include "common/pg_lzcompress.h" -#include "fmgr.h" -#include "utils/builtins.h" #include "varatt.h" /* GUC */ diff --git a/src/backend/access/common/toast_internals.c b/src/backend/access/common/toast_internals.c index a0522fcf5c7..90d0654e629 100644 --- a/src/backend/access/common/toast_internals.c +++ b/src/backend/access/common/toast_internals.c @@ -21,7 +21,6 @@ #include "access/toast_internals.h" #include "access/xact.h" #include "catalog/catalog.h" -#include "common/pg_lzcompress.h" #include "miscadmin.h" #include "utils/fmgroids.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index 134f55f9f21..2373e76f77e 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -16,7 +16,7 @@ #include "access/gin.h" #include "access/stratnum.h" #include "utils/array.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index 63dd9a3722a..94ef951e14f 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -17,7 +17,6 @@ #include "access/gin_private.h" #include "access/ginxlog.h" #include "access/xloginsert.h" -#include "miscadmin.h" #include "utils/rel.h" static void entrySplitPage(GinBtree btree, Buffer origbuf, diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index e118cecb9a4..eeca3ed318f 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -31,7 +31,7 @@ #include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/acl.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index 45cc8c133f2..71f38be90c3 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -15,15 +15,12 @@ #include "postgres.h" #include "access/gin_private.h" -#include "access/ginxlog.h" #include "access/tableam.h" #include "access/xloginsert.h" -#include "catalog/index.h" #include "miscadmin.h" +#include "nodes/execnodes.h" #include "storage/bufmgr.h" -#include "storage/indexfsm.h" #include "storage/predicate.h" -#include "storage/smgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginlogic.c b/src/backend/access/gin/ginlogic.c index b18ddd11c2d..28caf91f857 100644 --- a/src/backend/access/gin/ginlogic.c +++ b/src/backend/access/gin/ginlogic.c @@ -35,12 +35,6 @@ #include "postgres.h" #include "access/gin_private.h" -#include "access/reloptions.h" -#include "catalog/pg_collation.h" -#include "catalog/pg_type.h" -#include "miscadmin.h" -#include "storage/indexfsm.h" -#include "storage/lmgr.h" /* diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index 6d05e7bdcda..5747ae6a4ca 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -23,10 +23,9 @@ #include "commands/vacuum.h" #include "miscadmin.h" #include "storage/indexfsm.h" -#include "storage/lmgr.h" -#include "storage/predicate.h" #include "utils/builtins.h" #include "utils/index_selfuncs.h" +#include "utils/rel.h" #include "utils/typcache.h" diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c index 13cf390bb3d..74420a129aa 100644 --- a/src/backend/access/gin/ginvalidate.c +++ b/src/backend/access/gin/ginvalidate.c @@ -21,8 +21,6 @@ #include "catalog/pg_opclass.h" #include "catalog/pg_opfamily.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" -#include "utils/lsyscache.h" #include "utils/regproc.h" #include "utils/syscache.h" diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 943ae91019f..ed4ffa63a77 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -21,9 +21,8 @@ #include "commands/vacuum.h" #include "miscadmin.h" #include "nodes/execnodes.h" -#include "storage/lmgr.h" #include "storage/predicate.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c index 465246173ba..ba06df30faf 100644 --- a/src/backend/access/gist/gistbuild.c +++ b/src/backend/access/gist/gistbuild.c @@ -36,11 +36,10 @@ #include "access/genam.h" #include "access/gist_private.h" -#include "access/gistxlog.h" #include "access/tableam.h" #include "access/xloginsert.h" -#include "catalog/index.h" #include "miscadmin.h" +#include "nodes/execnodes.h" #include "optimizer/optimizer.h" #include "storage/bufmgr.h" #include "storage/bulk_write.h" diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c index a6f39c1b488..4c2301da005 100644 --- a/src/backend/access/gist/gistbuildbuffers.c +++ b/src/backend/access/gist/gistbuildbuffers.c @@ -14,13 +14,9 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/gist_private.h" -#include "catalog/index.h" -#include "miscadmin.h" #include "storage/buffile.h" #include "storage/bufmgr.h" -#include "utils/memutils.h" #include "utils/rel.h" static GISTNodeBufferPage *gistAllocateNewPageBuffer(GISTBuildBuffers *gfbb); diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index d5c8ae8166c..b35b8a97577 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -20,7 +20,6 @@ #include "lib/pairingheap.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/float.h" #include "utils/memutils.h" diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index da61f758bfb..781c2f73588 100644 --- a/src/backend/access/gist/gistproc.c +++ b/src/backend/access/gist/gistproc.c @@ -21,8 +21,8 @@ #include "access/gist.h" #include "access/stratnum.h" -#include "utils/builtins.h" #include "utils/float.h" +#include "utils/fmgrprotos.h" #include "utils/geo_decls.h" #include "utils/sortsupport.h" diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 00570445133..d2d0b36d4ea 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -18,13 +18,12 @@ #include "access/gist_private.h" #include "access/htup_details.h" #include "access/reloptions.h" -#include "catalog/pg_opclass.h" #include "common/pg_prng.h" #include "storage/indexfsm.h" -#include "storage/lmgr.h" #include "utils/float.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c index 698e01ed2f7..0901543a60a 100644 --- a/src/backend/access/gist/gistvalidate.c +++ b/src/backend/access/gist/gistvalidate.c @@ -21,7 +21,6 @@ #include "catalog/pg_opclass.h" #include "catalog/pg_opfamily.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/regproc.h" #include "utils/syscache.h" diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 82b66bd0ee4..fafd9f1c94f 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -16,12 +16,10 @@ #include "access/bufmask.h" #include "access/gist_private.h" #include "access/gistxlog.h" -#include "access/heapam_xlog.h" #include "access/transam.h" #include "access/xloginsert.h" #include "access/xlogutils.h" -#include "miscadmin.h" -#include "storage/procarray.h" +#include "storage/standby.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index fa5b59a150a..75bb02dfd73 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -23,13 +23,13 @@ #include "access/relscan.h" #include "access/tableam.h" #include "access/xloginsert.h" -#include "catalog/index.h" #include "commands/progress.h" #include "commands/vacuum.h" #include "miscadmin.h" -#include "optimizer/plancat.h" +#include "nodes/execnodes.h" #include "pgstat.h" -#include "utils/builtins.h" +#include "optimizer/plancat.h" +#include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c index f6957dab7d8..4e05a1b4632 100644 --- a/src/backend/access/hash/hash_xlog.c +++ b/src/backend/access/hash/hash_xlog.c @@ -17,11 +17,8 @@ #include "access/bufmask.h" #include "access/hash.h" #include "access/hash_xlog.h" -#include "access/transam.h" -#include "access/xlog.h" #include "access/xlogutils.h" -#include "miscadmin.h" -#include "storage/procarray.h" +#include "storage/standby.h" /* * replay a hash index meta page diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c index 2d661fdddf5..ce8ee0ea2ef 100644 --- a/src/backend/access/hash/hashfunc.c +++ b/src/backend/access/hash/hashfunc.c @@ -26,11 +26,9 @@ #include "postgres.h" -#include "access/hash.h" -#include "catalog/pg_collation.h" #include "common/hashfn.h" -#include "utils/builtins.h" #include "utils/float.h" +#include "utils/fmgrprotos.h" #include "utils/pg_locale.h" #include "varatt.h" diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index f46d9d2e742..9ac16204118 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -19,8 +19,6 @@ #include "access/hash_xlog.h" #include "access/xloginsert.h" #include "miscadmin.h" -#include "storage/buf_internals.h" -#include "storage/lwlock.h" #include "storage/predicate.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 69b07b1453a..d09c349e28f 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -33,9 +33,9 @@ #include "access/xloginsert.h" #include "miscadmin.h" #include "port/pg_bitutils.h" -#include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/smgr.h" +#include "utils/rel.h" static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock, uint32 nblocks); diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index 2c684808523..20028f5cd14 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -18,7 +18,6 @@ #include "access/reloptions.h" #include "access/relscan.h" #include "port/pg_bitutils.h" -#include "storage/buf_internals.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 707460a5364..34bc60f625f 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -32,7 +32,6 @@ #include "postgres.h" #include "access/bufmask.h" -#include "access/genam.h" #include "access/heapam.h" #include "access/heapam_xlog.h" #include "access/heaptoast.h" @@ -62,12 +61,9 @@ #include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/procarray.h" -#include "storage/smgr.h" -#include "storage/spin.h" #include "storage/standby.h" #include "utils/datum.h" #include "utils/inval.h" -#include "utils/lsyscache.h" #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/spccache.h" diff --git a/src/backend/access/heap/heapam_visibility.c b/src/backend/access/heap/heapam_visibility.c index 283cea76aa2..9243feed01f 100644 --- a/src/backend/access/heap/heapam_visibility.c +++ b/src/backend/access/heap/heapam_visibility.c @@ -69,7 +69,6 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/multixact.h" -#include "access/subtrans.h" #include "access/tableam.h" #include "access/transam.h" #include "access/xact.h" @@ -77,7 +76,6 @@ #include "storage/bufmgr.h" #include "storage/procarray.h" #include "utils/builtins.h" -#include "utils/combocid.h" #include "utils/snapmgr.h" diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index c7248d7c689..7c662cdf46e 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -22,7 +22,6 @@ #include "storage/bufmgr.h" #include "storage/freespace.h" #include "storage/lmgr.h" -#include "storage/smgr.h" /* diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 59176335676..e2f2c37f4d6 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -20,13 +20,11 @@ #include "access/transam.h" #include "access/xlog.h" #include "access/xloginsert.h" -#include "catalog/catalog.h" #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" #include "utils/snapmgr.h" #include "utils/rel.h" -#include "utils/snapmgr.h" /* Working data for heap_page_prune and subroutines */ typedef struct diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index a578b876174..473f3aa9bef 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -111,12 +111,10 @@ #include "access/transam.h" #include "access/xact.h" #include "access/xloginsert.h" -#include "catalog/catalog.h" #include "common/file_utils.h" #include "lib/ilist.h" #include "miscadmin.h" #include "pgstat.h" -#include "replication/logical.h" #include "replication/slot.h" #include "storage/bufmgr.h" #include "storage/bulk_write.h" diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 5acea4a43a4..8b320c3f89a 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -34,7 +34,6 @@ #include <math.h> -#include "access/amapi.h" #include "access/genam.h" #include "access/heapam.h" #include "access/heapam_xlog.h" @@ -42,24 +41,19 @@ #include "access/multixact.h" #include "access/transam.h" #include "access/visibilitymap.h" -#include "access/xact.h" -#include "access/xlog.h" #include "access/xloginsert.h" -#include "catalog/index.h" #include "catalog/storage.h" #include "commands/dbcommands.h" #include "commands/progress.h" #include "commands/vacuum.h" #include "executor/instrument.h" #include "miscadmin.h" -#include "optimizer/paths.h" #include "pgstat.h" #include "portability/instr_time.h" #include "postmaster/autovacuum.h" #include "storage/bufmgr.h" #include "storage/freespace.h" #include "storage/lmgr.h" -#include "tcop/tcopprot.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index 19785ff9d34..1ab6c865e3c 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -93,9 +93,9 @@ #include "miscadmin.h" #include "port/pg_bitutils.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" #include "storage/smgr.h" #include "utils/inval.h" +#include "utils/rel.h" /*#define TRACE_VISIBILITYMAP */ diff --git a/src/backend/access/index/amapi.c b/src/backend/access/index/amapi.c index ffc40e9d28b..079fb7cba65 100644 --- a/src/backend/access/index/amapi.c +++ b/src/backend/access/index/amapi.c @@ -17,7 +17,7 @@ #include "access/htup_details.h" #include "catalog/pg_am.h" #include "catalog/pg_opclass.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/syscache.h" diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 7b6131b9e09..de751e8e4a3 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -20,7 +20,6 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/tableam.h" #include "access/transam.h" @@ -30,13 +29,11 @@ #include "storage/bufmgr.h" #include "storage/procarray.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/rls.h" #include "utils/ruleutils.h" #include "utils/snapmgr.h" -#include "utils/syscache.h" /* ---------------------------------------------------------------- diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 14baacd61f4..78ac3b1abb3 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -44,19 +44,14 @@ #include "postgres.h" #include "access/amapi.h" -#include "access/heapam.h" +#include "access/relation.h" #include "access/reloptions.h" #include "access/relscan.h" #include "access/tableam.h" -#include "access/transam.h" -#include "access/xlog.h" #include "catalog/index.h" -#include "catalog/pg_amproc.h" #include "catalog/pg_type.h" -#include "commands/defrem.h" -#include "nodes/makefuncs.h" +#include "nodes/execnodes.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/ruleutils.h" diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 63149a2552c..1c72867c84e 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -57,7 +57,7 @@ #include <limits.h> -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/sortsupport.h" #ifdef STRESS_SORT_INT_MIN diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index e9cfc136042..7e8902e48cd 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -25,7 +25,6 @@ #include "miscadmin.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "storage/smgr.h" /* Minimum tree height for application of fastpath optimization */ #define BTREE_FASTPATH_MIN_LEVEL 2 diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 90990ea77a1..01bbece6bfd 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -31,7 +31,6 @@ #include "common/int.h" #include "miscadmin.h" #include "storage/indexfsm.h" -#include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/procarray.h" #include "utils/memdebug.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 21d879a3bdf..41df1027d2d 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -19,22 +19,20 @@ #include "postgres.h" #include "access/nbtree.h" -#include "access/nbtxlog.h" #include "access/relscan.h" -#include "access/xlog.h" #include "access/xloginsert.h" #include "commands/progress.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "nodes/execnodes.h" #include "pgstat.h" -#include "postmaster/autovacuum.h" #include "storage/bulk_write.h" #include "storage/condition_variable.h" #include "storage/indexfsm.h" #include "storage/ipc.h" #include "storage/lmgr.h" -#include "utils/builtins.h" +#include "storage/smgr.h" +#include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/memutils.h" diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 3f1e7b9c155..f5d7b3b0c30 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -45,7 +45,6 @@ #include "access/relscan.h" #include "access/table.h" #include "access/xact.h" -#include "access/xlog.h" #include "access/xloginsert.h" #include "catalog/index.h" #include "commands/progress.h" diff --git a/src/backend/access/nbtree/nbtsplitloc.c b/src/backend/access/nbtree/nbtsplitloc.c index 490e7bfd4df..1f40d40263e 100644 --- a/src/backend/access/nbtree/nbtsplitloc.c +++ b/src/backend/access/nbtree/nbtsplitloc.c @@ -16,7 +16,6 @@ #include "access/nbtree.h" #include "common/int.h" -#include "storage/lmgr.h" typedef enum { diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 2e6fc14d7a0..d50317096da 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -20,7 +20,6 @@ #include "access/nbtree.h" #include "access/reloptions.h" #include "access/relscan.h" -#include "catalog/catalog.h" #include "commands/progress.h" #include "lib/qunique.h" #include "miscadmin.h" diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index f683c210569..b5b0e22447e 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -18,10 +18,8 @@ #include "access/nbtree.h" #include "access/nbtxlog.h" #include "access/transam.h" -#include "access/xlog.h" #include "access/xlogutils.h" -#include "miscadmin.h" -#include "storage/procarray.h" +#include "storage/standby.h" #include "utils/memutils.h" static MemoryContext opCtx; /* working memory for operations */ diff --git a/src/backend/access/rmgrdesc/committsdesc.c b/src/backend/access/rmgrdesc/committsdesc.c index c2b14f81533..f5f09a1bc79 100644 --- a/src/backend/access/rmgrdesc/committsdesc.c +++ b/src/backend/access/rmgrdesc/committsdesc.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/commit_ts.h" -#include "utils/timestamp.h" void diff --git a/src/backend/access/rmgrdesc/genericdesc.c b/src/backend/access/rmgrdesc/genericdesc.c index 04ff704effa..c35641483b8 100644 --- a/src/backend/access/rmgrdesc/genericdesc.c +++ b/src/backend/access/rmgrdesc/genericdesc.c @@ -15,7 +15,6 @@ #include "access/generic_xlog.h" #include "lib/stringinfo.h" -#include "storage/relfilelocator.h" /* * Description of generic xlog record: write page regions that this record diff --git a/src/backend/access/rmgrdesc/gindesc.c b/src/backend/access/rmgrdesc/gindesc.c index 93f7727a433..4746f246ff1 100644 --- a/src/backend/access/rmgrdesc/gindesc.c +++ b/src/backend/access/rmgrdesc/gindesc.c @@ -15,9 +15,7 @@ #include "postgres.h" #include "access/ginxlog.h" -#include "access/xlogutils.h" #include "lib/stringinfo.h" -#include "storage/relfilelocator.h" static void desc_recompress_leaf(StringInfo buf, ginxlogRecompressDataLeaf *insertData) diff --git a/src/backend/access/rmgrdesc/gistdesc.c b/src/backend/access/rmgrdesc/gistdesc.c index ce37f31e5d9..5efbbf72e57 100644 --- a/src/backend/access/rmgrdesc/gistdesc.c +++ b/src/backend/access/rmgrdesc/gistdesc.c @@ -16,7 +16,6 @@ #include "access/gistxlog.h" #include "lib/stringinfo.h" -#include "storage/relfilelocator.h" static void out_gistxlogPageUpdate(StringInfo buf, gistxlogPageUpdate *xlrec) diff --git a/src/backend/access/spgist/spginsert.c b/src/backend/access/spgist/spginsert.c index 1b70c5a59fd..1bec19c2b88 100644 --- a/src/backend/access/spgist/spginsert.c +++ b/src/backend/access/spgist/spginsert.c @@ -18,12 +18,10 @@ #include "access/genam.h" #include "access/spgist_private.h" -#include "access/spgxlog.h" #include "access/tableam.h" -#include "access/xlog.h" #include "access/xloginsert.h" -#include "catalog/index.h" #include "miscadmin.h" +#include "nodes/execnodes.h" #include "storage/bufmgr.h" #include "storage/bulk_write.h" #include "utils/memutils.h" diff --git a/src/backend/access/spgist/spgkdtreeproc.c b/src/backend/access/spgist/spgkdtreeproc.c index 900fe0d2af5..44d05452520 100644 --- a/src/backend/access/spgist/spgkdtreeproc.c +++ b/src/backend/access/spgist/spgkdtreeproc.c @@ -19,8 +19,8 @@ #include "access/spgist_private.h" #include "access/stratnum.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/float.h" +#include "utils/fmgrprotos.h" #include "utils/geo_decls.h" diff --git a/src/backend/access/spgist/spgproc.c b/src/backend/access/spgist/spgproc.c index e7797067292..89699e7e7ff 100644 --- a/src/backend/access/spgist/spgproc.c +++ b/src/backend/access/spgist/spgproc.c @@ -18,8 +18,8 @@ #include <math.h> #include "access/spgist_private.h" -#include "utils/builtins.h" #include "utils/float.h" +#include "utils/fmgrprotos.h" #include "utils/geo_decls.h" #define point_point_distance(p1,p2) \ diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c index 3543936fbc3..791db1d42e0 100644 --- a/src/backend/access/spgist/spgquadtreeproc.c +++ b/src/backend/access/spgist/spgquadtreeproc.c @@ -19,8 +19,8 @@ #include "access/spgist_private.h" #include "access/stratnum.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" #include "utils/float.h" +#include "utils/fmgrprotos.h" #include "utils/geo_decls.h" Datum diff --git a/src/backend/access/spgist/spgtextproc.c b/src/backend/access/spgist/spgtextproc.c index d5db5225a9c..06042feb115 100644 --- a/src/backend/access/spgist/spgtextproc.c +++ b/src/backend/access/spgist/spgtextproc.c @@ -43,8 +43,8 @@ #include "common/int.h" #include "catalog/pg_type.h" #include "mb/pg_wchar.h" -#include "utils/builtins.h" #include "utils/datum.h" +#include "utils/fmgrprotos.h" #include "utils/pg_locale.h" #include "utils/varlena.h" #include "varatt.h" diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c index 5b5e6e82d39..3f793125f74 100644 --- a/src/backend/access/spgist/spgutils.c +++ b/src/backend/access/spgist/spgutils.c @@ -28,11 +28,11 @@ #include "parser/parse_coerce.h" #include "storage/bufmgr.h" #include "storage/indexfsm.h" -#include "storage/lmgr.h" -#include "utils/builtins.h" #include "utils/catcache.h" +#include "utils/fmgrprotos.h" #include "utils/index_selfuncs.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c index ff82b97dd88..d2e1624924a 100644 --- a/src/backend/access/spgist/spgvacuum.c +++ b/src/backend/access/spgist/spgvacuum.c @@ -20,7 +20,6 @@ #include "access/spgxlog.h" #include "access/transam.h" #include "access/xloginsert.h" -#include "catalog/storage_xlog.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "storage/bufmgr.h" diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c index 8834f22ba85..850c3b675d6 100644 --- a/src/backend/access/spgist/spgvalidate.c +++ b/src/backend/access/spgist/spgvalidate.c @@ -15,7 +15,7 @@ #include "access/amvalidate.h" #include "access/htup_details.h" -#include "access/spgist_private.h" +#include "access/spgist.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_opclass.h" diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c index 3ca7d18868c..11d006998ed 100644 --- a/src/backend/access/spgist/spgxlog.c +++ b/src/backend/access/spgist/spgxlog.c @@ -17,8 +17,6 @@ #include "access/bufmask.h" #include "access/spgist_private.h" #include "access/spgxlog.h" -#include "access/transam.h" -#include "access/xlog.h" #include "access/xlogutils.h" #include "storage/standby.h" #include "utils/memutils.h" diff --git a/src/backend/access/table/table.c b/src/backend/access/table/table.c index 4746142c5db..e589730ca08 100644 --- a/src/backend/access/table/table.c +++ b/src/backend/access/table/table.c @@ -23,7 +23,7 @@ #include "access/relation.h" #include "access/table.h" -#include "storage/lmgr.h" +#include "utils/rel.h" static inline void validate_relation_kind(Relation r); diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c index 1f13091338e..ce637a5a5d9 100644 --- a/src/backend/access/table/tableamapi.c +++ b/src/backend/access/table/tableamapi.c @@ -11,18 +11,11 @@ */ #include "postgres.h" -#include "access/heapam.h" -#include "access/htup_details.h" #include "access/tableam.h" #include "access/xact.h" -#include "catalog/pg_am.h" -#include "catalog/pg_proc.h" #include "commands/defrem.h" #include "miscadmin.h" -#include "utils/fmgroids.h" #include "utils/guc_hooks.h" -#include "utils/memutils.h" -#include "utils/syscache.h" /* diff --git a/src/backend/access/table/toast_helper.c b/src/backend/access/table/toast_helper.c index 3bcde2ca1ba..53224932f0d 100644 --- a/src/backend/access/table/toast_helper.c +++ b/src/backend/access/table/toast_helper.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/detoast.h" -#include "access/table.h" #include "access/toast_helper.h" #include "access/toast_internals.h" #include "catalog/pg_type_d.h" diff --git a/src/backend/access/tablesample/bernoulli.c b/src/backend/access/tablesample/bernoulli.c index b94be1146a0..c8ac308ff8c 100644 --- a/src/backend/access/tablesample/bernoulli.c +++ b/src/backend/access/tablesample/bernoulli.c @@ -30,7 +30,7 @@ #include "catalog/pg_type.h" #include "common/hashfn.h" #include "optimizer/optimizer.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" /* Private state */ diff --git a/src/backend/access/tablesample/system.c b/src/backend/access/tablesample/system.c index e8d86c79fe8..fe483ab8597 100644 --- a/src/backend/access/tablesample/system.c +++ b/src/backend/access/tablesample/system.c @@ -26,12 +26,11 @@ #include <math.h> -#include "access/relscan.h" #include "access/tsmapi.h" #include "catalog/pg_type.h" #include "common/hashfn.h" #include "optimizer/optimizer.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" /* Private state */ diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 5c35a18348c..f2214946874 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -27,14 +27,11 @@ #include "access/transam.h" #include "access/xloginsert.h" #include "access/xlogutils.h" -#include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" -#include "pg_trace.h" #include "storage/shmem.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" -#include "utils/snapmgr.h" #include "utils/timestamp.h" /* diff --git a/src/backend/access/transam/generic_xlog.c b/src/backend/access/transam/generic_xlog.c index 5626045998b..e8522781631 100644 --- a/src/backend/access/transam/generic_xlog.c +++ b/src/backend/access/transam/generic_xlog.c @@ -17,7 +17,6 @@ #include "access/generic_xlog.h" #include "access/xlogutils.h" #include "miscadmin.h" -#include "utils/memutils.h" /*------------------------------------------------------------------------- * Internally, a delta between pages consists of a set of fragments. Each diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 9dc7aa9c2f4..cd476b94faa 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -74,23 +74,21 @@ #include "access/twophase.h" #include "access/twophase_rmgr.h" #include "access/xact.h" +#include "access/xlog.h" #include "access/xloginsert.h" #include "access/xlogutils.h" -#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "funcapi.h" #include "lib/ilist.h" #include "miscadmin.h" #include "pg_trace.h" #include "postmaster/autovacuum.h" -#include "storage/lmgr.h" #include "storage/pmsignal.h" #include "storage/proc.h" #include "storage/procarray.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" #include "utils/memutils.h" -#include "utils/snapmgr.h" /* diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index 798cd86c881..751c251cf52 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -25,7 +25,6 @@ #include "catalog/pg_enum.h" #include "catalog/storage.h" #include "commands/async.h" -#include "commands/progress.h" #include "commands/vacuum.h" #include "executor/execParallel.h" #include "libpq/libpq.h" @@ -36,7 +35,6 @@ #include "pgstat.h" #include "storage/ipc.h" #include "storage/predicate.h" -#include "storage/sinval.h" #include "storage/spin.h" #include "tcop/tcopprot.h" #include "utils/combocid.h" @@ -45,7 +43,6 @@ #include "utils/memutils.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" -#include "utils/typcache.h" /* * We don't want to waste a lot of memory on an error queue which, most of diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c index 7d67eda5f79..3e2f1d4a237 100644 --- a/src/backend/access/transam/rmgr.c +++ b/src/backend/access/transam/rmgr.c @@ -7,6 +7,18 @@ */ #include "postgres.h" +#include "access/rmgr.h" +#include "access/xlog_internal.h" +#include "fmgr.h" +#include "funcapi.h" +#include "miscadmin.h" +#include "nodes/execnodes.h" +#include "utils/builtins.h" +#include "utils/fmgrprotos.h" +#include "utils/tuplestore.h" + +/* includes needed for "access/rmgrlist.h" */ +/* IWYU pragma: begin_keep */ #include "access/brin_xlog.h" #include "access/clog.h" #include "access/commit_ts.h" @@ -19,20 +31,17 @@ #include "access/nbtxlog.h" #include "access/spgxlog.h" #include "access/xact.h" -#include "access/xlog_internal.h" #include "catalog/storage_xlog.h" #include "commands/dbcommands_xlog.h" #include "commands/sequence.h" #include "commands/tablespace.h" -#include "fmgr.h" -#include "funcapi.h" -#include "miscadmin.h" #include "replication/decode.h" #include "replication/message.h" #include "replication/origin.h" #include "storage/standby.h" -#include "utils/builtins.h" #include "utils/relmapper.h" +/* IWYU pragma: end_keep */ + /* must be kept in sync with RmgrData definition in xlog_internal.h */ #define PG_RMGR(symname,name,redo,desc,identify,startup,cleanup,mask,decode) \ diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index a42af293437..8090ac9fc19 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -96,15 +96,12 @@ #include "pgstat.h" #include "replication/origin.h" #include "replication/syncrep.h" -#include "replication/walsender.h" #include "storage/fd.h" #include "storage/ipc.h" #include "storage/md.h" #include "storage/predicate.h" #include "storage/proc.h" #include "storage/procarray.h" -#include "storage/sinvaladt.h" -#include "storage/smgr.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/timestamp.h" diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index e270007e28e..ccd3f4fc550 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -51,7 +51,6 @@ #include "replication/origin.h" #include "replication/snapbuild.h" #include "replication/syncrep.h" -#include "replication/walsender.h" #include "storage/condition_variable.h" #include "storage/fd.h" #include "storage/lmgr.h" @@ -62,7 +61,6 @@ #include "storage/sinvaladt.h" #include "storage/smgr.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/combocid.h" #include "utils/guc.h" #include "utils/inval.h" diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index c9c9b37fbb9..20a5f862090 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -59,7 +59,6 @@ #include "access/xlog_internal.h" #include "access/xlogarchive.h" #include "access/xloginsert.h" -#include "access/xlogprefetcher.h" #include "access/xlogreader.h" #include "access/xlogrecovery.h" #include "access/xlogutils.h" @@ -79,7 +78,6 @@ #include "postmaster/startup.h" #include "postmaster/walsummarizer.h" #include "postmaster/walwriter.h" -#include "replication/logical.h" #include "replication/origin.h" #include "replication/slot.h" #include "replication/snapbuild.h" @@ -90,12 +88,10 @@ #include "storage/ipc.h" #include "storage/large_object.h" #include "storage/latch.h" -#include "storage/pmsignal.h" #include "storage/predicate.h" #include "storage/proc.h" #include "storage/procarray.h" #include "storage/reinit.h" -#include "storage/smgr.h" #include "storage/spin.h" #include "storage/sync.h" #include "utils/guc_hooks.h" @@ -104,7 +100,6 @@ #include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/relmapper.h" -#include "utils/pg_rusage.h" #include "utils/snapmgr.h" #include "utils/timeout.h" #include "utils/timestamp.h" diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c index 1292b11f2eb..977a2fe06b5 100644 --- a/src/backend/access/transam/xlogarchive.c +++ b/src/backend/access/transam/xlogarchive.c @@ -31,7 +31,6 @@ #include "replication/walsender.h" #include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.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 2b669357de8..92bdb17ed52 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -22,23 +22,17 @@ #include "access/xlog_internal.h" #include "access/xlogbackup.h" #include "access/xlogrecovery.h" -#include "access/xlogutils.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" #include "pgstat.h" #include "replication/walreceiver.h" #include "storage/fd.h" -#include "storage/ipc.h" -#include "storage/smgr.h" #include "storage/standby.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/memutils.h" -#include "utils/numeric.h" #include "utils/pg_lsn.h" #include "utils/timestamp.h" -#include "utils/tuplestore.h" /* * Backup-related variables. diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c index 0fa8d3fc511..90476015347 100644 --- a/src/backend/access/transam/xloginsert.c +++ b/src/backend/access/transam/xloginsert.c @@ -33,7 +33,6 @@ #include "access/xloginsert.h" #include "catalog/pg_control.h" #include "common/pg_lzcompress.h" -#include "executor/instrument.h" #include "miscadmin.h" #include "pg_trace.h" #include "replication/origin.h" diff --git a/src/backend/access/transam/xlogprefetcher.c b/src/backend/access/transam/xlogprefetcher.c index aa26ea2ef73..c3f52a8bd11 100644 --- a/src/backend/access/transam/xlogprefetcher.c +++ b/src/backend/access/transam/xlogprefetcher.c @@ -27,18 +27,14 @@ #include "postgres.h" -#include "access/xlog.h" #include "access/xlogprefetcher.h" #include "access/xlogreader.h" -#include "access/xlogutils.h" -#include "catalog/pg_class.h" #include "catalog/pg_control.h" #include "catalog/storage_xlog.h" #include "commands/dbcommands_xlog.h" #include "utils/fmgrprotos.h" #include "utils/timestamp.h" #include "funcapi.h" -#include "pgstat.h" #include "miscadmin.h" #include "port/atomics.h" #include "storage/bufmgr.h" diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 74a6b118669..37d2a57961d 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -34,9 +34,7 @@ #include "replication/origin.h" #ifndef FRONTEND -#include "miscadmin.h" #include "pgstat.h" -#include "utils/memutils.h" #else #include "common/logging.h" #endif diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index 9d907bf0e45..853b540945b 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -55,11 +55,10 @@ #include "storage/ipc.h" #include "storage/latch.h" #include "storage/pmsignal.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "storage/spin.h" -#include "utils/builtins.h" #include "utils/datetime.h" +#include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" #include "utils/pg_lsn.h" #include "utils/ps_status.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index f65554eb8f7..5295b85fe07 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -22,13 +22,10 @@ #include "access/timeline.h" #include "access/xlogrecovery.h" #include "access/xlog_internal.h" -#include "access/xlogprefetcher.h" #include "access/xlogutils.h" #include "miscadmin.h" -#include "pgstat.h" #include "storage/fd.h" #include "storage/smgr.h" -#include "utils/guc.h" #include "utils/hsearch.h" #include "utils/rel.h" diff --git a/src/backend/backup/backup_manifest.c b/src/backend/backup/backup_manifest.c index 2c34e597523..9c14f18401f 100644 --- a/src/backend/backup/backup_manifest.c +++ b/src/backend/backup/backup_manifest.c @@ -15,8 +15,6 @@ #include "access/timeline.h" #include "backup/backup_manifest.h" #include "backup/basebackup_sink.h" -#include "libpq/libpq.h" -#include "libpq/pqformat.h" #include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/json.h" diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index c7a2cbb13e7..5fbbe5ffd20 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -48,7 +48,6 @@ #include "utils/ps_status.h" #include "utils/relcache.h" #include "utils/resowner.h" -#include "utils/timestamp.h" /* * How much data do we want to send in one CopyData message? Note that diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index 0919b85b442..18c78adda26 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -20,15 +20,15 @@ #include "postgres.h" #include "access/timeline.h" -#include "access/xlog.h" -#include "access/xlogrecovery.h" #include "backup/basebackup_incremental.h" #include "backup/walsummary.h" #include "common/blkreftable.h" #include "common/parse_manifest.h" #include "common/hashfn.h" #include "common/int.h" +#include "datatype/timestamp.h" #include "postmaster/walsummarizer.h" +#include "utils/timestamp.h" #define BLOCKS_PER_READ 512 diff --git a/src/backend/backup/basebackup_progress.c b/src/backend/backup/basebackup_progress.c index a812faf5b5d..8ff6c607333 100644 --- a/src/backend/backup/basebackup_progress.c +++ b/src/backend/backup/basebackup_progress.c @@ -31,13 +31,9 @@ */ #include "postgres.h" -#include "backup/basebackup.h" #include "backup/basebackup_sink.h" #include "commands/progress.h" -#include "miscadmin.h" #include "pgstat.h" -#include "storage/latch.h" -#include "utils/timestamp.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_server.c b/src/backend/backup/basebackup_server.c index 2b9d9d29324..f5c0c61640a 100644 --- a/src/backend/backup/basebackup_server.c +++ b/src/backend/backup/basebackup_server.c @@ -11,13 +11,11 @@ #include "postgres.h" #include "access/xact.h" -#include "backup/basebackup.h" #include "backup/basebackup_sink.h" #include "catalog/pg_authid.h" #include "miscadmin.h" #include "storage/fd.h" #include "utils/acl.h" -#include "utils/timestamp.h" #include "utils/wait_event.h" typedef struct bbsink_server diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 141b25ddd7a..986f6f1d9ca 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -23,24 +23,20 @@ #include "access/tableam.h" #include "access/toast_compression.h" #include "access/xact.h" -#include "access/xlog_internal.h" #include "bootstrap/bootstrap.h" #include "catalog/index.h" #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "common/link-canary.h" -#include "libpq/pqsignal.h" #include "miscadmin.h" #include "nodes/makefuncs.h" #include "pg_getopt.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" -#include "storage/condition_variable.h" #include "storage/ipc.h" #include "storage/proc.h" -#include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/guc.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/relmapper.h" diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 1e44a71f61c..023938682d9 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -49,17 +49,10 @@ #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" -#include "catalog/pg_aggregate.h" -#include "catalog/pg_am.h" #include "catalog/pg_authid.h" -#include "catalog/pg_cast.h" #include "catalog/pg_class.h" -#include "catalog/pg_collation.h" -#include "catalog/pg_conversion.h" #include "catalog/pg_database.h" #include "catalog/pg_default_acl.h" -#include "catalog/pg_event_trigger.h" -#include "catalog/pg_extension.h" #include "catalog/pg_foreign_data_wrapper.h" #include "catalog/pg_foreign_server.h" #include "catalog/pg_init_privs.h" @@ -67,19 +60,9 @@ #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" #include "catalog/pg_namespace.h" -#include "catalog/pg_opclass.h" -#include "catalog/pg_operator.h" -#include "catalog/pg_opfamily.h" #include "catalog/pg_parameter_acl.h" #include "catalog/pg_proc.h" -#include "catalog/pg_statistic_ext.h" -#include "catalog/pg_subscription.h" #include "catalog/pg_tablespace.h" -#include "catalog/pg_transform.h" -#include "catalog/pg_ts_config.h" -#include "catalog/pg_ts_dict.h" -#include "catalog/pg_ts_parser.h" -#include "catalog/pg_ts_template.h" #include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "commands/defrem.h" diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index e151dddab29..32170083fa3 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -22,7 +22,6 @@ #include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/transam.h" #include "catalog/catalog.h" @@ -42,7 +41,6 @@ #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" #include "miscadmin.h" -#include "storage/fd.h" #include "utils/fmgroids.h" #include "utils/fmgrprotos.h" #include "utils/rel.h" diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 2eb41d537bb..eadcf6af0df 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -81,9 +81,7 @@ #include "parser/parsetree.h" #include "rewrite/rewriteRemove.h" #include "storage/lmgr.h" -#include "utils/acl.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 4b88a9cb877..dfce1aae45b 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -26,9 +26,7 @@ #include "access/amapi.h" #include "access/heapam.h" #include "access/multixact.h" -#include "access/reloptions.h" #include "access/relscan.h" -#include "access/sysattr.h" #include "access/tableam.h" #include "access/toast_compression.h" #include "access/transam.h" @@ -45,7 +43,6 @@ #include "catalog/pg_am.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" -#include "catalog/pg_depend.h" #include "catalog/pg_description.h" #include "catalog/pg_inherits.h" #include "catalog/pg_opclass.h" @@ -58,7 +55,6 @@ #include "commands/event_trigger.h" #include "commands/progress.h" #include "commands/tablecmds.h" -#include "commands/tablespace.h" #include "commands/trigger.h" #include "executor/executor.h" #include "miscadmin.h" @@ -71,7 +67,6 @@ #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "storage/procarray.h" #include "storage/smgr.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 5521f5bd137..e00380156f0 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -24,6 +24,7 @@ #include "access/xact.h" #include "access/xlog.h" #include "catalog/dependency.h" +#include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/pg_authid.h" #include "catalog/pg_collation.h" @@ -46,7 +47,6 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "parser/parse_func.h" #include "storage/ipc.h" #include "storage/lmgr.h" #include "storage/procarray.h" diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 8bb2924b9cd..360c6b2ba63 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -18,7 +18,6 @@ #include "access/genam.h" #include "access/htup_details.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" #include "catalog/objectaddress.h" @@ -34,7 +33,6 @@ #include "catalog/pg_conversion.h" #include "catalog/pg_database.h" #include "catalog/pg_default_acl.h" -#include "catalog/pg_enum.h" #include "catalog/pg_event_trigger.h" #include "catalog/pg_extension.h" #include "catalog/pg_foreign_data_wrapper.h" @@ -75,7 +73,6 @@ #include "foreign/foreign.h" #include "funcapi.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c index cb23cbeee07..018aad445d1 100644 --- a/src/backend/catalog/partition.c +++ b/src/backend/catalog/partition.c @@ -25,7 +25,6 @@ #include "catalog/pg_partitioned_table.h" #include "nodes/makefuncs.h" #include "optimizer/optimizer.h" -#include "partitioning/partbounds.h" #include "rewrite/rewriteManip.h" #include "utils/fmgroids.h" #include "utils/partcache.h" diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c index 5c8ccb8b3bc..7bce19bd83a 100644 --- a/src/backend/catalog/pg_collation.c +++ b/src/backend/catalog/pg_collation.c @@ -14,9 +14,7 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -26,8 +24,6 @@ #include "catalog/pg_namespace.h" #include "mb/pg_wchar.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" -#include "utils/pg_locale.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 0a95608179d..6a1fc4649ea 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -18,7 +18,6 @@ #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" @@ -28,7 +27,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "commands/tablecmds.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c index a5d8a60317a..0770878eac5 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -14,10 +14,8 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" -#include "access/sysattr.h" -#include "access/tableam.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" @@ -28,7 +26,6 @@ #include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/catcache.h" -#include "utils/fmgroids.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c index 55f0f359ab7..836b4bfd894 100644 --- a/src/backend/catalog/pg_inherits.c +++ b/src/backend/catalog/pg_inherits.c @@ -28,7 +28,6 @@ #include "storage/lmgr.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/memutils.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index e0d721841de..e235f7c5e68 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -16,15 +16,12 @@ #include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/rel.h" diff --git a/src/backend/catalog/pg_parameter_acl.c b/src/backend/catalog/pg_parameter_acl.c index ea7c7c2c0b5..e50f2666643 100644 --- a/src/backend/catalog/pg_parameter_acl.c +++ b/src/backend/catalog/pg_parameter_acl.c @@ -17,12 +17,9 @@ #include "access/table.h" #include "catalog/catalog.h" #include "catalog/indexing.h" -#include "catalog/objectaccess.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_parameter_acl.h" #include "utils/builtins.h" #include "utils/guc.h" -#include "utils/pg_locale.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index b581d334d3a..ab2b6ca1487 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -32,9 +32,7 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "parser/analyze.h" #include "parser/parse_coerce.h" -#include "parser/parse_type.h" #include "pgstat.h" #include "rewrite/rewriteHandler.h" #include "tcop/pquery.h" diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c index b98b0ce0aef..ac05dc057f7 100644 --- a/src/backend/catalog/pg_publication.c +++ b/src/backend/catalog/pg_publication.c @@ -18,14 +18,11 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/tableam.h" -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" -#include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/partition.h" -#include "catalog/objectaccess.h" #include "catalog/objectaddress.h" #include "catalog/pg_inherits.h" #include "catalog/pg_namespace.h" @@ -35,12 +32,10 @@ #include "catalog/pg_type.h" #include "commands/publicationcmds.h" #include "funcapi.h" -#include "miscadmin.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/catcache.h" #include "utils/fmgroids.h" -#include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 416439aa843..cb315903399 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -33,7 +33,6 @@ #include "catalog/pg_foreign_server.h" #include "catalog/pg_language.h" #include "catalog/pg_largeobject.h" -#include "catalog/pg_largeobject_metadata.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" @@ -48,14 +47,10 @@ #include "catalog/pg_type.h" #include "catalog/pg_user_mapping.h" #include "commands/alter.h" -#include "commands/collationcmds.h" -#include "commands/conversioncmds.h" #include "commands/dbcommands.h" #include "commands/defrem.h" #include "commands/event_trigger.h" -#include "commands/extension.h" #include "commands/policy.h" -#include "commands/proclang.h" #include "commands/publicationcmds.h" #include "commands/schemacmds.h" #include "commands/subscriptioncmds.h" diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c index 406a3c2dd15..9efc9159f2c 100644 --- a/src/backend/catalog/pg_subscription.c +++ b/src/backend/catalog/pg_subscription.c @@ -18,13 +18,11 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/tableam.h" -#include "access/xact.h" #include "catalog/indexing.h" #include "catalog/pg_subscription.h" #include "catalog/pg_subscription_rel.h" #include "catalog/pg_type.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "storage/lmgr.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index fe47be38d0e..d1d8fa274e4 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -30,7 +30,6 @@ #include "commands/typecmds.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "parser/scansup.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c index 29f6621f925..f56b3cc0f23 100644 --- a/src/backend/catalog/storage.c +++ b/src/backend/catalog/storage.c @@ -19,7 +19,6 @@ #include "postgres.h" -#include "access/parallel.h" #include "access/visibilitymap.h" #include "access/xact.h" #include "access/xlog.h" @@ -30,6 +29,7 @@ #include "miscadmin.h" #include "storage/bulk_write.h" #include "storage/freespace.h" +#include "storage/proc.h" #include "storage/smgr.h" #include "utils/hsearch.h" #include "utils/memutils.h" diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index 05d945b34b7..21be81c1fb3 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -26,12 +26,9 @@ #include "catalog/pg_am.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" -#include "catalog/pg_type.h" #include "catalog/toasting.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "storage/lock.h" -#include "utils/builtins.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c index 623c699cae9..fde5a2a0e04 100644 --- a/src/backend/commands/aggregatecmds.c +++ b/src/backend/commands/aggregatecmds.c @@ -22,21 +22,17 @@ */ #include "postgres.h" -#include "access/htup_details.h" -#include "catalog/dependency.h" +#include "catalog/namespace.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/defrem.h" #include "miscadmin.h" -#include "parser/parse_func.h" #include "parser/parse_type.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" static char extractModify(DefElem *defel); diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index b2e4260aef7..cd740140fd7 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -16,7 +16,6 @@ #include "access/htup_details.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/dependency.h" #include "catalog/indexing.h" @@ -43,13 +42,11 @@ #include "catalog/pg_ts_template.h" #include "commands/alter.h" #include "commands/collationcmds.h" -#include "commands/conversioncmds.h" #include "commands/dbcommands.h" #include "commands/defrem.h" #include "commands/event_trigger.h" #include "commands/extension.h" #include "commands/policy.h" -#include "commands/proclang.h" #include "commands/publicationcmds.h" #include "commands/schemacmds.h" #include "commands/subscriptioncmds.h" @@ -59,12 +56,10 @@ #include "commands/typecmds.h" #include "commands/user.h" #include "miscadmin.h" -#include "parser/parse_func.h" #include "replication/logicalworker.h" #include "rewrite/rewriteDefine.h" -#include "tcop/utility.h" +#include "utils/acl.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index d105d2fad7b..4aee1098cf6 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -20,20 +20,15 @@ #include "access/genam.h" #include "access/multixact.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/tableam.h" #include "access/transam.h" #include "access/tupconvert.h" #include "access/visibilitymap.h" #include "access/xact.h" -#include "catalog/catalog.h" #include "catalog/index.h" #include "catalog/indexing.h" -#include "catalog/pg_collation.h" #include "catalog/pg_inherits.h" -#include "catalog/pg_namespace.h" -#include "catalog/pg_statistic_ext.h" #include "commands/dbcommands.h" #include "commands/progress.h" #include "commands/tablecmds.h" @@ -50,14 +45,9 @@ #include "statistics/extended_stats_internal.h" #include "statistics/statistics.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" -#include "utils/acl.h" #include "utils/attoptcache.h" -#include "utils/builtins.h" #include "utils/datum.h" -#include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index bbea5abd27a..d0891e3f0e0 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -142,10 +142,7 @@ #include "miscadmin.h" #include "storage/ipc.h" #include "storage/lmgr.h" -#include "storage/proc.h" -#include "storage/procarray.h" #include "storage/procsignal.h" -#include "storage/sinval.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/guc_hooks.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index e2c48ec560d..661fdef9b33 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -25,14 +25,12 @@ #include "access/toast_internals.h" #include "access/transam.h" #include "access/xact.h" -#include "access/xlog.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" #include "catalog/namespace.h" #include "catalog/objectaccess.h" -#include "catalog/partition.h" #include "catalog/pg_am.h" #include "catalog/pg_database.h" #include "catalog/pg_inherits.h" @@ -58,7 +56,6 @@ #include "utils/relmapper.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "utils/tuplesort.h" /* * This struct is used to pass around the information on tables to be diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 58c059fdb7e..106e696da8d 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -17,14 +17,12 @@ #include "access/htup_details.h" #include "access/table.h" #include "access/xact.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/pg_collation.h" #include "catalog/pg_database.h" #include "catalog/pg_namespace.h" -#include "commands/alter.h" #include "commands/collationcmds.h" #include "commands/comment.h" #include "commands/dbcommands.h" diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c index c8a3f0a11fc..94d491b7541 100644 --- a/src/backend/commands/constraint.c +++ b/src/backend/commands/constraint.c @@ -14,13 +14,11 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/tableam.h" #include "catalog/index.h" #include "commands/trigger.h" #include "executor/executor.h" -#include "utils/builtins.h" -#include "utils/rel.h" +#include "utils/fmgrprotos.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 4e811a32749..ddd5d1d1c54 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -14,23 +14,16 @@ */ #include "postgres.h" -#include "access/htup_details.h" -#include "catalog/dependency.h" -#include "catalog/indexing.h" #include "catalog/pg_conversion.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/conversioncmds.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "parser/parse_func.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/rel.h" -#include "utils/syscache.h" /* * CREATE CONVERSION diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index cc0786c6f4a..056b6733c8e 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -33,11 +33,9 @@ #include "parser/parse_collate.h" #include "parser/parse_expr.h" #include "parser/parse_relation.h" -#include "rewrite/rewriteHandler.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/rls.h" diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index c3bc897028a..8908a440e19 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -25,10 +25,8 @@ #include <sys/stat.h> #include "access/heapam.h" -#include "access/htup_details.h" #include "access/tableam.h" #include "access/xact.h" -#include "access/xlog.h" #include "catalog/namespace.h" #include "commands/copy.h" #include "commands/copyfrom_internal.h" @@ -39,8 +37,7 @@ #include "executor/nodeModifyTable.h" #include "executor/tuptable.h" #include "foreign/fdwapi.h" -#include "libpq/libpq.h" -#include "libpq/pqformat.h" +#include "mb/pg_wchar.h" #include "miscadmin.h" #include "nodes/miscnodes.h" #include "optimizer/optimizer.h" diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c index 7cacd0b752c..5682d5d054b 100644 --- a/src/backend/commands/copyfromparse.c +++ b/src/backend/commands/copyfromparse.c @@ -74,7 +74,6 @@ #include "pgstat.h" #include "port/pg_bswap.h" #include "utils/builtins.h" -#include "utils/memutils.h" #include "utils/rel.h" #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index 20ffc90363d..a6962e0cb77 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -18,11 +18,7 @@ #include <unistd.h> #include <sys/stat.h> -#include "access/heapam.h" -#include "access/htup_details.h" #include "access/tableam.h" -#include "access/xact.h" -#include "access/xlog.h" #include "commands/copy.h" #include "commands/progress.h" #include "executor/execdesc.h" @@ -32,14 +28,11 @@ #include "libpq/pqformat.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "optimizer/optimizer.h" #include "pgstat.h" -#include "rewrite/rewriteHandler.h" #include "storage/fd.h" #include "tcop/tcopprot.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/partcache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c index 16a2fe65e68..62050f4dc59 100644 --- a/src/backend/commands/createas.c +++ b/src/backend/commands/createas.c @@ -25,12 +25,9 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/htup_details.h" #include "access/reloptions.h" -#include "access/sysattr.h" #include "access/tableam.h" #include "access/xact.h" -#include "access/xlog.h" #include "catalog/namespace.h" #include "catalog/toasting.h" #include "commands/createas.h" @@ -41,9 +38,7 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "parser/parse_clause.h" #include "rewrite/rewriteHandler.h" -#include "storage/smgr.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 78a158c3da4..b256d6d0f7d 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -64,7 +64,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/pg_locale.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 0bb7bce6868..43f50066ea0 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -39,8 +39,7 @@ #include "commands/defrem.h" #include "nodes/makefuncs.h" #include "parser/parse_type.h" -#include "parser/scansup.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" /* * Extract a string value (otherwise uninterpreted) from a DefElem. diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c index 87a2db4e0f5..85eec7e3947 100644 --- a/src/backend/commands/dropcmds.c +++ b/src/backend/commands/dropcmds.c @@ -14,23 +14,18 @@ */ #include "postgres.h" -#include "access/htup_details.h" #include "access/table.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/namespace.h" #include "catalog/objectaddress.h" -#include "catalog/pg_class.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "commands/defrem.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "parser/parse_type.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" static void does_not_exist_skipping(ObjectType objtype, diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index c8b662131c3..ab11ab500b2 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -30,7 +30,6 @@ #include "catalog/pg_trigger.h" #include "catalog/pg_ts_config.h" #include "catalog/pg_type.h" -#include "commands/dbcommands.h" #include "commands/event_trigger.h" #include "commands/extension.h" #include "commands/trigger.h" @@ -46,7 +45,7 @@ #include "utils/builtins.h" #include "utils/evtcache.h" #include "utils/fmgroids.h" -#include "utils/inval.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 83d00a46638..78754bc6ba0 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -18,7 +18,6 @@ #include "commands/createas.h" #include "commands/defrem.h" #include "commands/prepare.h" -#include "executor/nodeHash.h" #include "foreign/fdwapi.h" #include "jit/jit.h" #include "nodes/extensible.h" diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 226f85d0e34..af600d7c9ac 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -32,7 +32,6 @@ #include "access/genam.h" #include "access/htup_details.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" @@ -55,7 +54,6 @@ #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "storage/fd.h" #include "tcop/utility.h" #include "utils/acl.h" diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 63f4f499ecf..9cf3fe8275e 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -32,9 +32,7 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -47,11 +45,9 @@ #include "catalog/pg_proc.h" #include "catalog/pg_transform.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/defrem.h" #include "commands/extension.h" #include "commands/proclang.h" -#include "executor/execdesc.h" #include "executor/executor.h" #include "executor/functions.h" #include "funcapi.h" @@ -68,10 +64,8 @@ #include "tcop/utility.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 06f90ff7522..cde1ee7432d 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -26,6 +26,7 @@ #include "catalog/catalog.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/namespace.h" #include "catalog/pg_am.h" #include "catalog/pg_constraint.h" #include "catalog/pg_database.h" @@ -48,7 +49,6 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "parser/parse_coerce.h" -#include "parser/parse_func.h" #include "parser/parse_oper.h" #include "partitioning/partdesc.h" #include "pgstat.h" diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index 29e9953bf45..09ae09cf5cc 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -21,7 +21,6 @@ #include "commands/lockcmds.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "parser/parse_clause.h" #include "rewrite/rewriteHandler.h" #include "storage/lmgr.h" #include "utils/acl.h" diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index 59920ced838..2f1d897cf1d 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -20,13 +20,10 @@ #include "access/multixact.h" #include "access/tableam.h" #include "access/xact.h" -#include "access/xlog.h" -#include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "catalog/pg_opclass.h" -#include "catalog/pg_operator.h" #include "commands/cluster.h" #include "commands/matview.h" #include "commands/tablecmds.h" @@ -34,11 +31,9 @@ #include "executor/executor.h" #include "executor/spi.h" #include "miscadmin.h" -#include "parser/parse_relation.h" #include "pgstat.h" #include "rewrite/rewriteHandler.h" #include "storage/lmgr.h" -#include "storage/smgr.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 7c2108832d4..b8b5c147c5d 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -21,7 +21,6 @@ #include "access/hash.h" #include "access/htup_details.h" #include "access/nbtree.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -36,13 +35,13 @@ #include "catalog/pg_opfamily.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/defrem.h" #include "commands/event_trigger.h" #include "miscadmin.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index 64140860914..5872a3e1922 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -33,21 +33,18 @@ #include "access/htup_details.h" #include "access/table.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" #include "catalog/pg_namespace.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/defrem.h" #include "miscadmin.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c index 596326e5ec0..6ff3eba8249 100644 --- a/src/backend/commands/policy.c +++ b/src/backend/commands/policy.c @@ -16,7 +16,6 @@ #include "access/htup.h" #include "access/htup_details.h" #include "access/relation.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" @@ -29,7 +28,6 @@ #include "catalog/pg_type.h" #include "commands/policy.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "nodes/pg_list.h" #include "parser/parse_clause.h" #include "parser/parse_collate.h" @@ -37,7 +35,6 @@ #include "parser/parse_relation.h" #include "rewrite/rewriteManip.h" #include "rewrite/rowsecurity.h" -#include "storage/lock.h" #include "utils/acl.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index bf1579d36d7..5e85585e9dd 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -23,14 +23,11 @@ #include "commands/createas.h" #include "commands/prepare.h" #include "funcapi.h" -#include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "parser/analyze.h" #include "parser/parse_coerce.h" #include "parser/parse_collate.h" #include "parser/parse_expr.h" #include "parser/parse_type.h" -#include "rewrite/rewriteHandler.h" #include "tcop/pquery.h" #include "tcop/utility.h" #include "utils/builtins.h" diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index c849d65e623..881f90017ef 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -19,10 +19,8 @@ #include "catalog/indexing.h" #include "catalog/objectaccess.h" #include "catalog/pg_language.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/defrem.h" #include "commands/proclang.h" #include "miscadmin.h" #include "parser/parse_func.h" diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 88db8258d71..9bcc22fdd7e 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -14,7 +14,6 @@ #include "postgres.h" -#include "access/genam.h" #include "access/htup_details.h" #include "access/table.h" #include "access/xact.h" @@ -23,7 +22,6 @@ #include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/objectaddress.h" -#include "catalog/partition.h" #include "catalog/pg_database.h" #include "catalog/pg_inherits.h" #include "catalog/pg_namespace.h" @@ -31,12 +29,10 @@ #include "catalog/pg_publication.h" #include "catalog/pg_publication_namespace.h" #include "catalog/pg_publication_rel.h" -#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "commands/defrem.h" #include "commands/event_trigger.h" #include "commands/publicationcmds.h" -#include "funcapi.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" #include "parser/parse_clause.h" @@ -44,10 +40,7 @@ #include "parser/parse_relation.h" #include "storage/lmgr.h" #include "utils/acl.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/catcache.h" -#include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c index b1a9c74bd63..6fa840fada8 100644 --- a/src/backend/commands/statscmds.c +++ b/src/backend/commands/statscmds.c @@ -14,9 +14,7 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/relation.h" -#include "access/relscan.h" #include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -32,11 +30,10 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "statistics/statistics.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/fmgroids.h" #include "utils/inval.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index f7987945563..764478c950c 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -54,7 +54,6 @@ #include "commands/comment.h" #include "commands/defrem.h" #include "commands/event_trigger.h" -#include "commands/policy.h" #include "commands/sequence.h" #include "commands/tablecmds.h" #include "commands/tablespace.h" @@ -70,11 +69,9 @@ #include "nodes/nodeFuncs.h" #include "nodes/parsenodes.h" #include "optimizer/optimizer.h" -#include "parser/parse_clause.h" #include "parser/parse_coerce.h" #include "parser/parse_collate.h" #include "parser/parse_expr.h" -#include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_type.h" #include "parser/parse_utilcmd.h" diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 76ad66e51f9..113b4807315 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -53,7 +53,6 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/reloptions.h" -#include "access/sysattr.h" #include "access/tableam.h" #include "access/xact.h" #include "access/xloginsert.h" @@ -62,25 +61,20 @@ #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaccess.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_tablespace.h" #include "commands/comment.h" #include "commands/seclabel.h" -#include "commands/tablecmds.h" #include "commands/tablespace.h" #include "common/file_perm.h" #include "miscadmin.h" #include "postmaster/bgwriter.h" #include "storage/fd.h" -#include "storage/lmgr.h" #include "storage/standby.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/guc_hooks.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/varlena.h" diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index c344ff09442..3d35b64a57d 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -22,7 +22,6 @@ #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" -#include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" #include "catalog/partition.h" @@ -32,10 +31,8 @@ #include "catalog/pg_trigger.h" #include "catalog/pg_type.h" #include "commands/dbcommands.h" -#include "commands/defrem.h" #include "commands/trigger.h" #include "executor/executor.h" -#include "executor/execPartition.h" #include "miscadmin.h" #include "nodes/bitmapset.h" #include "nodes/makefuncs.h" @@ -44,16 +41,12 @@ #include "parser/parse_collate.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" -#include "parser/parsetree.h" #include "partitioning/partdesc.h" #include "pgstat.h" #include "rewrite/rewriteManip.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "tcop/utility.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/bytea.h" #include "utils/fmgroids.h" #include "utils/guc_hooks.h" #include "utils/inval.h" diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 3c2587db89b..b7b5019f1e0 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -33,7 +33,6 @@ #include "catalog/pg_ts_parser.h" #include "catalog/pg_ts_template.h" #include "catalog/pg_type.h" -#include "commands/alter.h" #include "commands/defrem.h" #include "commands/event_trigger.h" #include "common/string.h" @@ -41,7 +40,8 @@ #include "nodes/makefuncs.h" #include "parser/parse_func.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_utils.h" +#include "tsearch/ts_public.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index e0275e5fe9c..d3b6c1089e7 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -32,8 +32,9 @@ #include "postgres.h" #include "access/genam.h" -#include "access/heapam.h" #include "access/htup_details.h" +#include "access/relation.h" +#include "access/table.h" #include "access/tableam.h" #include "access/xact.h" #include "catalog/binary_upgrade.h" @@ -68,7 +69,6 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/ruleutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 6839d44a2f5..c75cde2e8e1 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -38,7 +38,6 @@ #include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/syscache.h" -#include "utils/timestamp.h" #include "utils/varlena.h" /* diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e40cef6566e..bd2309967e0 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -38,7 +38,6 @@ #include "catalog/index.h" #include "catalog/pg_database.h" #include "catalog/pg_inherits.h" -#include "catalog/pg_namespace.h" #include "commands/cluster.h" #include "commands/defrem.h" #include "commands/vacuum.h" @@ -58,7 +57,6 @@ #include "utils/guc.h" #include "utils/guc_hooks.h" #include "utils/memutils.h" -#include "utils/pg_rusage.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c index e087dfd72eb..befda1c1050 100644 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@ -29,9 +29,9 @@ #include "access/amapi.h" #include "access/table.h" #include "access/xact.h" -#include "catalog/index.h" #include "commands/progress.h" #include "commands/vacuum.h" +#include "executor/instrument.h" #include "optimizer/paths.h" #include "pgstat.h" #include "storage/bufmgr.h" diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 30efcd554ae..01151ca2b5a 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -32,8 +32,8 @@ #include "storage/bufmgr.h" #include "utils/acl.h" #include "utils/backend_status.h" -#include "utils/builtins.h" #include "utils/datetime.h" +#include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index dce898c751c..becc1fb4583 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -17,23 +17,18 @@ #include "access/relation.h" #include "access/xact.h" #include "catalog/namespace.h" -#include "commands/defrem.h" #include "commands/tablecmds.h" #include "commands/view.h" -#include "miscadmin.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "parser/analyze.h" #include "parser/parse_relation.h" #include "rewrite/rewriteDefine.h" #include "rewrite/rewriteHandler.h" -#include "rewrite/rewriteManip.h" #include "rewrite/rewriteSupport.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/syscache.h" static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc); diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index a33696efc5d..3289e3e0219 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -14,7 +14,7 @@ #include "access/amapi.h" #include "access/htup_details.h" -#include "executor/execdebug.h" +#include "catalog/pg_class.h" #include "executor/nodeAgg.h" #include "executor/nodeAppend.h" #include "executor/nodeBitmapAnd.h" @@ -59,9 +59,7 @@ #include "executor/nodeWindowAgg.h" #include "executor/nodeWorktablescan.h" #include "nodes/extensible.h" -#include "nodes/nodeFuncs.h" #include "nodes/pathnodes.h" -#include "utils/rel.h" #include "utils/syscache.h" static bool IndexSupportsBackwardScan(Oid indexid); diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c index 3181b1136a2..ffd3ca4e619 100644 --- a/src/backend/executor/execExpr.c +++ b/src/backend/executor/execExpr.c @@ -47,7 +47,6 @@ #include "utils/acl.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/datum.h" #include "utils/jsonfuncs.h" #include "utils/lsyscache.h" #include "utils/typcache.h" diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c index 3f20f1dd314..7c1f51e2e0a 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -65,7 +65,6 @@ #include "miscadmin.h" #include "nodes/miscnodes.h" #include "nodes/nodeFuncs.h" -#include "parser/parsetree.h" #include "pgstat.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index dca8b3d1aaa..7233f1e3c03 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -19,7 +19,6 @@ #include "executor/executor.h" #include "miscadmin.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" static int TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const MinimalTuple tuple2); static inline uint32 TupleHashTableHash_internal(struct tuplehash_hash *tb, diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 79ef46f2614..940499cc61a 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -37,36 +37,27 @@ */ #include "postgres.h" -#include "access/heapam.h" -#include "access/htup_details.h" #include "access/sysattr.h" +#include "access/table.h" #include "access/tableam.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/namespace.h" #include "catalog/partition.h" -#include "catalog/pg_publication.h" #include "commands/matview.h" #include "commands/trigger.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeSubplan.h" #include "foreign/fdwapi.h" -#include "jit/jit.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "parser/parse_relation.h" -#include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" -#include "storage/bufmgr.h" -#include "storage/lmgr.h" #include "tcop/utility.h" #include "utils/acl.h" #include "utils/backend_status.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/partcache.h" #include "utils/rls.h" -#include "utils/ruleutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c index 540f8d21fd4..3f84c002dc1 100644 --- a/src/backend/executor/execParallel.c +++ b/src/backend/executor/execParallel.c @@ -43,12 +43,10 @@ #include "jit/jit.h" #include "nodes/nodeFuncs.h" #include "pgstat.h" -#include "storage/spin.h" #include "tcop/tcopprot.h" #include "utils/datum.h" #include "utils/dsa.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/snapmgr.h" /* diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 429f0a8dd98..8ca512db186 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -16,15 +16,12 @@ #include "access/table.h" #include "access/tableam.h" #include "catalog/partition.h" -#include "catalog/pg_inherits.h" -#include "catalog/pg_type.h" #include "executor/execPartition.h" #include "executor/executor.h" #include "executor/nodeModifyTable.h" #include "foreign/fdwapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "partitioning/partbounds.h" #include "partitioning/partdesc.h" #include "partitioning/partprune.h" diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index ff8a7f77f5d..d0a89cd5778 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -23,16 +23,10 @@ #include "commands/trigger.h" #include "executor/executor.h" #include "executor/nodeModifyTable.h" -#include "nodes/nodeFuncs.h" -#include "parser/parse_relation.h" -#include "parser/parsetree.h" #include "replication/logicalrelation.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "utils/builtins.h" -#include "utils/datum.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/executor/execSRF.c b/src/backend/executor/execSRF.c index f38fb824096..862d3085f83 100644 --- a/src/backend/executor/execSRF.c +++ b/src/backend/executor/execSRF.c @@ -21,7 +21,6 @@ #include "access/htup_details.h" #include "catalog/objectaccess.h" #include "catalog/pg_proc.h" -#include "executor/execdebug.h" #include "funcapi.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c index bf4d4133c5e..f52e28c58e9 100644 --- a/src/backend/executor/execScan.c +++ b/src/backend/executor/execScan.c @@ -20,7 +20,6 @@ #include "executor/executor.h" #include "miscadmin.h" -#include "utils/memutils.h" diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index cff5dc723e1..5737f9f4ebd 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -46,18 +46,13 @@ #include "postgres.h" #include "access/parallel.h" -#include "access/relscan.h" #include "access/table.h" #include "access/tableam.h" -#include "access/transam.h" #include "executor/executor.h" -#include "executor/execPartition.h" #include "executor/nodeModifyTable.h" #include "jit/jit.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/nodeFuncs.h" -#include "parser/parsetree.h" #include "parser/parse_relation.h" #include "partitioning/partdesc.h" #include "storage/lmgr.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index dbd5661d170..53ead77ece8 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -260,7 +260,6 @@ #include "executor/nodeAgg.h" #include "lib/hyperloglog.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "parser/parse_agg.h" diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index c7059e75280..ca0f54d676f 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -58,8 +58,8 @@ #include "postgres.h" #include "executor/execAsync.h" -#include "executor/execdebug.h" #include "executor/execPartition.h" +#include "executor/executor.h" #include "executor/nodeAppend.h" #include "miscadmin.h" #include "pgstat.h" diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c index 4adf62dcd0d..9c9c6668721 100644 --- a/src/backend/executor/nodeBitmapAnd.c +++ b/src/backend/executor/nodeBitmapAnd.c @@ -28,7 +28,7 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeBitmapAnd.h" diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index c1e81ebed63..345b67649ea 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -39,15 +39,12 @@ #include "access/relscan.h" #include "access/tableam.h" -#include "access/transam.h" #include "access/visibilitymap.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeBitmapHeapscan.h" #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" -#include "storage/predicate.h" -#include "utils/memutils.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/spccache.h" diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 83aaf88de87..6df8e17ec84 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -22,11 +22,10 @@ #include "postgres.h" #include "access/genam.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeBitmapIndexscan.h" #include "executor/nodeIndexscan.h" #include "miscadmin.h" -#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c index 24a1d84a34a..7029536c643 100644 --- a/src/backend/executor/nodeBitmapOr.c +++ b/src/backend/executor/nodeBitmapOr.c @@ -28,7 +28,7 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeBitmapOr.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c index 1000fdcf2aa..8081eed887b 100644 --- a/src/backend/executor/nodeCtescan.c +++ b/src/backend/executor/nodeCtescan.c @@ -15,7 +15,7 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeCtescan.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c index 745ae27770f..e559cd23464 100644 --- a/src/backend/executor/nodeCustom.c +++ b/src/backend/executor/nodeCustom.c @@ -17,9 +17,6 @@ #include "nodes/execnodes.h" #include "nodes/extensible.h" #include "nodes/plannodes.h" -#include "parser/parsetree.h" -#include "utils/hsearch.h" -#include "utils/memutils.h" #include "utils/rel.h" static TupleTableSlot *ExecCustomScan(PlanState *pstate); diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c index 3622c010fe7..fe4ae55c0f6 100644 --- a/src/backend/executor/nodeForeignscan.c +++ b/src/backend/executor/nodeForeignscan.c @@ -25,7 +25,6 @@ #include "executor/executor.h" #include "executor/nodeForeignscan.h" #include "foreign/fdwapi.h" -#include "utils/memutils.h" #include "utils/rel.h" static TupleTableSlot *ForeignNext(ForeignScanState *node); diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index 4ee8f51f734..3cc37f2177f 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -26,7 +26,6 @@ #include "executor/nodeFunctionscan.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" -#include "utils/builtins.h" #include "utils/memutils.h" diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c index 7b6ced98061..5d4ffe989cb 100644 --- a/src/backend/executor/nodeGather.c +++ b/src/backend/executor/nodeGather.c @@ -30,18 +30,13 @@ #include "postgres.h" -#include "access/relscan.h" -#include "access/xact.h" -#include "executor/execdebug.h" #include "executor/execParallel.h" +#include "executor/executor.h" #include "executor/nodeGather.h" -#include "executor/nodeSubplan.h" #include "executor/tqueue.h" #include "miscadmin.h" #include "optimizer/optimizer.h" -#include "pgstat.h" -#include "utils/memutils.h" -#include "utils/rel.h" +#include "utils/wait_event.h" static TupleTableSlot *ExecGather(PlanState *pstate); diff --git a/src/backend/executor/nodeGatherMerge.c b/src/backend/executor/nodeGatherMerge.c index 2d552f42240..45f6017c29e 100644 --- a/src/backend/executor/nodeGatherMerge.c +++ b/src/backend/executor/nodeGatherMerge.c @@ -14,18 +14,13 @@ #include "postgres.h" -#include "access/relscan.h" -#include "access/xact.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/execParallel.h" #include "executor/nodeGatherMerge.h" -#include "executor/nodeSubplan.h" #include "executor/tqueue.h" #include "lib/binaryheap.h" #include "miscadmin.h" #include "optimizer/optimizer.h" -#include "utils/memutils.h" -#include "utils/rel.h" /* * When we read tuples from workers, it's a good idea to read several at once diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index 1aa3fc29244..da32bec1811 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -25,7 +25,6 @@ #include "executor/executor.h" #include "executor/nodeGroup.h" #include "miscadmin.h" -#include "utils/memutils.h" /* diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index f90e16ede8a..61480733a12 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -30,19 +30,18 @@ #include "access/parallel.h" #include "catalog/pg_statistic.h" #include "commands/tablespace.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/hashjoin.h" #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" #include "miscadmin.h" -#include "pgstat.h" #include "port/atomics.h" #include "port/pg_bitutils.h" #include "utils/dynahash.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/syscache.h" +#include "utils/wait_event.h" static void ExecHashIncreaseNumBatches(HashJoinTable hashtable); static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable); diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 1cbec4647c3..dbf114cd5eb 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -169,9 +169,8 @@ #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" #include "miscadmin.h" -#include "pgstat.h" -#include "utils/memutils.h" #include "utils/sharedtuplestore.h" +#include "utils/wait_event.h" /* diff --git a/src/backend/executor/nodeIncrementalSort.c b/src/backend/executor/nodeIncrementalSort.c index ba5d7bd2f38..2ce5ed5ec8c 100644 --- a/src/backend/executor/nodeIncrementalSort.c +++ b/src/backend/executor/nodeIncrementalSort.c @@ -78,7 +78,6 @@ #include "postgres.h" -#include "access/htup_details.h" #include "executor/execdebug.h" #include "executor/nodeIncrementalSort.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c index 2c2c9c10b57..9e35aaf56e5 100644 --- a/src/backend/executor/nodeIndexonlyscan.c +++ b/src/backend/executor/nodeIndexonlyscan.c @@ -35,13 +35,12 @@ #include "access/tableam.h" #include "access/tupdesc.h" #include "access/visibilitymap.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeIndexonlyscan.h" #include "executor/nodeIndexscan.h" #include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/predicate.h" -#include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 03142b4a946..2a3264599d2 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -33,7 +33,7 @@ #include "access/relscan.h" #include "access/tableam.h" #include "catalog/pg_am.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeIndexscan.h" #include "lib/pairingheap.h" #include "miscadmin.h" @@ -41,7 +41,6 @@ #include "utils/array.h" #include "utils/datum.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/rel.h" /* diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index ab274c7e113..e6f1fb15629 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -24,7 +24,6 @@ #include "executor/executor.h" #include "executor/nodeLimit.h" #include "miscadmin.h" -#include "nodes/nodeFuncs.h" static void recompute_limits(LimitState *node); static int64 compute_tuples_needed(LimitState *node); diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index 08178684528..e1b9b984a7a 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -38,7 +38,7 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/execPartition.h" #include "executor/nodeMergeAppend.h" #include "lib/binaryheap.h" diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index c1a8ca24641..4fb34e35371 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -97,7 +97,6 @@ #include "executor/nodeMergejoin.h" #include "miscadmin.h" #include "utils/lsyscache.h" -#include "utils/memutils.h" /* diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index ff7ec8419bb..fcb6133e945 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -42,11 +42,9 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" #include "access/tableam.h" #include "access/xact.h" -#include "catalog/catalog.h" #include "commands/trigger.h" #include "executor/execPartition.h" #include "executor/executor.h" @@ -56,12 +54,11 @@ #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" #include "rewrite/rewriteHandler.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "utils/builtins.h" #include "utils/datum.h" -#include "utils/memutils.h" #include "utils/rel.h" +#include "utils/snapmgr.h" typedef struct MTTargetRelLookup diff --git a/src/backend/executor/nodeNamedtuplestorescan.c b/src/backend/executor/nodeNamedtuplestorescan.c index e3f854e03fb..580f235248b 100644 --- a/src/backend/executor/nodeNamedtuplestorescan.c +++ b/src/backend/executor/nodeNamedtuplestorescan.c @@ -15,9 +15,8 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeNamedtuplestorescan.h" -#include "miscadmin.h" #include "utils/queryenvironment.h" static TupleTableSlot *NamedTuplestoreScanNext(NamedTuplestoreScanState *node); diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 06fa0a9b31b..7f4bf6c4dbb 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -24,7 +24,6 @@ #include "executor/execdebug.h" #include "executor/nodeNestloop.h" #include "miscadmin.h" -#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c index 4ee42fe066b..e4837300152 100644 --- a/src/backend/executor/nodeProjectSet.c +++ b/src/backend/executor/nodeProjectSet.c @@ -26,7 +26,6 @@ #include "executor/nodeProjectSet.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "utils/memutils.h" static TupleTableSlot *ExecProjectSRF(ProjectSetState *node, bool continuing); diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 59270f42edf..c7f8a19fa44 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -18,7 +18,7 @@ */ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeRecursiveunion.h" #include "miscadmin.h" #include "utils/memutils.h" diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c index 73ec80f7261..348361e7f44 100644 --- a/src/backend/executor/nodeResult.c +++ b/src/backend/executor/nodeResult.c @@ -48,7 +48,6 @@ #include "executor/executor.h" #include "executor/nodeResult.h" #include "miscadmin.h" -#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeSamplescan.c b/src/backend/executor/nodeSamplescan.c index a41b41ae673..714b076e646 100644 --- a/src/backend/executor/nodeSamplescan.c +++ b/src/backend/executor/nodeSamplescan.c @@ -20,11 +20,7 @@ #include "common/pg_prng.h" #include "executor/executor.h" #include "executor/nodeSamplescan.h" -#include "miscadmin.h" -#include "pgstat.h" -#include "storage/bufmgr.h" -#include "storage/predicate.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/rel.h" static TupleTableSlot *SampleNext(SampleScanState *node); diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index ac7fb8283b9..7cb12a11c2d 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -29,7 +29,7 @@ #include "access/relscan.h" #include "access/tableam.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeSeqscan.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c index 7de1595ed8e..782097eaf29 100644 --- a/src/backend/executor/nodeSubqueryscan.c +++ b/src/backend/executor/nodeSubqueryscan.c @@ -27,7 +27,7 @@ */ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeSubqueryscan.h" static TupleTableSlot *SubqueryNext(SubqueryScanState *node); diff --git a/src/backend/executor/nodeTidrangescan.c b/src/backend/executor/nodeTidrangescan.c index 56090fdc8a8..9aa7683d7e3 100644 --- a/src/backend/executor/nodeTidrangescan.c +++ b/src/backend/executor/nodeTidrangescan.c @@ -18,10 +18,9 @@ #include "access/sysattr.h" #include "access/tableam.h" #include "catalog/pg_operator.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeTidrangescan.h" #include "nodes/nodeFuncs.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 00899a914fa..864a9013b62 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -25,12 +25,11 @@ #include "access/sysattr.h" #include "access/tableam.h" #include "catalog/pg_type.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeTidscan.h" #include "lib/qunique.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "storage/bufmgr.h" #include "utils/array.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index a90529cb086..a125923e935 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -36,7 +36,6 @@ #include "executor/executor.h" #include "executor/nodeUnique.h" #include "miscadmin.h" -#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c index 72389256c04..3f883d8ff66 100644 --- a/src/backend/executor/nodeWorktablescan.c +++ b/src/backend/executor/nodeWorktablescan.c @@ -15,7 +15,7 @@ #include "postgres.h" -#include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeWorktablescan.h" static TupleTableSlot *WorkTableScanNext(WorkTableScanState *node); diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index d71484c0b8b..85857715bd8 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -23,7 +23,6 @@ #include "commands/trigger.h" #include "executor/executor.h" #include "executor/spi_priv.h" -#include "miscadmin.h" #include "tcop/pquery.h" #include "tcop/utility.h" #include "utils/builtins.h" diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c index 02e1898131a..f4f35728b40 100644 --- a/src/backend/foreign/foreign.c +++ b/src/backend/foreign/foreign.c @@ -21,7 +21,6 @@ #include "foreign/fdwapi.h" #include "foreign/foreign.h" #include "funcapi.h" -#include "lib/stringinfo.h" #include "miscadmin.h" #include "utils/builtins.h" #include "utils/memutils.h" diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c index d323c199eaa..815b58f33c5 100644 --- a/src/backend/jit/jit.c +++ b/src/backend/jit/jit.c @@ -21,10 +21,11 @@ #include <sys/stat.h> #include <unistd.h> -#include "executor/execExpr.h" #include "fmgr.h" #include "jit/jit.h" #include "miscadmin.h" +#include "nodes/execnodes.h" +#include "portability/instr_time.h" #include "utils/fmgrprotos.h" /* GUCs */ diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c index ab30f29eee0..93a9e21ddd2 100644 --- a/src/backend/lib/dshash.c +++ b/src/backend/lib/dshash.c @@ -33,10 +33,8 @@ #include "common/hashfn.h" #include "lib/dshash.h" -#include "storage/ipc.h" #include "storage/lwlock.h" #include "utils/dsa.h" -#include "utils/memutils.h" /* * An item in the hash table. This wraps the user's entry object in an diff --git a/src/backend/lib/integerset.c b/src/backend/lib/integerset.c index 21978c1a184..9f1d4db52b2 100644 --- a/src/backend/lib/integerset.c +++ b/src/backend/lib/integerset.c @@ -71,7 +71,6 @@ */ #include "postgres.h" -#include "access/htup_details.h" #include "lib/integerset.h" #include "port/pg_bitutils.h" #include "utils/memutils.h" diff --git a/src/backend/lib/knapsack.c b/src/backend/lib/knapsack.c index 439da1ad70d..5aa8f3791b4 100644 --- a/src/backend/lib/knapsack.c +++ b/src/backend/lib/knapsack.c @@ -28,9 +28,7 @@ #include <limits.h> #include "lib/knapsack.h" -#include "miscadmin.h" #include "nodes/bitmapset.h" -#include "utils/builtins.h" #include "utils/memutils.h" /* diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c index 2abb1a9b3a5..41619599148 100644 --- a/src/backend/libpq/auth-scram.c +++ b/src/backend/libpq/auth-scram.c @@ -92,20 +92,15 @@ #include <unistd.h> #include "access/xlog.h" -#include "catalog/pg_authid.h" #include "catalog/pg_control.h" #include "common/base64.h" #include "common/hmac.h" #include "common/saslprep.h" #include "common/scram-common.h" #include "common/sha2.h" -#include "libpq/auth.h" #include "libpq/crypt.h" #include "libpq/sasl.h" #include "libpq/scram.h" -#include "miscadmin.h" -#include "utils/builtins.h" -#include "utils/timestamp.h" static void scram_get_mechanisms(Port *port, StringInfo buf); static void *scram_init(Port *port, const char *selected_mech, diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 9bbdc4beb00..2b607c52704 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -37,9 +37,7 @@ #include "postmaster/postmaster.h" #include "replication/walsender.h" #include "storage/ipc.h" -#include "utils/guc.h" #include "utils/memutils.h" -#include "utils/timestamp.h" /*---------------------------------------------------------------- * Global authentication functions diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index 6923c241b99..5612c29f8b2 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -29,11 +29,8 @@ #include "libpq/libpq.h" #include "miscadmin.h" -#include "pgstat.h" -#include "storage/ipc.h" -#include "storage/proc.h" #include "tcop/tcopprot.h" -#include "utils/memutils.h" +#include "utils/wait_event.h" char *ssl_library; char *ssl_cert_file; diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 256e25bcdb7..629e51e00be 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -20,7 +20,6 @@ #include "common/scram-common.h" #include "libpq/crypt.h" #include "libpq/scram.h" -#include "miscadmin.h" #include "utils/builtins.h" #include "utils/syscache.h" #include "utils/timestamp.h" diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 8004d102ad0..d506c3c0b75 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -26,24 +26,19 @@ #include <arpa/inet.h> #include <unistd.h> -#include "access/htup_details.h" #include "catalog/pg_collation.h" -#include "catalog/pg_type.h" #include "common/ip.h" #include "common/string.h" -#include "funcapi.h" +#include "libpq/hba.h" #include "libpq/ifaddr.h" -#include "libpq/libpq.h" -#include "miscadmin.h" +#include "libpq/libpq-be.h" #include "postmaster/postmaster.h" #include "regex/regex.h" #include "replication/walsender.h" #include "storage/fd.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/conffiles.h" #include "utils/guc.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/varlena.h" diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 51ffb8e773b..bfd0c5ed658 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -34,7 +34,6 @@ #include "common/username.h" #include "port/atomics.h" #include "postmaster/postmaster.h" -#include "storage/spin.h" #include "tcop/tcopprot.h" #include "utils/help_config.h" #include "utils/memutils.h" diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index a02332a1ecb..33d4d23e239 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -19,7 +19,6 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "utils/errcodes.h" #include "utils/lsyscache.h" diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index e1a5bc7e95d..6ba8e732569 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -18,7 +18,6 @@ #include "catalog/pg_type.h" #include "miscadmin.h" #include "nodes/execnodes.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/pathnodes.h" #include "utils/builtins.h" diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 34cc53af53e..12cffb66415 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -35,11 +35,13 @@ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(CX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* cx * * cycle crossover diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 21ad7854118..af289f7eeb7 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -32,11 +32,13 @@ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(ERX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + static int gimme_edge(PlannerInfo *root, Gene gene1, Gene gene2, Edge *edge_table); static void remove_gene(PlannerInfo *root, Gene gene, Edge edge, Edge *edge_table); static Gene gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table); diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index 47090a138b2..0c5540e2af4 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -26,10 +26,15 @@ #include <math.h> +#include "optimizer/geqo.h" + #include "optimizer/geqo_misc.h" +#if defined(CX) #include "optimizer/geqo_mutation.h" +#endif #include "optimizer/geqo_pool.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_selection.h" diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index 2af0295d694..56e8445e4ea 100644 --- a/src/backend/optimizer/geqo/geqo_mutation.c +++ b/src/backend/optimizer/geqo/geqo_mutation.c @@ -32,11 +32,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_mutation.h" -#include "optimizer/geqo_random.h" +#include "optimizer/geqo.h" #if defined(CX) /* currently used only in CX mode */ +#include "optimizer/geqo_mutation.h" +#include "optimizer/geqo_random.h" + void geqo_mutation(PlannerInfo *root, Gene *tour, int num_gene) { diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index ede7abb4177..a5487269778 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(OX1) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* ox1 * * position crossover diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index 080dbc076cc..6b703576f5a 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(OX2) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* ox2 * * position crossover diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index e44fd0bae5a..01d55711925 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(PMX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* pmx * * partially matched crossover diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index 914296b53d2..662a17c8437 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -34,11 +34,13 @@ /*************************************************************/ #include "postgres.h" -#include "optimizer/geqo_random.h" -#include "optimizer/geqo_recombination.h" +#include "optimizer/geqo.h" #if defined(PX) +#include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" + /* px * * position crossover diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index d404fbf262c..0b98f0856e9 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -35,18 +35,15 @@ #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/geqo.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/plancat.h" #include "optimizer/planner.h" -#include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "parser/parse_clause.h" #include "parser/parsetree.h" #include "partitioning/partbounds.h" -#include "partitioning/partprune.h" #include "port/pg_bitutils.h" #include "rewrite/rewriteManip.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index c949dc18661..0ab021c1e89 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -14,10 +14,8 @@ */ #include "postgres.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 8b76e985296..83a0aed0519 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -91,7 +91,6 @@ #include "optimizer/paths.h" #include "optimizer/placeholder.h" #include "optimizer/plancat.h" -#include "optimizer/planmain.h" #include "optimizer/restrictinfo.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index da6f457a3bf..3f1a4050e74 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -19,9 +19,7 @@ #include "access/stratnum.h" #include "catalog/pg_opfamily.h" -#include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "nodes/plannodes.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c index b603dcd64b9..2ae5ddfe432 100644 --- a/src/backend/optimizer/path/tidpath.c +++ b/src/backend/optimizer/path/tidpath.c @@ -42,7 +42,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index 4978758f8e1..506fccd20c9 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -24,14 +24,12 @@ #include "catalog/pg_class.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/joininfo.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" #include "optimizer/restrictinfo.h" -#include "optimizer/tlist.h" #include "utils/lsyscache.h" /* diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index d4a9d77d7f5..d3868b628d8 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "catalog/pg_class.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" @@ -28,7 +27,6 @@ #include "optimizer/placeholder.h" #include "optimizer/planmain.h" #include "optimizer/planner.h" -#include "optimizer/prep.h" #include "optimizer/restrictinfo.h" #include "parser/analyze.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index 700c0b7ac74..afb5445b77b 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -33,7 +33,6 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index ca47c7d3103..075d36c7ecc 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -22,7 +22,6 @@ #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/orclauses.h" #include "optimizer/pathnode.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index be4e182869a..ac97575453f 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -19,18 +19,15 @@ #include <math.h> #include "access/genam.h" -#include "access/htup_details.h" #include "access/parallel.h" #include "access/sysattr.h" #include "access/table.h" -#include "access/xact.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_constraint.h" #include "catalog/pg_inherits.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/executor.h" -#include "executor/nodeAgg.h" #include "foreign/fdwapi.h" #include "jit/jit.h" #include "lib/bipartite_match.h" @@ -45,7 +42,6 @@ #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" -#include "optimizer/inherit.h" #include "optimizer/optimizer.h" #include "optimizer/paramassign.h" #include "optimizer/pathnode.h" @@ -61,12 +57,9 @@ #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "partitioning/partdesc.h" -#include "rewrite/rewriteManip.h" -#include "storage/dsm_impl.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" /* GUC parameters */ double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION; diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 22a1fa29f36..42603dbc7c2 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -27,7 +27,6 @@ #include "optimizer/tlist.h" #include "parser/parse_relation.h" #include "tcop/utility.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/prep/prepagg.c b/src/backend/optimizer/prep/prepagg.c index 127f25bb2f5..4606df379a8 100644 --- a/src/backend/optimizer/prep/prepagg.c +++ b/src/backend/optimizer/prep/prepagg.c @@ -39,7 +39,6 @@ #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" #include "nodes/pathnodes.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index 7ce14cc535c..cbcf83f8473 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -34,7 +34,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" -#include "optimizer/prep.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index c939b5a45fb..a5bfd7a3f70 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -24,9 +24,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/sysattr.h" -#include "catalog/partition.h" -#include "catalog/pg_inherits.h" #include "catalog/pg_type.h" #include "miscadmin.h" #include "nodes/makefuncs.h" @@ -34,16 +31,11 @@ #include "optimizer/cost.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" -#include "optimizer/planmain.h" #include "optimizer/planner.h" #include "optimizer/prep.h" #include "optimizer/tlist.h" #include "parser/parse_coerce.h" -#include "parser/parsetree.h" -#include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" static RelOptInfo *recurse_set_operations(Node *setOp, PlannerInfo *root, diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index edc25d712e9..455c2e8d31a 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -20,8 +20,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "catalog/pg_aggregate.h" -#include "catalog/pg_class.h" #include "catalog/pg_language.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" @@ -41,7 +39,6 @@ #include "optimizer/plancat.h" #include "optimizer/planmain.h" #include "parser/analyze.h" -#include "parser/parse_agg.h" #include "parser/parse_coerce.h" #include "parser/parse_func.h" #include "rewrite/rewriteHandler.h" diff --git a/src/backend/optimizer/util/orclauses.c b/src/backend/optimizer/util/orclauses.c index 6a5234e2cec..d911c6547d9 100644 --- a/src/backend/optimizer/util/orclauses.c +++ b/src/backend/optimizer/util/orclauses.c @@ -17,8 +17,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/orclauses.h" #include "optimizer/restrictinfo.h" diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 6f79b2e3fe7..246cd8f7476 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -19,7 +19,6 @@ #include "foreign/fdwapi.h" #include "miscadmin.h" #include "nodes/extensible.h" -#include "nodes/nodeFuncs.h" #include "optimizer/appendinfo.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" @@ -27,11 +26,8 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" -#include "optimizer/prep.h" -#include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "parser/parsetree.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/selfuncs.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index b933eefa649..6bb53e4346f 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -36,11 +36,9 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "nodes/supportnodes.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" #include "optimizer/plancat.h" -#include "optimizer/prep.h" #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "partitioning/partdesc.h" diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index dbdf6bf8964..2255314c519 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -48,10 +48,8 @@ #include "parser/parse_target.h" #include "parser/parse_type.h" #include "parser/parsetree.h" -#include "rewrite/rewriteManip.h" #include "utils/backend_status.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 4b50278fd0d..d2ac86777c2 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -20,10 +20,8 @@ #include "access/table.h" #include "access/tsmapi.h" #include "catalog/catalog.h" -#include "catalog/heap.h" #include "catalog/pg_am.h" #include "catalog/pg_amproc.h" -#include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "commands/defrem.h" diff --git a/src/backend/parser/parse_merge.c b/src/backend/parser/parse_merge.c index 4356d61f8ed..6b99f556885 100644 --- a/src/backend/parser/parse_merge.c +++ b/src/backend/parser/parse_merge.c @@ -16,12 +16,10 @@ #include "postgres.h" #include "access/sysattr.h" -#include "miscadmin.h" #include "nodes/makefuncs.h" #include "parser/analyze.h" #include "parser/parse_collate.h" #include "parser/parsetree.h" -#include "parser/parser.h" #include "parser/parse_clause.h" #include "parser/parse_cte.h" #include "parser/parse_expr.h" @@ -29,7 +27,6 @@ #include "parser/parse_relation.h" #include "parser/parse_target.h" #include "utils/rel.h" -#include "utils/relcache.h" static void setNamespaceForMergeWhen(ParseState *pstate, MergeWhenClause *mergeWhenClause, diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 782a806c4f7..9361b5252d8 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -22,14 +22,9 @@ #include "nodes/miscnodes.h" #include "nodes/nodeFuncs.h" #include "nodes/subscripting.h" -#include "parser/parse_coerce.h" -#include "parser/parse_expr.h" -#include "parser/parse_relation.h" -#include "parser/parsetree.h" +#include "parser/parse_node.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" -#include "utils/varbit.h" static void pcb_error_callback(void *arg); diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 0cd904f8dac..f10fc420e60 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -14,6 +14,7 @@ */ #include "postgres.h" +#include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "funcapi.h" @@ -22,7 +23,6 @@ #include "nodes/nodeFuncs.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" -#include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" #include "parser/parse_type.h" @@ -30,7 +30,6 @@ #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/typcache.h" static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle, Var *var, int levelsup); diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 8a1a5a72553..c28639d2e3f 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -30,7 +30,6 @@ #include "parser/parse_coerce.h" #include "partitioning/partbounds.h" #include "partitioning/partdesc.h" -#include "partitioning/partprune.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/datum.h" diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c index 1e1108714b9..47c97566e65 100644 --- a/src/backend/partitioning/partdesc.c +++ b/src/backend/partitioning/partdesc.c @@ -21,16 +21,14 @@ #include "catalog/pg_inherits.h" #include "partitioning/partbounds.h" #include "partitioning/partdesc.h" -#include "storage/bufmgr.h" -#include "storage/sinval.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/hsearch.h" -#include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/partcache.h" #include "utils/rel.h" +#include "utils/snapmgr.h" #include "utils/syscache.h" typedef struct PartitionDirectoryData diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.c index 0b6c627b503..9006afd9d21 100644 --- a/src/backend/partitioning/partprune.c +++ b/src/backend/partitioning/partprune.c @@ -52,7 +52,6 @@ #include "parser/parsetree.h" #include "partitioning/partbounds.h" #include "partitioning/partprune.h" -#include "rewrite/rewriteManip.h" #include "utils/array.h" #include "utils/lsyscache.h" diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index 9a96329bf25..1a6d8fa0fbc 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -34,6 +34,7 @@ #include "storage/fd.h" #include "storage/ipc.h" #include "storage/pg_shmem.h" +#include "utils/guc.h" #include "utils/guc_hooks.h" #include "utils/pidfile.h" diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 3ebe8e91a0b..7d7fff6f5d5 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -95,7 +95,6 @@ #include "storage/pmsignal.h" #include "storage/proc.h" #include "storage/procsignal.h" -#include "storage/sinvaladt.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" #include "utils/fmgroids.h" diff --git a/src/backend/postmaster/auxprocess.c b/src/backend/postmaster/auxprocess.c index fc13cd76321..2c86abdb719 100644 --- a/src/backend/postmaster/auxprocess.c +++ b/src/backend/postmaster/auxprocess.c @@ -15,7 +15,6 @@ #include <unistd.h> #include <signal.h> -#include "libpq/pqsignal.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/auxprocess.h" @@ -24,15 +23,11 @@ #include "postmaster/walsummarizer.h" #include "postmaster/walwriter.h" #include "replication/walreceiver.h" -#include "storage/bufmgr.h" -#include "storage/bufpage.h" #include "storage/condition_variable.h" #include "storage/ipc.h" #include "storage/proc.h" -#include "tcop/tcopprot.h" -#include "utils/memutils.h" +#include "storage/procsignal.h" #include "utils/ps_status.h" -#include "utils/rel.h" static void ShutdownAuxiliaryProcess(int code, Datum arg); diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c index d8e89de7494..b73e91f0c86 100644 --- a/src/backend/postmaster/bgworker.c +++ b/src/backend/postmaster/bgworker.c @@ -21,11 +21,9 @@ #include "postmaster/postmaster.h" #include "replication/logicallauncher.h" #include "replication/logicalworker.h" -#include "storage/dsm.h" #include "storage/ipc.h" #include "storage/latch.h" #include "storage/lwlock.h" -#include "storage/pg_shmem.h" #include "storage/pmsignal.h" #include "storage/proc.h" #include "storage/procsignal.h" diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 6364b16261f..da2d95b9261 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -32,7 +32,6 @@ #include "postgres.h" #include "access/xlog.h" -#include "access/xlog_internal.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "pgstat.h" @@ -42,15 +41,11 @@ #include "storage/bufmgr.h" #include "storage/condition_variable.h" #include "storage/fd.h" -#include "storage/ipc.h" #include "storage/lwlock.h" #include "storage/proc.h" #include "storage/procsignal.h" -#include "storage/shmem.h" #include "storage/smgr.h" -#include "storage/spin.h" #include "storage/standby.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" #include "utils/timestamp.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 59318067460..f3c09e8dc0d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -91,18 +91,15 @@ #include "access/xlog.h" #include "access/xlogrecovery.h" -#include "catalog/pg_control.h" #include "common/file_perm.h" #include "common/file_utils.h" #include "common/ip.h" #include "common/pg_prng.h" #include "common/string.h" #include "lib/ilist.h" -#include "libpq/auth.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" -#include "nodes/queryjumble.h" #include "pg_getopt.h" #include "pgstat.h" #include "port/pg_bswap.h" @@ -119,7 +116,6 @@ #include "replication/walsender.h" #include "storage/fd.h" #include "storage/ipc.h" -#include "storage/pg_shmem.h" #include "storage/pmsignal.h" #include "storage/proc.h" #include "tcop/tcopprot.h" @@ -133,6 +129,8 @@ #include "utils/varlena.h" #ifdef EXEC_BACKEND +#include "nodes/queryjumble.h" +#include "storage/pg_shmem.h" #include "storage/spin.h" #endif diff --git a/src/backend/postmaster/startup.c b/src/backend/postmaster/startup.c index 44b6c5bb758..8b51e45bad0 100644 --- a/src/backend/postmaster/startup.c +++ b/src/backend/postmaster/startup.c @@ -24,10 +24,8 @@ #include "access/xlogutils.h" #include "libpq/pqsignal.h" #include "miscadmin.h" -#include "pgstat.h" #include "postmaster/startup.h" #include "storage/ipc.h" -#include "storage/latch.h" #include "storage/pmsignal.h" #include "storage/procsignal.h" #include "storage/standby.h" diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 6db280e483e..c2a6a226e70 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -51,7 +51,6 @@ #include "tcop/tcopprot.h" #include "utils/guc.h" #include "utils/ps_status.h" -#include "utils/timestamp.h" /* * We read() into a temp buffer twice as big as a chunk, so that any fragment diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c index 8636d9424ec..54fab16c378 100644 --- a/src/backend/postmaster/walsummarizer.c +++ b/src/backend/postmaster/walsummarizer.c @@ -32,7 +32,6 @@ #include "common/blkreftable.h" #include "libpq/pqsignal.h" #include "miscadmin.h" -#include "postmaster/bgwriter.h" #include "postmaster/interrupt.h" #include "postmaster/walsummarizer.h" #include "replication/walreceiver.h" @@ -43,7 +42,6 @@ #include "storage/proc.h" #include "storage/procsignal.h" #include "storage/shmem.h" -#include "storage/spin.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/wait_event.h" diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 1519b27adca..761bf0f677c 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -22,8 +22,6 @@ #include <unistd.h> #include <sys/time.h> -#include "access/xlog.h" -#include "catalog/pg_type.h" #include "common/connect.h" #include "funcapi.h" #include "libpq-fe.h" diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c index 7b21731287d..e5ab7b78b78 100644 --- a/src/backend/replication/logical/decode.c +++ b/src/backend/replication/logical/decode.c @@ -26,22 +26,19 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/heapam_xlog.h" #include "access/transam.h" #include "access/xact.h" #include "access/xlog_internal.h" #include "access/xlogreader.h" #include "access/xlogrecord.h" -#include "access/xlogutils.h" #include "catalog/pg_control.h" #include "replication/decode.h" #include "replication/logical.h" #include "replication/message.h" -#include "replication/origin.h" #include "replication/reorderbuffer.h" #include "replication/snapbuild.h" -#include "storage/standby.h" +#include "storage/standbydefs.h" /* individual record(group)'s handlers */ static void DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf); diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c index 487f141a596..66070e9131c 100644 --- a/src/backend/replication/logical/launcher.c +++ b/src/backend/replication/logical/launcher.c @@ -26,29 +26,22 @@ #include "catalog/pg_subscription_rel.h" #include "funcapi.h" #include "lib/dshash.h" -#include "libpq/pqsignal.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgworker.h" -#include "postmaster/fork_process.h" #include "postmaster/interrupt.h" -#include "postmaster/postmaster.h" #include "replication/logicallauncher.h" -#include "replication/logicalworker.h" #include "replication/slot.h" #include "replication/walreceiver.h" #include "replication/worker_internal.h" #include "storage/ipc.h" #include "storage/proc.h" #include "storage/procarray.h" -#include "storage/procsignal.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/pg_lsn.h" -#include "utils/ps_status.h" #include "utils/snapmgr.h" -#include "utils/timeout.h" /* max sleep time between cycles (3min) */ #define DEFAULT_NAPTIME_PER_CYCLE 180000L diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c index a53815f2ed5..51ffb623c01 100644 --- a/src/backend/replication/logical/logical.c +++ b/src/backend/replication/logical/logical.c @@ -30,13 +30,11 @@ #include "access/xact.h" #include "access/xlogutils.h" -#include "access/xlog_internal.h" #include "fmgr.h" #include "miscadmin.h" #include "pgstat.h" #include "replication/decode.h" #include "replication/logical.h" -#include "replication/origin.h" #include "replication/reorderbuffer.h" #include "replication/snapbuild.h" #include "storage/proc.h" diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index b0081d3ce5b..a1ff631e5ed 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -17,8 +17,6 @@ #include <unistd.h> -#include "access/xact.h" -#include "access/xlog_internal.h" #include "access/xlogrecovery.h" #include "access/xlogutils.h" #include "catalog/pg_type.h" @@ -30,11 +28,9 @@ #include "replication/decode.h" #include "replication/logical.h" #include "replication/message.h" -#include "storage/fd.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/inval.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_lsn.h" #include "utils/regproc.h" diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c index 2ac34e77815..9e41aac2813 100644 --- a/src/backend/replication/logical/message.c +++ b/src/backend/replication/logical/message.c @@ -34,10 +34,7 @@ #include "access/xact.h" #include "access/xloginsert.h" #include "miscadmin.h" -#include "nodes/execnodes.h" -#include "replication/logical.h" #include "replication/message.h" -#include "utils/memutils.h" /* * Write logical decoding message into XLog. diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index 4ef3385c952..a529da983ae 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -82,10 +82,9 @@ #include "miscadmin.h" #include "nodes/execnodes.h" #include "pgstat.h" -#include "replication/logical.h" #include "replication/origin.h" +#include "replication/slot.h" #include "storage/condition_variable.h" -#include "storage/copydir.h" #include "storage/fd.h" #include "storage/ipc.h" #include "storage/lmgr.h" diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c index c68e8cfab7a..4f79f46cae2 100644 --- a/src/backend/replication/logical/relation.c +++ b/src/backend/replication/logical/relation.c @@ -23,7 +23,6 @@ #include "access/genam.h" #include "access/table.h" #include "catalog/namespace.h" -#include "catalog/pg_am_d.h" #include "catalog/pg_subscription_rel.h" #include "executor/executor.h" #include "nodes/makefuncs.h" diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 5446df3c647..001f901ee65 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -103,8 +103,6 @@ #include "storage/fd.h" #include "storage/sinval.h" #include "utils/builtins.h" -#include "utils/combocid.h" -#include "utils/memdebug.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/relfilenumbermap.h" diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index a0b7947d2f1..ac24b518603 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -134,7 +134,6 @@ #include "replication/logical.h" #include "replication/reorderbuffer.h" #include "replication/snapbuild.h" -#include "storage/block.h" /* debugging output */ #include "storage/fd.h" #include "storage/lmgr.h" #include "storage/proc.h" diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 9dd2446fbfd..b5a80fe3e84 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -147,65 +147,40 @@ #include <sys/stat.h> #include <unistd.h> -#include "access/genam.h" #include "access/table.h" #include "access/tableam.h" #include "access/twophase.h" #include "access/xact.h" -#include "access/xlog_internal.h" -#include "catalog/catalog.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" -#include "catalog/partition.h" #include "catalog/pg_inherits.h" #include "catalog/pg_subscription.h" #include "catalog/pg_subscription_rel.h" -#include "catalog/pg_tablespace.h" #include "commands/tablecmds.h" -#include "commands/tablespace.h" #include "commands/trigger.h" #include "executor/executor.h" #include "executor/execPartition.h" -#include "executor/nodeModifyTable.h" -#include "funcapi.h" #include "libpq/pqformat.h" -#include "libpq/pqsignal.h" -#include "mb/pg_wchar.h" #include "miscadmin.h" -#include "nodes/makefuncs.h" #include "optimizer/optimizer.h" #include "parser/parse_relation.h" #include "pgstat.h" #include "postmaster/bgworker.h" #include "postmaster/interrupt.h" -#include "postmaster/postmaster.h" #include "postmaster/walwriter.h" -#include "replication/decode.h" -#include "replication/logical.h" #include "replication/logicallauncher.h" #include "replication/logicalproto.h" #include "replication/logicalrelation.h" #include "replication/logicalworker.h" #include "replication/origin.h" -#include "replication/reorderbuffer.h" -#include "replication/snapbuild.h" #include "replication/walreceiver.h" #include "replication/worker_internal.h" #include "rewrite/rewriteHandler.h" #include "storage/buffile.h" -#include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" #include "storage/lmgr.h" -#include "storage/proc.h" -#include "storage/procarray.h" #include "tcop/tcopprot.h" #include "utils/acl.h" -#include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/dynahash.h" -#include "utils/datum.h" -#include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" @@ -213,8 +188,8 @@ #include "utils/pg_lsn.h" #include "utils/rel.h" #include "utils/rls.h" +#include "utils/snapmgr.h" #include "utils/syscache.h" -#include "utils/timeout.h" #include "utils/usercontext.h" #define NAPTIME_PER_CYCLE 1000 /* max sleep time between cycles (1s) */ diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index 998f92d6712..d2b35cfb96d 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -22,7 +22,6 @@ #include "executor/executor.h" #include "fmgr.h" #include "nodes/makefuncs.h" -#include "optimizer/optimizer.h" #include "parser/parse_relation.h" #include "replication/logical.h" #include "replication/logicalproto.h" diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index bfcd8fa13e9..77917b848a4 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -81,10 +81,8 @@ #include "replication/syncrep.h" #include "replication/walsender.h" #include "replication/walsender_private.h" -#include "storage/pmsignal.h" #include "storage/proc.h" #include "tcop/tcopprot.h" -#include "utils/builtins.h" #include "utils/guc_hooks.h" #include "utils/ps_status.h" diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index b80447d15f1..5a0652c9426 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -58,8 +58,6 @@ #include "access/xlogarchive.h" #include "access/xlogrecovery.h" #include "catalog/pg_authid.h" -#include "catalog/pg_type.h" -#include "common/ip.h" #include "funcapi.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" @@ -69,7 +67,6 @@ #include "replication/walreceiver.h" #include "replication/walsender.h" #include "storage/ipc.h" -#include "storage/pmsignal.h" #include "storage/proc.h" #include "storage/procarray.h" #include "storage/procsignal.h" @@ -78,7 +75,6 @@ #include "utils/guc.h" #include "utils/pg_lsn.h" #include "utils/ps_status.h" -#include "utils/resowner.h" #include "utils/timestamp.h" diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index 73a7d8f96c7..85a19cdfa5c 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -25,7 +25,6 @@ #include "access/xlog_internal.h" #include "access/xlogrecovery.h" #include "pgstat.h" -#include "postmaster/startup.h" #include "replication/walreceiver.h" #include "storage/pmsignal.h" #include "storage/shmem.h" diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 6bc2711cbe5..0f1047179cb 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -49,7 +49,6 @@ #include <signal.h> #include <unistd.h> -#include "access/printtup.h" #include "access/timeline.h" #include "access/transam.h" #include "access/xact.h" @@ -84,7 +83,6 @@ #include "storage/ipc.h" #include "storage/pmsignal.h" #include "storage/proc.h" -#include "storage/procarray.h" #include "tcop/dest.h" #include "tcop/tcopprot.h" #include "utils/acl.h" @@ -92,7 +90,6 @@ #include "utils/guc.h" #include "utils/memutils.h" #include "utils/pg_lsn.h" -#include "utils/portal.h" #include "utils/ps_status.h" #include "utils/timeout.h" #include "utils/timestamp.h" diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index b449244a53d..6cc9a8d8bfe 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -14,21 +14,15 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/htup_details.h" -#include "access/multixact.h" -#include "access/tableam.h" -#include "access/transam.h" -#include "access/xact.h" +#include "access/relation.h" +#include "access/table.h" #include "catalog/catalog.h" #include "catalog/dependency.h" -#include "catalog/heap.h" +#include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/objectaccess.h" -#include "catalog/pg_inherits.h" #include "catalog/pg_rewrite.h" -#include "catalog/storage.h" -#include "commands/policy.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" #include "parser/parse_utilcmd.h" @@ -40,7 +34,6 @@ #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index b8839b56b7a..89187d9af2e 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -25,7 +25,6 @@ #include "access/table.h" #include "catalog/dependency.h" #include "catalog/partition.h" -#include "catalog/pg_type.h" #include "commands/trigger.h" #include "executor/executor.h" #include "foreign/fdwapi.h" diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 1f11655cf90..cfa0aa9279e 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -16,21 +16,15 @@ #include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/catalog.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_rewrite.h" #include "miscadmin.h" #include "rewrite/rewriteRemove.h" -#include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/inval.h" -#include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/syscache.h" /* * Guts of rule deletion. diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 36b3e01abe6..c13be02a9a7 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -17,12 +17,11 @@ #include "access/htup_details.h" #include "access/table.h" #include "catalog/indexing.h" +#include "catalog/pg_class.h" #include "catalog/pg_rewrite.h" #include "rewrite/rewriteSupport.h" -#include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c index 94268a2b08b..450af27c7f5 100644 --- a/src/backend/rewrite/rowsecurity.c +++ b/src/backend/rewrite/rowsecurity.c @@ -34,30 +34,19 @@ */ #include "postgres.h" -#include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "catalog/pg_class.h" -#include "catalog/pg_inherits.h" -#include "catalog/pg_policy.h" #include "catalog/pg_type.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "nodes/nodeFuncs.h" #include "nodes/pg_list.h" -#include "nodes/plannodes.h" -#include "parser/parsetree.h" #include "parser/parse_relation.h" #include "rewrite/rewriteDefine.h" -#include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" #include "rewrite/rowsecurity.h" -#include "tcop/utility.h" #include "utils/acl.h" -#include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/rls.h" -#include "utils/syscache.h" static void get_policies_for_relation(Relation relation, CmdType cmd, Oid user_id, diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 5c515fd8330..caf86490683 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -14,7 +14,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" +#include "tsearch/ts_public.h" /* Some platforms define MAXINT and/or MININT, causing conflicts */ #ifdef MAXINT diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index 4752b99ed57..5eda06839ea 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -14,8 +14,6 @@ #include "postgres.h" #include "access/htup_details.h" -#include "access/sysattr.h" -#include "catalog/pg_operator.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" #include "lib/stringinfo.h" @@ -27,7 +25,6 @@ #include "parser/parsetree.h" #include "statistics/extended_stats_internal.h" #include "statistics/statistics.h" -#include "utils/bytea.h" #include "utils/fmgroids.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" @@ -35,6 +32,7 @@ #include "utils/selfuncs.h" #include "utils/syscache.h" #include "utils/typcache.h" +#include "varatt.h" /* size of the struct header fields (magic, type, ndeps) */ #define SizeOfHeader (3 * sizeof(uint32)) diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 135151a2723..749e99d53a4 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -21,7 +21,6 @@ #include "access/htup_details.h" #include "access/table.h" #include "catalog/indexing.h" -#include "catalog/pg_collation.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" #include "executor/executor.h" @@ -29,7 +28,6 @@ #include "commands/progress.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/optimizer.h" #include "parser/parsetree.h" #include "pgstat.h" @@ -47,7 +45,6 @@ #include "utils/rel.h" #include "utils/selfuncs.h" #include "utils/syscache.h" -#include "utils/typcache.h" /* * To avoid consuming too much memory during analysis and/or too much space diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c index 6255cd1f4f5..2b5ad434f78 100644 --- a/src/backend/statistics/mcv.c +++ b/src/backend/statistics/mcv.c @@ -17,19 +17,15 @@ #include <math.h> #include "access/htup_details.h" -#include "catalog/pg_collation.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" #include "fmgr.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "statistics/extended_stats_internal.h" #include "statistics/statistics.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/bytea.h" -#include "utils/fmgroids.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c index ee1134cc370..e8eb6a398fe 100644 --- a/src/backend/statistics/mvdistinct.c +++ b/src/backend/statistics/mvdistinct.c @@ -25,16 +25,15 @@ #include <math.h> -#include "access/htup_details.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" #include "lib/stringinfo.h" #include "statistics/extended_stats_internal.h" #include "statistics/statistics.h" #include "utils/fmgrprotos.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/typcache.h" +#include "varatt.h" static double ndistinct_for_combination(double totalrows, StatsBuildData *data, int k, int *combination); diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index baf8ef33ffd..0fa54689303 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -22,7 +22,6 @@ #include "postgres.h" #include "storage/buf_internals.h" -#include "storage/bufmgr.h" /* entry for buffer lookup hashtable */ typedef struct diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index c99730e0e5c..f0f8d4259c5 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -36,7 +36,6 @@ #include "access/tableam.h" #include "access/xloginsert.h" #include "access/xlogutils.h" -#include "catalog/catalog.h" #include "catalog/storage.h" #include "catalog/storage_xlog.h" #include "executor/instrument.h" diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index f4b294476e5..fcfac335a57 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/parallel.h" -#include "catalog/catalog.h" #include "executor/instrument.h" #include "pgstat.h" #include "storage/buf_internals.h" diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index 5315d8a714f..a263875fd5a 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -49,8 +49,8 @@ #include "executor/instrument.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/buf_internals.h" #include "storage/buffile.h" +#include "storage/bufmgr.h" #include "storage/fd.h" #include "utils/resowner.h" diff --git a/src/backend/storage/file/fileset.c b/src/backend/storage/file/fileset.c index 41130bd2908..5746b8f935f 100644 --- a/src/backend/storage/file/fileset.c +++ b/src/backend/storage/file/fileset.c @@ -23,14 +23,11 @@ #include <limits.h> -#include "catalog/pg_tablespace.h" #include "commands/tablespace.h" #include "common/file_utils.h" #include "common/hashfn.h" #include "miscadmin.h" -#include "storage/ipc.h" #include "storage/fileset.h" -#include "utils/builtins.h" static void FileSetPath(char *path, FileSet *fileset, Oid tablespace); static void FilePath(char *path, FileSet *fileset, const char *name); diff --git a/src/backend/storage/file/sharedfileset.c b/src/backend/storage/file/sharedfileset.c index c95fac90f55..00bdbc72607 100644 --- a/src/backend/storage/file/sharedfileset.c +++ b/src/backend/storage/file/sharedfileset.c @@ -20,14 +20,8 @@ #include <limits.h> -#include "catalog/pg_tablespace.h" -#include "commands/tablespace.h" -#include "common/hashfn.h" -#include "miscadmin.h" #include "storage/dsm.h" -#include "storage/ipc.h" #include "storage/sharedfileset.h" -#include "utils/builtins.h" static void SharedFileSetOnDetach(dsm_segment *segment, Datum datum); diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 15e3a073417..bcdb1821938 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -29,8 +29,8 @@ #include "miscadmin.h" #include "storage/freespace.h" #include "storage/fsm_internals.h" -#include "storage/lmgr.h" #include "storage/smgr.h" +#include "utils/rel.h" /* diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index 6b12108dd10..c2e33a7e433 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -44,7 +44,6 @@ #include "storage/pg_shmem.h" #include "storage/shmem.h" #include "utils/freepage.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 7e7941d6259..521ed5418cc 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -16,7 +16,6 @@ #include "access/clog.h" #include "access/commit_ts.h" -#include "access/heapam.h" #include "access/multixact.h" #include "access/nbtree.h" #include "access/subtrans.h" @@ -53,8 +52,6 @@ #include "storage/spin.h" #include "utils/guc.h" #include "utils/injection_point.h" -#include "utils/snapmgr.h" -#include "utils/wait_event.h" /* GUCs */ int shared_memory_type = DEFAULT_SHARED_MEMORY_TYPE; diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c index 6386995e6c7..a7d88ebb048 100644 --- a/src/backend/storage/ipc/latch.c +++ b/src/backend/storage/ipc/latch.c @@ -60,7 +60,6 @@ #include "storage/ipc.h" #include "storage/latch.h" #include "storage/pmsignal.h" -#include "storage/shmem.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 04b50204b81..9eea1ed315a 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -47,7 +47,6 @@ #include <signal.h> -#include "access/clog.h" #include "access/subtrans.h" #include "access/transam.h" #include "access/twophase.h" diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c index f7d9c9af511..ca41b56952f 100644 --- a/src/backend/storage/ipc/procsignal.c +++ b/src/backend/storage/ipc/procsignal.c @@ -27,7 +27,6 @@ #include "storage/condition_variable.h" #include "storage/ipc.h" #include "storage/latch.h" -#include "storage/proc.h" #include "storage/shmem.h" #include "storage/smgr.h" #include "storage/sinval.h" diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c index f314b4d91e9..9235fcd08ec 100644 --- a/src/backend/storage/ipc/shm_mq.c +++ b/src/backend/storage/ipc/shm_mq.c @@ -22,7 +22,6 @@ #include "pgstat.h" #include "port/pg_bitutils.h" #include "postmaster/bgworker.h" -#include "storage/procsignal.h" #include "storage/shm_mq.h" #include "storage/spin.h" #include "utils/memutils.h" diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 15e4e9c2e3a..6d5f0839864 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -65,7 +65,6 @@ #include "postgres.h" -#include "access/transam.h" #include "fmgr.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/storage/ipc/signalfuncs.c b/src/backend/storage/ipc/signalfuncs.c index 81d1a59659d..792e80ff900 100644 --- a/src/backend/storage/ipc/signalfuncs.c +++ b/src/backend/storage/ipc/signalfuncs.c @@ -24,7 +24,7 @@ #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" /* diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c index 9fea667b903..d9b16f84d19 100644 --- a/src/backend/storage/ipc/sinval.c +++ b/src/backend/storage/ipc/sinval.c @@ -15,10 +15,8 @@ #include "postgres.h" #include "access/xact.h" -#include "commands/async.h" #include "miscadmin.h" -#include "storage/ipc.h" -#include "storage/proc.h" +#include "storage/latch.h" #include "storage/sinvaladt.h" #include "utils/inval.h" diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 23ab1cfde8d..87b04e51b36 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -26,13 +26,11 @@ #include "pgstat.h" #include "replication/slot.h" #include "storage/bufmgr.h" -#include "storage/lmgr.h" #include "storage/proc.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/standby.h" #include "utils/hsearch.h" -#include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/timeout.h" #include "utils/timestamp.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index a4c31777f11..f9510833241 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -35,7 +35,6 @@ #include "access/detoast.h" #include "access/genam.h" #include "access/htup_details.h" -#include "access/sysattr.h" #include "access/table.h" #include "access/xact.h" #include "catalog/dependency.h" diff --git a/src/backend/storage/lmgr/condition_variable.c b/src/backend/storage/lmgr/condition_variable.c index 10fdae19dcc..1e8559ed47b 100644 --- a/src/backend/storage/lmgr/condition_variable.c +++ b/src/backend/storage/lmgr/condition_variable.c @@ -21,11 +21,9 @@ #include "miscadmin.h" #include "portability/instr_time.h" #include "storage/condition_variable.h" -#include "storage/ipc.h" #include "storage/proc.h" #include "storage/proclist.h" #include "storage/spin.h" -#include "utils/memutils.h" /* Initially, we are not prepared to sleep on any condition variable. */ static ConditionVariable *cv_sleep_target = NULL; diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 7d964f2dc07..41fd856c654 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/subtrans.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/catalog.h" #include "commands/progress.h" diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 0d904ef6554..0d93932d8d3 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -35,12 +35,10 @@ #include "access/transam.h" #include "access/twophase.h" #include "access/twophase_rmgr.h" -#include "access/xact.h" #include "access/xlog.h" #include "access/xlogutils.h" #include "miscadmin.h" #include "pg_trace.h" -#include "pgstat.h" #include "storage/proc.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index d405c61b21e..30f3a09a4ce 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -81,9 +81,6 @@ #include "pgstat.h" #include "port/pg_bitutils.h" #include "postmaster/postmaster.h" -#include "replication/slot.h" -#include "storage/ipc.h" -#include "storage/predicate.h" #include "storage/proc.h" #include "storage/proclist.h" #include "storage/spin.h" diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index d4483591ebd..3f378c0099b 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -199,7 +199,6 @@ #include "access/parallel.h" #include "access/slru.h" -#include "access/subtrans.h" #include "access/transam.h" #include "access/twophase.h" #include "access/twophase_rmgr.h" @@ -208,7 +207,6 @@ #include "miscadmin.h" #include "pgstat.h" #include "port/pg_lfind.h" -#include "storage/bufmgr.h" #include "storage/predicate.h" #include "storage/predicate_internals.h" #include "storage/proc.h" diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 1949d149656..f3e20038f42 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -39,7 +39,6 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/autovacuum.h" -#include "replication/slot.h" #include "replication/slotsync.h" #include "replication/syncrep.h" #include "storage/condition_variable.h" diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 50cb99cd3b6..ec9a4048cc6 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -23,7 +23,6 @@ #include "postgres.h" #include "storage/pg_sema.h" -#include "storage/shmem.h" #include "storage/spin.h" diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index e9b0bd4ff6a..bf0f3ca76d1 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -25,21 +25,18 @@ #include <fcntl.h> #include <sys/file.h> -#include "access/xlog.h" #include "access/xlogutils.h" #include "commands/tablespace.h" #include "common/file_utils.h" #include "miscadmin.h" #include "pg_trace.h" #include "pgstat.h" -#include "postmaster/bgwriter.h" #include "storage/bufmgr.h" #include "storage/fd.h" #include "storage/md.h" #include "storage/relfilelocator.h" #include "storage/smgr.h" #include "storage/sync.h" -#include "utils/hsearch.h" #include "utils/memutils.h" /* diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index c8b8daabfa8..a5b18328b89 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -54,7 +54,6 @@ #include "access/xlogutils.h" #include "lib/ilist.h" #include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" #include "storage/md.h" #include "storage/smgr.h" diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c index 581faf5f298..4764e26f707 100644 --- a/src/backend/storage/sync/sync.c +++ b/src/backend/storage/sync/sync.c @@ -22,19 +22,14 @@ #include "access/clog.h" #include "access/multixact.h" #include "access/xlog.h" -#include "access/xlogutils.h" -#include "commands/tablespace.h" #include "miscadmin.h" #include "pgstat.h" #include "portability/instr_time.h" #include "postmaster/bgwriter.h" -#include "storage/bufmgr.h" #include "storage/fd.h" -#include "storage/ipc.h" #include "storage/latch.h" #include "storage/md.h" #include "utils/hsearch.h" -#include "utils/inval.h" #include "utils/memutils.h" /* diff --git a/src/backend/tcop/cmdtag.c b/src/backend/tcop/cmdtag.c index c1c66be730f..68689b3e0d9 100644 --- a/src/backend/tcop/cmdtag.c +++ b/src/backend/tcop/cmdtag.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "miscadmin.h" #include "tcop/cmdtag.h" #include "utils/builtins.h" diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 810b25f4187..6d727ae24fc 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -39,7 +39,6 @@ #include "executor/tstoreReceiver.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" -#include "utils/portal.h" /* ---------------- diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 83b5120d17b..deac71335c2 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -22,8 +22,8 @@ #include "catalog/objectaccess.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" -#include "libpq/libpq.h" #include "libpq/pqformat.h" +#include "libpq/protocol.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "port/pg_bswap.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 8de821f9607..83f86a42f79 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -16,13 +16,10 @@ */ #include "postgres.h" -#include "access/htup_details.h" #include "access/reloptions.h" #include "access/twophase.h" #include "access/xact.h" #include "access/xlog.h" -#include "catalog/catalog.h" -#include "catalog/index.h" #include "catalog/namespace.h" #include "catalog/pg_authid.h" #include "catalog/pg_inherits.h" @@ -63,15 +60,11 @@ #include "parser/parse_utilcmd.h" #include "postmaster/bgwriter.h" #include "rewrite/rewriteDefine.h" -#include "rewrite/rewriteRemove.h" #include "storage/fd.h" -#include "tcop/pquery.h" #include "tcop/utility.h" #include "utils/acl.h" #include "utils/guc.h" #include "utils/lsyscache.h" -#include "utils/rel.h" -#include "utils/syscache.h" /* Hook for plugins to get control in ProcessUtility() */ ProcessUtility_hook_type ProcessUtility_hook = NULL; diff --git a/src/backend/tsearch/dict.c b/src/backend/tsearch/dict.c index 5076287233e..e89f5082139 100644 --- a/src/backend/tsearch/dict.c +++ b/src/backend/tsearch/dict.c @@ -15,7 +15,7 @@ #include "catalog/pg_type.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_utils.h" +#include "tsearch/ts_public.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c index 25b55c214bb..07b9ad794de 100644 --- a/src/backend/tsearch/dict_ispell.c +++ b/src/backend/tsearch/dict_ispell.c @@ -16,8 +16,8 @@ #include "commands/defrem.h" #include "tsearch/dicts/spell.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "tsearch/ts_public.h" +#include "utils/fmgrprotos.h" typedef struct diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index ebe29563855..b0c9fd7946f 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -15,8 +15,8 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "tsearch/ts_public.h" +#include "utils/fmgrprotos.h" typedef struct diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c index 5993ed9e6b7..77cd511ee51 100644 --- a/src/backend/tsearch/dict_synonym.c +++ b/src/backend/tsearch/dict_synonym.c @@ -15,8 +15,8 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "tsearch/ts_public.h" +#include "utils/fmgrprotos.h" typedef struct { diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c index 56851b93bfa..259f2e9901d 100644 --- a/src/backend/tsearch/dict_thesaurus.c +++ b/src/backend/tsearch/dict_thesaurus.c @@ -17,8 +17,8 @@ #include "commands/defrem.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "tsearch/ts_public.h" +#include "utils/fmgrprotos.h" #include "utils/regproc.h" diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index ebf0155c1ac..88cba58cbab 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "common/jsonapi.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c index d715a946e63..bc44599de6a 100644 --- a/src/backend/tsearch/ts_locale.c +++ b/src/backend/tsearch/ts_locale.c @@ -13,11 +13,9 @@ */ #include "postgres.h" -#include "catalog/pg_collation.h" #include "common/string.h" #include "storage/fd.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" static void tsearch_readline_callback(void *arg); diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c index 11656f62964..c549231dc61 100644 --- a/src/backend/tsearch/ts_selfuncs.c +++ b/src/backend/tsearch/ts_selfuncs.c @@ -19,10 +19,9 @@ #include "miscadmin.h" #include "nodes/nodes.h" #include "tsearch/ts_type.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" -#include "utils/syscache.h" /* diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index 3e3a41f2946..81967d29e9a 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -18,7 +18,7 @@ #include "miscadmin.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_utils.h" +#include "tsearch/ts_public.h" /* diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index 2cdf36316d9..bc9fb38426c 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -14,13 +14,11 @@ #include "postgres.h" #include "catalog/namespace.h" -#include "catalog/pg_type.h" #include "commands/defrem.h" -#include "common/jsonapi.h" #include "funcapi.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" +#include "utils/fmgrprotos.h" #include "utils/jsonfuncs.h" #include "utils/varlena.h" diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index 1d67eac5e30..3919ef27b57 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -15,15 +15,16 @@ #include "postgres.h" #include <limits.h> +#include <wctype.h> -#include "catalog/pg_collation.h" #include "commands/defrem.h" +#include "mb/pg_wchar.h" #include "miscadmin.h" -#include "tsearch/ts_locale.h" #include "tsearch/ts_public.h" #include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" +#include "utils/pg_locale.h" /* Define me to enable tracing of parser behavior */ 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" /* |