diff options
Diffstat (limited to 'src/backend')
206 files changed, 16 insertions, 456 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 175e6ea2f2..36b3af8202 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -57,7 +57,6 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/tuptoaster.h" #include "executor/tuptable.h" diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 900b222865..7c63298cb0 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -23,10 +23,8 @@ #include "commands/defrem.h" #include "commands/tablespace.h" #include "nodes/makefuncs.h" -#include "utils/array.h" #include "utils/attoptcache.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index 2de58604ee..3e4b43d475 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -15,7 +15,6 @@ #include "access/gin.h" #include "access/skey.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 739fa8afff..eefbd10e9b 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -16,7 +16,6 @@ #include "access/gin_private.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/rel.h" /* diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 41dbe9fd11..790609801e 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/gin_private.h" -#include "storage/bufmgr.h" #include "utils/rel.h" int diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index fa134f9fc3..d4de91f05a 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/gin_private.h" -#include "storage/bufmgr.h" #include "utils/rel.h" /* diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 60a6d80a18..8ae09c308a 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -19,10 +19,8 @@ #include "postgres.h" #include "access/gin_private.h" -#include "catalog/index.h" #include "commands/vacuum.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index 866785837f..a6504c958d 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -16,9 +16,7 @@ #include "access/gin_private.h" #include "access/relscan.h" -#include "catalog/index.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/datum.h" #include "utils/memutils.h" diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index f8d54b1b46..73f72f288b 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -17,7 +17,6 @@ #include "access/gin_private.h" #include "access/relscan.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index ba142bc874..f18b3699cf 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -19,8 +19,6 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c index 79c54f16b8..e5d61b5a0b 100644 --- a/src/backend/access/gin/ginvacuum.c +++ b/src/backend/access/gin/ginvacuum.c @@ -15,11 +15,9 @@ #include "postgres.h" #include "access/gin_private.h" -#include "catalog/storage.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "postmaster/autovacuum.h" -#include "storage/bufmgr.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c index c954bcb12f..01297c3609 100644 --- a/src/backend/access/gin/ginxlog.c +++ b/src/backend/access/gin/ginxlog.c @@ -15,7 +15,6 @@ #include "access/gin_private.h" #include "access/xlogutils.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" static MemoryContext opCtx; /* working memory for operations */ diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 5d5fd5b738..60116dfd46 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -16,10 +16,8 @@ #include "access/gist_private.h" #include "access/relscan.h" -#include "executor/execdebug.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 5662a3a4aa..97a19aa2ac 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -14,11 +14,9 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/gist_private.h" #include "access/gistscan.h" #include "access/relscan.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 1754a10369..448d8bce05 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -17,11 +17,8 @@ #include "access/gist_private.h" #include "access/reloptions.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" -#include "storage/bufmgr.h" -#include "utils/rel.h" /* * static *S used for temrorary storage (saves stack and palloc() call) diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c index 50c6270b00..d650645864 100644 --- a/src/backend/access/gist/gistvacuum.c +++ b/src/backend/access/gist/gistvacuum.c @@ -16,14 +16,10 @@ #include "access/genam.h" #include "access/gist_private.h" -#include "catalog/storage.h" #include "commands/vacuum.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" -#include "utils/memutils.h" /* diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 02c4ec3a6f..09b1d48992 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -15,10 +15,7 @@ #include "access/gist_private.h" #include "access/xlogutils.h" -#include "miscadmin.h" -#include "storage/bufmgr.h" #include "utils/memutils.h" -#include "utils/rel.h" typedef struct { diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index dd58f16840..54158f4679 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index ae8b2b1cfd..a2a5bb77a8 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -18,7 +18,6 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index fe991cf27b..66d4346976 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -28,13 +28,10 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/hash.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/smgr.h" -#include "utils/lsyscache.h" static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock, diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index bf42be103f..2ce81312e7 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -18,7 +18,6 @@ #include "access/relscan.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "utils/rel.h" diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index aa68be596e..0665150281 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -17,8 +17,6 @@ #include "access/hash.h" #include "access/reloptions.h" #include "access/relscan.h" -#include "executor/execdebug.h" -#include "storage/bufmgr.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 0cfa866108..61f2ce4cde 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -15,12 +15,10 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/htup.h" #include "access/transam.h" #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" -#include "storage/off.h" #include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c index 957d1a12f3..0f11786d11 100644 --- a/src/backend/access/heap/syncscan.c +++ b/src/backend/access/heap/syncscan.c @@ -48,8 +48,6 @@ #include "access/heapam.h" #include "miscadmin.h" -#include "storage/block.h" -#include "storage/relfilenode.h" #include "utils/rel.h" diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index a19352021d..8bed6edc76 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -73,7 +73,6 @@ #include "access/visibilitymap.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/bufpage.h" #include "storage/lmgr.h" #include "storage/smgr.h" diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index fe3aa3c9c1..98832adb8a 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -23,7 +23,6 @@ #include "access/transam.h" #include "catalog/index.h" #include "miscadmin.h" -#include "pgstat.h" #include "storage/bufmgr.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 13e68d644e..230af9bfa3 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -64,13 +64,11 @@ #include "access/relscan.h" #include "access/transam.h" -#include "access/xact.h" #include "catalog/index.h" #include "pgstat.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/tqual.h" diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index d758659c31..872988dd98 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -19,7 +19,6 @@ #include "access/nbtree.h" #include "access/transam.h" #include "miscadmin.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" #include "utils/inval.h" diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 4b1a2e912b..f9b3e1feaf 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -25,8 +25,6 @@ #include "access/nbtree.h" #include "access/transam.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/lmgr.h" #include "storage/predicate.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index ac86eb494f..996611516f 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -18,14 +18,10 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "catalog/index.h" -#include "catalog/storage.h" #include "commands/vacuum.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/indexfsm.h" #include "storage/ipc.h" #include "storage/lmgr.h" diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 5c00fac533..313e574f96 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -15,12 +15,10 @@ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "storage/predicate.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 93a928c66b..77341903fb 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -66,7 +66,6 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/nbtree.h" #include "miscadmin.h" #include "storage/smgr.h" diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 3996203a7e..3ca75b79cc 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -17,15 +17,10 @@ #include <time.h> -#include "access/genam.h" #include "access/nbtree.h" #include "access/reloptions.h" #include "access/relscan.h" -#include "executor/execdebug.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/lwlock.h" -#include "storage/shmem.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 2775ae6d29..e2ed50feac 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -16,10 +16,7 @@ #include "access/nbtree.h" #include "access/transam.h" -#include "access/xact.h" -#include "storage/bufmgr.h" #include "storage/procarray.h" -#include "storage/standby.h" #include "miscadmin.h" /* diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index d3de8934ee..3a6c39164c 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -36,7 +36,6 @@ #include "access/slru.h" #include "access/transam.h" #include "pg_trace.h" -#include "postmaster/bgwriter.h" /* * Defines for CLOG page sizes. A page is the same BLCKSZ as is used diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index bb3afd6000..1d159bc89c 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -56,7 +56,6 @@ #include "access/xact.h" #include "miscadmin.h" #include "pg_trace.h" -#include "storage/backendid.h" #include "storage/lmgr.h" #include "storage/procarray.h" #include "utils/builtins.h" diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c index f8f797c33d..6a0a2d9b47 100644 --- a/src/backend/access/transam/rmgr.c +++ b/src/backend/access/transam/rmgr.c @@ -20,7 +20,6 @@ #include "commands/dbcommands.h" #include "commands/sequence.h" #include "commands/tablespace.h" -#include "storage/freespace.h" #include "storage/standby.h" #include "utils/relmapper.h" diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 69e5245beb..a83962b4f0 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -55,7 +55,6 @@ #include "access/transam.h" #include "access/xlog.h" #include "storage/fd.h" -#include "storage/shmem.h" #include "miscadmin.h" diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c index eeb445da9d..088c837358 100644 --- a/src/backend/access/transam/twophase_rmgr.c +++ b/src/backend/access/transam/twophase_rmgr.c @@ -17,7 +17,6 @@ #include "access/multixact.h" #include "access/twophase_rmgr.h" #include "pgstat.h" -#include "storage/lock.h" #include "storage/predicate.h" diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 555bb134f5..41f261a4b6 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -21,8 +21,6 @@ #include "miscadmin.h" #include "postmaster/autovacuum.h" #include "storage/pmsignal.h" -#include "storage/proc.h" -#include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index e8821f7283..7922f7ac20 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -36,21 +36,14 @@ #include "libpq/be-fsstubs.h" #include "miscadmin.h" #include "pgstat.h" -#include "replication/walsender.h" -#include "replication/syncrep.h" -#include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/predicate.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" -#include "storage/standby.h" #include "utils/combocid.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" #include "pg_trace.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 879123013c..038d593eea 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -20,10 +20,7 @@ #include "access/xlog.h" #include "access/xlogutils.h" #include "catalog/catalog.h" -#include "storage/bufmgr.h" #include "storage/smgr.h" -#include "utils/guc.h" -#include "utils/hsearch.h" #include "utils/rel.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 08ae863f54..ab148404b0 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -21,9 +21,6 @@ #include <getopt.h> #endif -#include "access/genam.h" -#include "access/heapam.h" -#include "access/xact.h" #include "bootstrap/bootstrap.h" #include "catalog/index.h" #include "catalog/pg_collation.h" @@ -36,8 +33,6 @@ #include "replication/walreceiver.h" #include "storage/bufmgr.h" #include "storage/ipc.h" -#include "storage/proc.h" -#include "storage/procsignal.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 0526555ac3..2bce663e51 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -14,14 +14,11 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" @@ -39,7 +36,6 @@ #include "catalog/pg_extension.h" #include "catalog/pg_foreign_data_wrapper.h" #include "catalog/pg_foreign_server.h" -#include "catalog/pg_foreign_table.h" #include "catalog/pg_language.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_namespace.h" @@ -75,7 +71,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 7ec658146f..2aaf77523f 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -29,8 +29,6 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "access/transam.h" #include "access/xact.h" @@ -38,8 +36,6 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaccess.h" #include "catalog/pg_attrdef.h" #include "catalog/pg_collation.h" @@ -61,8 +57,6 @@ #include "parser/parse_collate.h" #include "parser/parse_expr.h" #include "parser/parse_relation.h" -#include "storage/bufmgr.h" -#include "storage/freespace.h" #include "storage/predicate.h" #include "storage/smgr.h" #include "utils/acl.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 75b4c146f5..509a86df69 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -23,8 +23,6 @@ #include <unistd.h> -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/sysattr.h" #include "access/transam.h" @@ -34,8 +32,6 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" #include "catalog/pg_operator.h" @@ -59,11 +55,9 @@ #include "storage/smgr.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/syscache.h" #include "utils/tuplesort.h" #include "utils/snapmgr.h" diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index 351e6f63ac..e2e635e358 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -15,7 +15,6 @@ */ #include "postgres.h" -#include "access/genam.h" #include "catalog/index.h" #include "catalog/indexing.h" #include "executor/executor.h" diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index d42f944cc4..16568976a2 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -21,7 +21,6 @@ #include "access/xact.h" #include "catalog/dependency.h" -#include "catalog/namespace.h" #include "catalog/pg_authid.h" #include "catalog/pg_collation.h" #include "catalog/pg_conversion.h" @@ -42,17 +41,14 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "parser/parse_func.h" -#include "storage/backendid.h" #include "storage/ipc.h" #include "storage/lmgr.h" #include "storage/sinval.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 7f16212c9e..8feb601578 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -15,16 +15,12 @@ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/catalog.h" -#include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/objectaddress.h" #include "catalog/pg_authid.h" #include "catalog/pg_cast.h" -#include "catalog/pg_class.h" #include "catalog/pg_collation.h" #include "catalog/pg_constraint.h" #include "catalog/pg_conversion.h" @@ -68,7 +64,6 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "utils/rel.h" #include "utils/tqual.h" static ObjectAddress get_object_address_unqualified(ObjectType objtype, diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 69979942af..e1cff30f8d 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -23,7 +23,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c index c84dbc6ae4..e480aebe58 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -24,8 +24,6 @@ #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "mb/pg_wchar.h" -#include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/rel.h" diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c index 494704f5d0..8162990c32 100644 --- a/src/backend/catalog/pg_db_role_setting.c +++ b/src/backend/catalog/pg_db_role_setting.c @@ -12,8 +12,6 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/htup.h" -#include "access/skey.h" #include "catalog/indexing.h" #include "catalog/pg_db_role_setting.h" #include "utils/fmgroids.h" diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index 61a9322d90..3665846269 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -24,7 +24,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c index 2ed6f1d07f..ed275d85aa 100644 --- a/src/backend/catalog/pg_inherits.c +++ b/src/backend/catalog/pg_inherits.c @@ -22,7 +22,6 @@ #include "access/genam.h" #include "access/heapam.h" #include "catalog/indexing.h" -#include "catalog/pg_class.h" #include "catalog/pg_inherits.h" #include "catalog/pg_inherits_fn.h" #include "parser/parse_type.h" diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index 6d6c9e9f66..24cc0d47b3 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -17,16 +17,12 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/sysattr.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/pg_authid.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" -#include "catalog/toasting.h" #include "miscadmin.h" #include "utils/acl.h" -#include "utils/bytea.h" #include "utils/fmgroids.h" #include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index f2f0872159..f2b78b66a4 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index a09a3adb20..a938c98190 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -14,13 +14,11 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/tuptoaster.h" #include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index e1be451e35..c321224664 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -33,9 +33,7 @@ #include "commands/typecmds.h" #include "commands/user.h" #include "miscadmin.h" -#include "parser/parse_clause.h" #include "tcop/utility.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index a68da590ce..1d6301bac1 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -16,14 +16,12 @@ #include <math.h> -#include "access/heapam.h" #include "access/transam.h" #include "access/tupconvert.h" #include "access/tuptoaster.h" #include "access/xact.h" #include "catalog/index.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_collation.h" #include "catalog/pg_inherits_fn.h" #include "catalog/pg_namespace.h" @@ -38,12 +36,10 @@ #include "postmaster/autovacuum.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/datum.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 670d29ea83..8200d2095a 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -17,8 +17,6 @@ */ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/rewriteheap.h" #include "access/transam.h" @@ -27,20 +25,15 @@ #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/namespace.h" -#include "catalog/pg_namespace.h" #include "catalog/toasting.h" #include "commands/cluster.h" #include "commands/tablecmds.h" -#include "commands/trigger.h" #include "commands/vacuum.h" #include "miscadmin.h" #include "optimizer/planner.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/predicate.h" -#include "storage/procarray.h" #include "storage/smgr.h" #include "utils/acl.h" #include "utils/fmgroids.h" @@ -48,7 +41,6 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 9e6138b92a..c43f663ad2 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -27,7 +27,6 @@ #include "commands/defrem.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/pg_locale.h" diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 2c1c6da900..cd7ae600ff 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -19,14 +19,12 @@ #include "catalog/indexing.h" #include "catalog/pg_conversion.h" #include "catalog/pg_conversion_fn.h" -#include "catalog/pg_namespace.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" diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 93240efbd7..2c0581481b 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -26,7 +26,6 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/transam.h" #include "access/xact.h" #include "access/xlogutils.h" #include "catalog/catalog.h" @@ -45,18 +44,14 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "storage/bufmgr.h" #include "storage/copydir.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/ipc.h" #include "storage/procarray.h" #include "storage/smgr.h" -#include "storage/standby.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/pg_locale.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c index 85a2ef8582..fae726a987 100644 --- a/src/backend/commands/discard.c +++ b/src/backend/commands/discard.c @@ -18,8 +18,6 @@ #include "commands/async.h" #include "commands/discard.h" #include "commands/prepare.h" -#include "commands/variable.h" -#include "utils/plancache.h" #include "utils/portal.h" static void DiscardAll(bool isTopLevel); diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index fee829f960..6408d1653b 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -14,23 +14,17 @@ #include "postgres.h" #include "access/xact.h" -#include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "commands/defrem.h" -#include "commands/explain.h" #include "commands/prepare.h" -#include "commands/trigger.h" #include "executor/hashjoin.h" #include "executor/instrument.h" #include "foreign/fdwapi.h" #include "optimizer/clauses.h" -#include "optimizer/planner.h" -#include "optimizer/var.h" #include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index d591bf00f9..9ffce8529b 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -41,16 +41,12 @@ #include "commands/comment.h" #include "commands/extension.h" #include "commands/schemacmds.h" -#include "commands/trigger.h" -#include "executor/executor.h" #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 3a3c131366..d9c27d187a 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -16,7 +16,6 @@ #include "access/heapam.h" #include "access/xact.h" #include "access/reloptions.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 92abd44a60..bee4313a52 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -58,7 +58,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 77648b4774..80925d58a4 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -15,13 +15,9 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/reloptions.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/catalog.h" -#include "catalog/heap.h" #include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/pg_opclass.h" @@ -29,7 +25,6 @@ #include "catalog/pg_tablespace.h" #include "commands/dbcommands.h" #include "commands/defrem.h" -#include "commands/tablecmds.h" #include "commands/tablespace.h" #include "mb/pg_wchar.h" #include "miscadmin.h" @@ -39,9 +34,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" -#include "parser/parsetree.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/builtins.h" @@ -49,7 +42,6 @@ #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 2bb0d4c3b5..3dbc932926 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -37,7 +37,6 @@ #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 c99de4b240..c5c18ee4fc 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -37,9 +37,7 @@ #include "access/heapam.h" #include "catalog/dependency.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_operator.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_type.h" #include "commands/alter.h" #include "commands/defrem.h" @@ -47,7 +45,6 @@ #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" -#include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index dfa2ab0026..6cf6da3f21 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -28,10 +28,8 @@ #include "parser/parse_type.h" #include "rewrite/rewriteHandler.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/builtins.h" -#include "utils/memutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 5dd5763a7b..9d1d6535fd 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -28,7 +27,6 @@ #include "tcop/utility.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/seclabel.c b/src/backend/commands/seclabel.c index 0041734b62..e0fd7acb87 100644 --- a/src/backend/commands/seclabel.c +++ b/src/backend/commands/seclabel.c @@ -14,18 +14,14 @@ #include "access/heapam.h" #include "catalog/catalog.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_seclabel.h" #include "catalog/pg_shseclabel.h" #include "commands/seclabel.h" #include "miscadmin.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/syscache.h" #include "utils/tqual.h" typedef struct diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index de6e2a3e33..c23a39f758 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -14,9 +14,7 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/transam.h" -#include "access/xact.h" #include "access/xlogutils.h" #include "catalog/dependency.h" #include "catalog/namespace.h" @@ -27,9 +25,7 @@ #include "funcapi.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/smgr.h" #include "utils/acl.h" #include "utils/builtins.h" diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 09ecabb772..c8c9337b56 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -54,7 +54,6 @@ #include "access/heapam.h" #include "access/reloptions.h" #include "access/sysattr.h" -#include "access/transam.h" #include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" @@ -62,22 +61,17 @@ #include "catalog/objectaccess.h" #include "catalog/pg_tablespace.h" #include "commands/comment.h" -#include "commands/defrem.h" #include "commands/seclabel.h" #include "commands/tablespace.h" #include "miscadmin.h" #include "postmaster/bgwriter.h" #include "storage/fd.h" -#include "storage/procarray.h" #include "storage/standby.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/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index deac1062ef..16e6940d13 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -22,7 +22,6 @@ #include "access/xact.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_proc.h" @@ -38,11 +37,8 @@ #include "nodes/makefuncs.h" #include "parser/parse_func.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/acl.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 0367b200fe..10f4487747 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -32,7 +32,6 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 7fe787ecb7..005d72997b 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -37,11 +37,9 @@ #include "postmaster/autovacuum.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index 17098efa67..cc046f7f30 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -20,10 +20,8 @@ #include "executor/executor.h" #include "miscadmin.h" -#include "parser/parse_oper.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/syscache.h" static TupleHashTable CurTupleHashTable = NULL; diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 63e3d92772..4dbf10b8da 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -42,8 +42,6 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/transam.h" #include "catalog/index.h" @@ -52,7 +50,6 @@ #include "parser/parsetree.h" #include "storage/lmgr.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/tqual.h" diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 13946cab23..398bc40c49 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -17,7 +17,6 @@ #include "access/xact.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "commands/trigger.h" #include "executor/functions.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index c9b540e079..8e50fb1aae 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -35,7 +35,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/relscan.h" #include "access/transam.h" #include "executor/execdebug.h" diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 4de54ea55f..9a56fd4b9f 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -21,7 +21,6 @@ */ #include "postgres.h" -#include "access/genam.h" #include "executor/execdebug.h" #include "executor/instrument.h" #include "executor/nodeBitmapIndexscan.h" diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index dedd255010..5d5727e3ee 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -25,7 +25,6 @@ #include "executor/nodeFunctionscan.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" -#include "utils/builtins.h" static TupleTableSlot *FunctionNext(FunctionScanState *node); diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 1af98c81a6..2ade2d7fad 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -32,7 +32,6 @@ #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" #include "miscadmin.h" -#include "parser/parse_expr.h" #include "utils/dynahash.h" #include "utils/memutils.h" #include "utils/lsyscache.h" diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 263f3b946b..9a74a8135d 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -24,13 +24,11 @@ */ #include "postgres.h" -#include "access/genam.h" #include "access/nbtree.h" #include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeIndexscan.h" #include "optimizer/clauses.h" -#include "utils/array.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index fa0ecc8176..43059664b9 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -42,7 +42,6 @@ #include "executor/execdebug.h" #include "executor/nodeMergeAppend.h" #include "utils/lsyscache.h" -#include "utils/rel.h" /* * It gets quite confusing having a heap array (indexed by integers) which diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 7d27123cf0..e23dd6c9f5 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -93,14 +93,12 @@ #include "postgres.h" #include "access/nbtree.h" -#include "catalog/pg_amop.h" #include "executor/execdebug.h" #include "executor/nodeMergejoin.h" #include "miscadmin.h" #include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/syscache.h" /* diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index e2cea0eecb..5b652c92f0 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -24,7 +24,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeSeqscan.h" diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 0e12bb5afb..b0fb70488e 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -24,7 +24,6 @@ #include "executor/nodeSubplan.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" -#include "utils/array.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 28244a1a3d..a54bb9dba3 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -24,14 +24,12 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/pg_type.h" #include "executor/execdebug.h" #include "executor/nodeTidscan.h" #include "optimizer/clauses.h" #include "storage/bufmgr.h" -#include "utils/array.h" #include "utils/rel.h" diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 766407388f..d5260e40b3 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -25,7 +25,6 @@ #include "executor/executor.h" #include "executor/nodeValuesscan.h" -#include "utils/memutils.h" static TupleTableSlot *ValuesNext(ValuesScanState *node); diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c index 4a7b2c30cf..67a4597c38 100644 --- a/src/backend/foreign/foreign.c +++ b/src/backend/foreign/foreign.c @@ -13,22 +13,14 @@ #include "postgres.h" #include "access/reloptions.h" -#include "catalog/namespace.h" #include "catalog/pg_foreign_data_wrapper.h" #include "catalog/pg_foreign_server.h" #include "catalog/pg_foreign_table.h" -#include "catalog/pg_type.h" #include "catalog/pg_user_mapping.h" #include "foreign/fdwapi.h" #include "foreign/foreign.h" -#include "funcapi.h" #include "miscadmin.h" -#include "nodes/parsenodes.h" -#include "utils/acl.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" -#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 155385f0b9..f2a2d2d3a9 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -42,7 +42,6 @@ #include <sys/stat.h> #include <unistd.h> -#include "catalog/pg_largeobject_metadata.h" #include "libpq/be-fsstubs.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c index 5546034694..e1e9a35b42 100644 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@ -20,7 +20,6 @@ */ #include "postgres.h" -#include "nodes/bitmapset.h" #include "access/hash.h" diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 108baa6144..afc1c61876 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -24,8 +24,6 @@ #include "miscadmin.h" #include "foreign/fdwapi.h" -#include "nodes/plannodes.h" -#include "nodes/relation.h" #include "utils/datum.h" diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 627a8f51ee..93ab08a7d7 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -23,10 +23,7 @@ #include <ctype.h> -#include "lib/stringinfo.h" #include "foreign/fdwapi.h" -#include "nodes/plannodes.h" -#include "nodes/relation.h" #include "utils/datum.h" diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c index 62d766a282..047d27c8be 100644 --- a/src/backend/nodes/params.c +++ b/src/backend/nodes/params.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "nodes/params.h" -#include "parser/parse_param.h" #include "utils/datum.h" #include "utils/lsyscache.h" diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index e22824a7dc..0b0cf38482 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -20,12 +20,10 @@ #include "postgres.h" #include "access/printtup.h" -#include "lib/stringinfo.h" #include "nodes/print.h" #include "optimizer/clauses.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" -#include "utils/rel.h" /* diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c index 6f806fda85..2363ec22a4 100644 --- a/src/backend/nodes/tidbitmap.c +++ b/src/backend/nodes/tidbitmap.c @@ -43,7 +43,6 @@ #include "access/htup.h" #include "nodes/bitmapset.h" #include "nodes/tidbitmap.h" -#include "storage/bufpage.h" #include "utils/hsearch.h" /* diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index ca068991c1..eb9b29311d 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -20,7 +20,6 @@ #include "optimizer/cost.h" #include "optimizer/pathnode.h" #include "optimizer/plancat.h" -#include "parser/parsetree.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index acc4fb1a18..4a52ecfa73 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -21,7 +21,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" #include "optimizer/prep.h" diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 9cfc56ea54..5b170b399c 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -14,11 +14,9 @@ */ #include "postgres.h" -#include "catalog/pg_operator.h" #include "catalog/pg_type.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" #include "optimizer/joininfo.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" @@ -27,11 +25,7 @@ #include "optimizer/prep.h" #include "optimizer/restrictinfo.h" #include "optimizer/var.h" -#include "parser/parse_expr.h" -#include "parser/parse_oper.h" -#include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" /* These parameters are set by GUC */ diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 7230fb4326..484d44108e 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -17,7 +17,6 @@ #include <limits.h> -#include "catalog/pg_operator.h" #include "executor/executor.h" #include "executor/nodeAgg.h" #include "miscadmin.h" @@ -32,17 +31,12 @@ #include "optimizer/prep.h" #include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #ifdef OPTIMIZER_DEBUG #include "nodes/print.h" #endif #include "parser/analyze.h" -#include "parser/parse_expr.h" -#include "parser/parse_oper.h" #include "parser/parsetree.h" -#include "utils/lsyscache.h" #include "utils/rel.h" -#include "utils/syscache.h" /* GUC parameter */ diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index c3a5aac2fa..8508d25316 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -20,10 +20,8 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/clauses.h" #include "optimizer/planmain.h" #include "optimizer/tlist.h" -#include "parser/parsetree.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 71ffc17b59..4d4e6bf78e 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -27,7 +27,6 @@ #include "optimizer/subselect.h" #include "optimizer/var.h" #include "parser/parse_relation.h" -#include "parser/parsetree.h" #include "rewrite/rewriteManip.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index 63a52f2d97..aeaae8c8d8 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -31,7 +31,6 @@ #include "optimizer/prep.h" #include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parse_relation.h" #include "parser/parsetree.h" #include "rewrite/rewriteManip.h" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index fa2514d2a4..077ac49631 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -29,9 +29,7 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "optimizer/prep.h" -#include "optimizer/subselect.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parsetree.h" #include "parser/parse_coerce.h" #include "utils/rel.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index f82ab27b9a..31b101b7a1 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -31,7 +31,6 @@ #include "access/heapam.h" #include "access/sysattr.h" -#include "catalog/namespace.h" #include "catalog/pg_inherits_fn.h" #include "catalog/pg_type.h" #include "miscadmin.h" @@ -39,12 +38,10 @@ #include "nodes/nodeFuncs.h" #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_clause.h" #include "parser/parse_coerce.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 161d5ab122..4a1c94affb 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -16,7 +16,6 @@ #include <math.h> -#include "catalog/pg_operator.h" #include "foreign/fdwapi.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" @@ -25,12 +24,9 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" -#include "parser/parse_expr.h" #include "parser/parsetree.h" #include "utils/selfuncs.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" static List *translate_sub_tlist(List *tlist, int relid); diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 6259170b0e..8a3a5d85e2 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -24,7 +24,6 @@ #include "catalog/catalog.h" #include "miscadmin.h" #include "nodes/makefuncs.h" -#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/plancat.h" diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c index cb10a31b07..304ca407ed 100644 --- a/src/backend/optimizer/util/predtest.c +++ b/src/backend/optimizer/util/predtest.c @@ -15,17 +15,13 @@ */ #include "postgres.h" -#include "catalog/pg_am.h" -#include "catalog/pg_amop.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/executor.h" #include "miscadmin.h" -#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/planmain.h" #include "optimizer/predtest.h" -#include "utils/array.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index b7a5845bb1..b59eb090aa 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -19,8 +19,6 @@ #include "optimizer/paths.h" #include "optimizer/placeholder.h" #include "optimizer/plancat.h" -#include "optimizer/restrictinfo.h" -#include "parser/parsetree.h" #include "utils/hsearch.h" diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c index 93f9aa846a..63ff431900 100644 --- a/src/backend/optimizer/util/restrictinfo.c +++ b/src/backend/optimizer/util/restrictinfo.c @@ -15,8 +15,6 @@ #include "postgres.h" #include "optimizer/clauses.h" -#include "optimizer/cost.h" -#include "optimizer/paths.h" #include "optimizer/predtest.h" #include "optimizer/restrictinfo.h" #include "optimizer/var.h" diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 718057a773..552540a73d 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -17,7 +17,6 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" /***************************************************************************** diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 8356133796..ed720ddfd9 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -18,13 +18,11 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/parse_agg.h" #include "parser/parse_clause.h" #include "parser/parsetree.h" #include "rewrite/rewriteManip.h" #include "utils/builtins.h" -#include "utils/lsyscache.h" typedef struct diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index a8549e0c2a..978417d6ca 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -23,7 +23,6 @@ #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/tlist.h" -#include "optimizer/var.h" #include "parser/analyze.h" #include "parser/parsetree.h" #include "parser/parse_clause.h" @@ -34,7 +33,6 @@ #include "parser/parse_relation.h" #include "parser/parse_target.h" #include "rewrite/rewriteManip.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/rel.h" diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index f26c69abdd..127818abde 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -22,11 +22,9 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "parser/parse_coerce.h" -#include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_type.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 7b5c040cb4..494ef5fb4b 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -24,7 +24,6 @@ #include "parser/parse_expr.h" #include "parser/parse_relation.h" #include "utils/builtins.h" -#include "utils/int8.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/varbit.h" diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index d4cd1efa64..73a91ea508 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -24,7 +24,6 @@ #include "parser/parse_oper.h" #include "parser/parse_type.h" #include "utils/builtins.h" -#include "utils/hsearch.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 3840c2f3ed..9ac28c916c 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -16,7 +16,6 @@ #include <ctype.h> -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/heap.h" #include "catalog/namespace.h" diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 21b54f7f15..a2a54db6ea 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -26,8 +26,6 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" #include "access/reloptions.h" #include "catalog/dependency.h" #include "catalog/heap.h" @@ -55,7 +53,6 @@ #include "parser/parse_utilcmd.h" #include "parser/parser.h" #include "rewrite/rewriteManip.h" -#include "storage/lock.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index a6ff723e7b..e9a481883b 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -16,7 +16,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 12daffa851..f7ecb0a8eb 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -13,7 +13,7 @@ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ #ifdef HAVE_DLOPEN diff --git a/src/backend/port/dynloader/cygwin.h b/src/backend/port/dynloader/cygwin.h index 67ae4b0ab5..5f47d1f8a8 100644 --- a/src/backend/port/dynloader/cygwin.h +++ b/src/backend/port/dynloader/cygwin.h @@ -13,7 +13,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index 5c1e3b39a8..d7f887392e 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -13,7 +13,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on DG/UX. diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index c10ffe6cbf..6b621cb2fb 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.h @@ -18,7 +18,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/irix.h b/src/backend/port/dynloader/irix.h index ae9377df64..035f75cba2 100644 --- a/src/backend/port/dynloader/irix.h +++ b/src/backend/port/dynloader/irix.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SunOS 4. diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 2e1330cd3f..99667e4954 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -14,7 +14,7 @@ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ #ifdef HAVE_DLOPEN #include <dlfcn.h> #endif diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 71d9260a7c..9c65146bab 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.h @@ -19,7 +19,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index 55fc106292..d20c0b3e45 100644 --- a/src/backend/port/dynloader/openbsd.h +++ b/src/backend/port/dynloader/openbsd.h @@ -18,7 +18,7 @@ #include <link.h> #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on NetBSD 1.0. diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index f211ebf43c..e6b8f03097 100644 --- a/src/backend/port/dynloader/osf.h +++ b/src/backend/port/dynloader/osf.h @@ -16,7 +16,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Alpha OSF/1.x diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index 2774e9efde..6bffc3552b 100644 --- a/src/backend/port/dynloader/sco.h +++ b/src/backend/port/dynloader/sco.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SCO 3.2v5.0.2 diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index 75c1255f8a..99ab13e97f 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * In some older systems, the RTLD_NOW flag isn't defined and the mode diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index c65ad43dd5..f5a043bd9c 100644 --- a/src/backend/port/dynloader/sunos4.h +++ b/src/backend/port/dynloader/sunos4.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on SunOS 4. diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index 2f34fed678..790fde1abc 100644 --- a/src/backend/port/dynloader/svr4.h +++ b/src/backend/port/dynloader/svr4.h @@ -15,7 +15,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 68e5c40e1a..359e2ed87a 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -18,7 +18,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index b046968afa..f8fb105c10 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -18,7 +18,7 @@ #define PORT_PROTOS_H #include <dlfcn.h> -#include "utils/dynamic_loader.h" +#include "utils/dynamic_loader.h" /* pgrminclude ignore */ /* * Dynamic Loader on Intel x86/Intel SVR4. diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 14e592d7bc..7443d80771 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -50,22 +50,14 @@ #include <unistd.h> #include "access/xlog_internal.h" -#include "catalog/pg_control.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "replication/syncrep.h" #include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.h" #include "storage/pmsignal.h" -#include "storage/shmem.h" #include "storage/smgr.h" -#include "storage/spin.h" -#include "tcop/tcopprot.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c index 141167786d..a516199484 100644 --- a/src/backend/postmaster/walwriter.c +++ b/src/backend/postmaster/walwriter.c @@ -50,13 +50,9 @@ #include "miscadmin.h" #include "postmaster/walwriter.h" #include "storage/bufmgr.h" -#include "storage/fd.h" #include "storage/ipc.h" -#include "storage/lwlock.h" #include "storage/pmsignal.h" #include "storage/smgr.h" -#include "utils/guc.h" -#include "utils/hsearch.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 56deeeb7a1..65e0a59d08 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -46,20 +46,10 @@ #include <unistd.h> #include "access/xact.h" -#include "access/xlog_internal.h" #include "miscadmin.h" -#include "postmaster/autovacuum.h" -#include "replication/syncrep.h" -#include "replication/walsender.h" -#include "storage/latch.h" -#include "storage/ipc.h" #include "storage/pmsignal.h" -#include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/guc.h" -#include "utils/guc_tables.h" -#include "utils/memutils.h" #include "utils/ps_status.h" /* User-settable parameters for sync rep */ diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index b4ece49a10..f4c6cc3672 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -38,19 +38,14 @@ #include <signal.h> #include <unistd.h> -#include "access/transam.h" #include "access/xlog_internal.h" #include "libpq/pqsignal.h" #include "miscadmin.h" #include "replication/walprotocol.h" #include "replication/walreceiver.h" -#include "replication/walsender.h" #include "storage/ipc.h" #include "storage/pmsignal.h" #include "storage/procarray.h" -#include "utils/builtins.h" -#include "utils/guc.h" -#include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/resowner.h" diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index 587949bfdb..fe009b5332 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -25,10 +25,7 @@ #include "access/xlog_internal.h" #include "replication/walreceiver.h" -#include "storage/fd.h" #include "storage/pmsignal.h" -#include "storage/shmem.h" -#include "utils/guc.h" WalRcvData *WalRcv = NULL; diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 84b5037bb3..3b31108775 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "access/sysattr.h" #include "catalog/pg_type.h" #include "commands/trigger.h" diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index cec22ac6a8..917bb46493 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -27,7 +27,6 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" -#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 4d6f508e0b..a0b43006af 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -16,7 +16,6 @@ #include "access/heapam.h" #include "catalog/indexing.h" -#include "catalog/pg_class.h" #include "catalog/pg_rewrite.h" #include "rewrite/rewriteSupport.h" #include "utils/fmgroids.h" diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index c59ad1cb65..88843b1c27 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -13,11 +13,8 @@ #include "postgres.h" #include "commands/defrem.h" -#include "fmgr.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" /* Some platforms define MAXINT and/or MININT, causing conflicts */ #ifdef MAXINT diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 8816a5dfab..6acb6eb0e2 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -19,7 +19,6 @@ #include "executor/instrument.h" #include "storage/buf_internals.h" #include "storage/bufmgr.h" -#include "storage/smgr.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 1a5a874c86..931b881496 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -26,14 +26,10 @@ #include "access/htup.h" #include "access/xlogutils.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/bufpage.h" #include "storage/freespace.h" #include "storage/fsm_internals.h" #include "storage/lmgr.h" -#include "storage/lwlock.h" #include "storage/smgr.h" -#include "utils/rel.h" /* diff --git a/src/backend/storage/freespace/indexfsm.c b/src/backend/storage/freespace/indexfsm.c index 0994e61bbb..fa8f49e881 100644 --- a/src/backend/storage/freespace/indexfsm.c +++ b/src/backend/storage/freespace/indexfsm.c @@ -24,7 +24,6 @@ #include "storage/freespace.h" #include "storage/indexfsm.h" -#include "storage/smgr.h" /* * Exported routines diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index e7593fa2eb..ba0cfde28a 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -52,8 +52,6 @@ #include "access/twophase.h" #include "miscadmin.h" #include "storage/procarray.h" -#include "storage/spin.h" -#include "storage/standby.h" #include "utils/builtins.h" #include "utils/snapmgr.h" diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c index 28bcaa7e1e..c8a9e86727 100644 --- a/src/backend/storage/ipc/procsignal.c +++ b/src/backend/storage/ipc/procsignal.c @@ -21,11 +21,7 @@ #include "commands/async.h" #include "miscadmin.h" #include "storage/ipc.h" -#include "storage/latch.h" -#include "storage/procsignal.h" -#include "storage/shmem.h" #include "storage/sinval.h" -#include "storage/standby.h" #include "tcop/tcopprot.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index e0441f5bf1..fed6d2e9fa 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -35,21 +35,17 @@ #include "access/sysattr.h" #include "access/tuptoaster.h" #include "access/xact.h" -#include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" #include "catalog/pg_largeobject.h" #include "catalog/pg_largeobject_metadata.h" -#include "commands/comment.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" #include "storage/large_object.h" #include "utils/fmgroids.h" #include "utils/rel.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" -#include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 8fae67ebbb..2fe610532c 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -29,8 +29,6 @@ #include "pg_trace.h" #include "storage/ipc.h" #include "storage/predicate.h" -#include "storage/proc.h" -#include "storage/spin.h" /* We use the ShmemLock spinlock to protect LWLockAssign */ diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 6bd3812710..018f9c102d 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/htup.h" -#include "storage/bufpage.h" /* ---------------------------------------------------------------- diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index be89ee6d91..5f1497d5f4 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -17,13 +17,10 @@ */ #include "postgres.h" -#include "access/xlogutils.h" -#include "catalog/catalog.h" #include "commands/tablespace.h" #include "storage/bufmgr.h" #include "storage/ipc.h" #include "storage/smgr.h" -#include "utils/hsearch.h" #include "utils/inval.h" diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index b7649c68fc..466727b7b8 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -17,12 +17,10 @@ #include "access/xact.h" #include "commands/prepare.h" -#include "commands/trigger.h" #include "executor/tstoreReceiver.h" #include "miscadmin.h" #include "pg_trace.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/memutils.h" #include "utils/snapmgr.h" diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c index 31929c00ac..dd22e3aa4b 100644 --- a/src/backend/tsearch/dict_ispell.c +++ b/src/backend/tsearch/dict_ispell.c @@ -16,9 +16,7 @@ #include "commands/defrem.h" #include "tsearch/dicts/spell.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index 24e9732cde..d6fac0e121 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -15,9 +15,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c index d2298b3738..0788b3da84 100644 --- a/src/backend/tsearch/dict_synonym.c +++ b/src/backend/tsearch/dict_synonym.c @@ -15,9 +15,7 @@ #include "commands/defrem.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" typedef struct { diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c index 7ff28b80b3..509420f70d 100644 --- a/src/backend/tsearch/dict_thesaurus.c +++ b/src/backend/tsearch/dict_thesaurus.c @@ -17,7 +17,6 @@ #include "commands/defrem.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 5284c9c714..d143aaebfa 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -13,11 +13,9 @@ */ #include "postgres.h" -#include "catalog/namespace.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/syscache.h" Datum diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index 5c2962c011..ddd08c7999 100644 --- a/src/backend/tsearch/ts_parse.c +++ b/src/backend/tsearch/ts_parse.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #define IGNORE_LONGLEXEME 1 diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c index 2654d64457..1ca5cf0cb1 100644 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@ -18,7 +18,6 @@ #include "commands/vacuum.h" #include "tsearch/ts_type.h" #include "utils/builtins.h" -#include "utils/hsearch.h" /* A hash key for lexemes */ diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index abf53c0019..c728ee2d2a 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -18,9 +18,7 @@ #include "miscadmin.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" -#include "utils/builtins.h" /* diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index bda8d2632d..f81d42eaf0 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -14,20 +14,12 @@ #include "postgres.h" #include "funcapi.h" -#include "access/genam.h" -#include "access/skey.h" -#include "catalog/indexing.h" #include "catalog/namespace.h" -#include "catalog/pg_ts_parser.h" #include "catalog/pg_type.h" #include "commands/defrem.h" #include "tsearch/ts_cache.h" -#include "tsearch/ts_public.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" -#include "utils/rel.h" -#include "utils/syscache.h" /******sql-level interface******/ diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 3e43e951e1..8705725580 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -18,8 +18,6 @@ #include "funcapi.h" #include "libpq/pqformat.h" -#include "parser/parse_coerce.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/datum.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c index c178fd0bdd..674229a84e 100644 --- a/src/backend/utils/adt/domains.c +++ b/src/backend/utils/adt/domains.c @@ -33,7 +33,6 @@ #include "commands/typecmds.h" #include "executor/executor.h" -#include "lib/stringinfo.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 8f65c84d30..f9ab358129 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -17,9 +17,7 @@ #include "access/heapam.h" #include "catalog/indexing.h" #include "catalog/pg_enum.h" -#include "fmgr.h" #include "libpq/pqformat.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 6b3f77fec1..dfe38f555f 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -28,7 +28,6 @@ #include "storage/fd.h" #include "utils/builtins.h" #include "utils/memutils.h" -#include "utils/timestamp.h" typedef struct { diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index 1d32d2f04f..0ef217b110 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -30,7 +30,6 @@ static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 m #include <assert.h> #include <ctype.h> -#include "utils/builtins.h" #include "utils/inet.h" diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index a367421f82..fadcf7ace0 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -34,7 +34,6 @@ #include "catalog/pg_type.h" #include "funcapi.h" #include "libpq/pqformat.h" -#include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 0d9f482f33..0d21f9299e 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -16,7 +16,6 @@ #include "funcapi.h" #include "miscadmin.h" #include "storage/predicate_internals.h" -#include "storage/proc.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 5bda4af50f..5a77340bdb 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -19,7 +19,6 @@ #include <dirent.h> #include <math.h> -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/pg_type.h" #include "catalog/pg_tablespace.h" diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 0dbbd6715c..61362c97e1 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -33,7 +33,6 @@ #include "funcapi.h" #include "regex/regex.h" #include "utils/builtins.h" -#include "utils/guc.h" #define PG_GETARG_TEXT_PP_IF_EXISTS(_n) \ (PG_NARGS() > (_n) ? PG_GETARG_TEXT_PP(_n) : NULL) diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 4b85b9b402..bf9b2bc5f0 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -42,10 +42,8 @@ #include "parser/parse_coerce.h" #include "parser/parse_relation.h" #include "miscadmin.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" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 3fd99e00e3..f25c50f9a4 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -18,7 +18,6 @@ #include <unistd.h> #include <fcntl.h> -#include "access/genam.h" #include "access/sysattr.h" #include "catalog/dependency.h" #include "catalog/indexing.h" @@ -48,7 +47,6 @@ #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" #include "rewrite/rewriteSupport.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c index 474878de7d..c2b4a927ef 100644 --- a/src/backend/utils/adt/trigfuncs.c +++ b/src/backend/utils/adt/trigfuncs.c @@ -13,7 +13,6 @@ */ #include "postgres.h" -#include "access/htup.h" #include "commands/trigger.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index 2189a1a20e..1ac2b17237 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -16,9 +16,7 @@ #include "access/gist.h" #include "access/tuptoaster.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" -#include "utils/pg_crc.h" #define SIGLENINT 31 /* >121 => key will toast, so it will not work diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 5baa02b1c0..a60989abd3 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -17,11 +17,9 @@ #include "libpq/pqformat.h" #include "miscadmin.h" #include "tsearch/ts_locale.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" #include "utils/memutils.h" -#include "utils/pg_crc.h" struct TSQueryParserStateData diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 9feb4b796a..3e0b99afeb 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -15,7 +15,6 @@ #include "postgres.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 2ecb13e3b9..bef86036dc 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -16,7 +16,6 @@ #include "access/skey.h" #include "access/gist.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.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 4cf628772c..59d9d20b7e 100644 --- a/src/backend/utils/adt/tsquery_op.c +++ b/src/backend/utils/adt/tsquery_op.c @@ -14,10 +14,7 @@ #include "postgres.h" -#include "tsearch/ts_type.h" -#include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" -#include "utils/pg_crc.h" Datum tsquery_numnode(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index e2faed26d3..974ce6a019 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -17,7 +17,6 @@ #include "catalog/pg_type.h" #include "executor/spi.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/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index 53093f1e86..003b83e770 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -14,7 +14,6 @@ #include "postgres.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 8f5941c147..564d855817 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -15,7 +15,6 @@ #include <math.h> -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/array.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 6810615a25..cb9a87d03e 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "libpq/pqformat.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index be7978561f..285a484aa4 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -21,7 +21,6 @@ #include "funcapi.h" #include "mb/pg_wchar.h" #include "miscadmin.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c index 65eec00563..20349a63d9 100644 --- a/src/backend/utils/adt/tsvector_parser.c +++ b/src/backend/utils/adt/tsvector_parser.c @@ -14,11 +14,8 @@ #include "postgres.h" -#include "libpq/pqformat.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_utils.h" -#include "utils/memutils.h" /* diff --git a/src/backend/utils/cache/attoptcache.c b/src/backend/utils/cache/attoptcache.c index ba39aa8ee7..179e6a6cc3 100644 --- a/src/backend/utils/cache/attoptcache.c +++ b/src/backend/utils/cache/attoptcache.c @@ -17,12 +17,9 @@ #include "postgres.h" #include "access/reloptions.h" -#include "catalog/pg_attribute.h" #include "utils/attoptcache.h" -#include "utils/catcache.h" #include "utils/hsearch.h" #include "utils/inval.h" -#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 8792ec4084..337fe64e10 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -86,10 +86,8 @@ */ #include "postgres.h" -#include "access/twophase_rmgr.h" #include "access/xact.h" #include "catalog/catalog.h" -#include "catalog/pg_tablespace.h" #include "miscadmin.h" #include "storage/sinval.h" #include "storage/smgr.h" diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index 1410dec1e9..68b6783e19 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -41,7 +41,6 @@ */ #include "postgres.h" -#include "utils/plancache.h" #include "access/transam.h" #include "catalog/namespace.h" #include "executor/executor.h" @@ -52,11 +51,9 @@ #include "parser/parsetree.h" #include "storage/lmgr.h" #include "tcop/pquery.h" -#include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index d969510cab..6101ef8071 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -30,7 +30,6 @@ #include <fcntl.h> #include <unistd.h> -#include "access/genam.h" #include "access/reloptions.h" #include "access/sysattr.h" #include "access/transam.h" @@ -61,16 +60,13 @@ #include "optimizer/prep.h" #include "optimizer/var.h" #include "rewrite/rewriteDefine.h" -#include "storage/fd.h" #include "storage/lmgr.h" #include "storage/smgr.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/relcache.h" #include "utils/relmapper.h" #include "utils/resowner.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index b04dc9e349..9337181f68 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -49,9 +49,7 @@ #include "catalog/storage.h" #include "miscadmin.h" #include "storage/fd.h" -#include "storage/lwlock.h" #include "utils/inval.h" -#include "utils/pg_crc.h" #include "utils/relmapper.h" diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c index b505f21924..54d8d6f808 100644 --- a/src/backend/utils/cache/spccache.c +++ b/src/backend/utils/cache/spccache.c @@ -23,8 +23,6 @@ #include "commands/tablespace.h" #include "miscadmin.h" #include "optimizer/cost.h" -#include "utils/catcache.h" -#include "utils/hsearch.h" #include "utils/inval.h" #include "utils/spccache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c index cffa238438..be29a910ea 100644 --- a/src/backend/utils/cache/ts_cache.c +++ b/src/backend/utils/cache/ts_cache.c @@ -36,11 +36,8 @@ #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/defrem.h" -#include "miscadmin.h" #include "tsearch/ts_cache.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/inval.h" diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index b16ed6a208..924ee57302 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -60,7 +60,6 @@ #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "utils/tqual.h" #include "utils/typcache.h" diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 02ee92b715..3861f402c3 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -13,14 +13,12 @@ */ #include "postgres.h" -#include "access/heapam.h" #include "catalog/namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/nodeFuncs.h" #include "parser/parse_coerce.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index d9027291ee..dad7994923 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -64,8 +64,6 @@ #include "postgres.h" #include "access/xact.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "utils/dynahash.h" #include "utils/memutils.h" diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index 7406d266db..898475514a 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -22,7 +22,6 @@ #include "postgres.h" #include "access/hash.h" -#include "nodes/bitmapset.h" /* diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index e5461e660e..773a0d82ef 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -21,12 +21,9 @@ #include "postgres.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "storage/predicate.h" -#include "storage/proc.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index dcfb8f957a..3505236e5d 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -100,11 +100,8 @@ #include <limits.h> -#include "access/genam.h" #include "access/nbtree.h" #include "catalog/index.h" -#include "catalog/pg_amop.h" -#include "catalog/pg_operator.h" #include "commands/tablespace.h" #include "executor/executor.h" #include "miscadmin.h" @@ -115,7 +112,6 @@ #include "utils/memutils.h" #include "utils/pg_rusage.h" #include "utils/rel.h" -#include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index 4d6e3aa0e4..b28532be57 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -59,7 +59,6 @@ #include "storage/buffile.h" #include "utils/memutils.h" #include "utils/resowner.h" -#include "utils/tuplestore.h" /* diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c index d9b37b2ba3..28c8a17220 100644 --- a/src/backend/utils/time/combocid.c +++ b/src/backend/utils/time/combocid.c @@ -41,10 +41,8 @@ #include "postgres.h" -#include "access/htup.h" #include "access/xact.h" #include "utils/combocid.h" -#include "utils/hsearch.h" #include "utils/memutils.h" diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index ef66466baf..4b674c7c42 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -28,11 +28,9 @@ #include "access/transam.h" #include "access/xact.h" #include "storage/predicate.h" -#include "storage/proc.h" #include "storage/procarray.h" #include "utils/memutils.h" #include "utils/memutils.h" -#include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/tqual.h" |