Remove unnecessary #include references, per pgrminclude script.

contrib/auto_explain/auto_explain.c

@@ -14,7 +14,6 @@
 
 #include "commands/explain.h"
 #include "executor/instrument.h"
-#include "utils/guc.h"
 
 PG_MODULE_MAGIC;
 

contrib/btree_gin/btree_gin.c

@@ -5,7 +5,6 @@
 
 #include <limits.h>
 
-#include "fmgr.h"
 #include "access/skey.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"

contrib/btree_gist/btree_gist.h

@@ -4,8 +4,7 @@
 #ifndef __BTREE_GIST_H__
 #define __BTREE_GIST_H__
 
-#include "access/gist.h"
-#include "access/itup.h"
+#include "fmgr.h"
 #include "access/nbtree.h"
 
 #define BtreeGistNotEqualStrategyNumber 6

contrib/btree_gist/btree_utils_num.h

@@ -5,6 +5,7 @@
 #define __BTREE_UTILS_NUM_H__
 
 #include "btree_gist.h"
+#include "access/gist.h"
 #include "utils/rel.h"
 
 #include <math.h>

contrib/btree_gist/btree_utils_var.h

@@ -6,6 +6,7 @@
 
 #include "btree_gist.h"
 
+#include "access/gist.h"
 #include "mb/pg_wchar.h"
 
 /* Variable length key */

contrib/citext/citext.c

@@ -5,7 +5,6 @@
 
 #include "access/hash.h"
 #include "catalog/pg_collation.h"
-#include "fmgr.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
 

contrib/cube/cube.c

@@ -13,8 +13,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "lib/stringinfo.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
 
 #include "cubedata.h"

contrib/dblink/dblink.c

@@ -35,36 +35,21 @@
 #include <limits.h>
 
 #include "libpq-fe.h"
-#include "fmgr.h"
 #include "funcapi.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "access/tupdesc.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_index.h"
 #include "catalog/pg_type.h"
-#include "executor/executor.h"
 #include "executor/spi.h"
 #include "foreign/foreign.h"
-#include "lib/stringinfo.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "parser/parse_type.h"
 #include "parser/scansup.h"
 #include "utils/acl.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/dynahash.h"
 #include "utils/fmgroids.h"
-#include "utils/hsearch.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
-#include "utils/syscache.h"
 #include "utils/tqual.h"
 
 #include "dblink.h"

contrib/dict_int/dict_int.c

@@ -13,7 +13,6 @@
 #include "postgres.h"
 
 #include "commands/defrem.h"
-#include "fmgr.h"
 #include "tsearch/ts_public.h"
 
 PG_MODULE_MAGIC;

contrib/dict_xsyn/dict_xsyn.c

@@ -15,7 +15,6 @@
 #include <ctype.h>
 
 #include "commands/defrem.h"
-#include "fmgr.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_utils.h"
 

contrib/fuzzystrmatch/fuzzystrmatch.c

@@ -40,7 +40,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 

contrib/hstore/hstore_compat.c

@@ -83,7 +83,6 @@
  */
 #include "postgres.h"
 
-#include "funcapi.h"
 
 #include "hstore.h"
 

contrib/hstore/hstore_gist.c

@@ -4,7 +4,6 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/itup.h"
 #include "access/skey.h"
 #include "catalog/pg_type.h"
 

contrib/hstore/hstore_io.c

@@ -5,8 +5,6 @@
 
 #include <ctype.h>
 
-#include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"

contrib/hstore/hstore_op.c

@@ -4,8 +4,6 @@
 #include "postgres.h"
 
 #include "access/hash.h"
-#include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "utils/builtins.h"

contrib/intarray/_int_op.c

@@ -3,7 +3,6 @@
  */
 #include "postgres.h"
 
-#include "lib/stringinfo.h"
 
 #include "_int.h"
 

contrib/lo/lo.c

@@ -10,7 +10,6 @@
 #include "commands/trigger.h"
 #include "executor/spi.h"
 #include "libpq/be-fsstubs.h"
-#include "libpq/libpq-fs.h"
 #include "utils/rel.h"
 
 

contrib/ltree/_ltree_gist.c

@@ -9,7 +9,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "utils/array.h"
 #include "crc32.h"
 #include "ltree.h"
 

contrib/ltree/_ltree_op.c

@@ -9,7 +9,6 @@
 
 #include <ctype.h>
 
-#include "utils/array.h"
 #include "ltree.h"
 
 PG_FUNCTION_INFO_V1(_ltree_isparent);

contrib/ltree/lquery_op.c

@@ -8,7 +8,6 @@
 #include <ctype.h>
 
 #include "catalog/pg_collation.h"
-#include "utils/array.h"
 #include "utils/formatting.h"
 #include "ltree.h"
 

contrib/ltree/ltree_gist.c

@@ -6,9 +6,7 @@
 #include "postgres.h"
 
 #include "access/gist.h"
-#include "access/nbtree.h"
 #include "access/skey.h"
-#include "utils/array.h"
 #include "crc32.h"
 #include "ltree.h"
 

contrib/ltree/ltree_op.c

@@ -11,7 +11,6 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
-#include "utils/syscache.h"
 #include "ltree.h"
 
 PG_MODULE_MAGIC;

contrib/pageinspect/btreefuncs.c

@@ -27,13 +27,10 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/nbtree.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "miscadmin.h"
-#include "storage/bufmgr.h"
 #include "utils/builtins.h"
 #include "utils/rel.h"
 

contrib/pageinspect/fsmfuncs.c

@@ -18,7 +18,6 @@
  */
 
 #include "postgres.h"
-#include "lib/stringinfo.h"
 #include "storage/fsm_internals.h"
 #include "utils/builtins.h"
 #include "miscadmin.h"

contrib/pageinspect/heapfuncs.c

@@ -25,12 +25,7 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "funcapi.h"
-#include "access/heapam.h"
-#include "access/transam.h"
-#include "catalog/namespace.h"
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "miscadmin.h"
 

contrib/pageinspect/rawpage.c

@@ -15,12 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "access/transam.h"
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"

contrib/pg_buffercache/pg_buffercache_pages.c

@@ -8,12 +8,10 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "storage/buf_internals.h"
 #include "storage/bufmgr.h"
-#include "utils/relcache.h"
 
 
 #define NUM_BUFFERCACHE_PAGES_ELEM	8

contrib/pg_freespacemap/pg_freespacemap.c

@@ -8,9 +8,7 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "funcapi.h"
-#include "storage/block.h"
 #include "storage/freespace.h"
 
 

contrib/pg_stat_statements/pg_stat_statements.c

@@ -23,8 +23,6 @@
 #include <unistd.h>
 
 #include "access/hash.h"
-#include "catalog/pg_type.h"
-#include "executor/executor.h"
 #include "executor/instrument.h"
 #include "funcapi.h"
 #include "mb/pg_wchar.h"
@@ -32,11 +30,8 @@
 #include "pgstat.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
-#include "storage/spin.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/guc.h"
 
 
 PG_MODULE_MAGIC;

contrib/pg_trgm/trgm_gin.c

@@ -6,12 +6,7 @@
 #include "trgm.h"
 
 #include "access/gin.h"
-#include "access/itup.h"
 #include "access/skey.h"
-#include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
 
 
 PG_FUNCTION_INFO_V1(gin_extract_trgm);

contrib/pg_trgm/trgm_gist.c

@@ -5,13 +5,7 @@
 
 #include "trgm.h"
 
-#include "access/gist.h"
-#include "access/itup.h"
 #include "access/skey.h"
-#include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
 
 
 PG_FUNCTION_INFO_V1(gtrgm_in);

contrib/pg_trgm/trgm_op.c

@@ -9,7 +9,6 @@
 
 #include "catalog/pg_type.h"
 #include "tsearch/ts_locale.h"
-#include "utils/array.h"
 
 
 PG_MODULE_MAGIC;

contrib/pg_upgrade/version.c

@@ -11,7 +11,6 @@
 
 #include "pg_upgrade.h"
 
-#include "access/transam.h"
 
 
 /*

contrib/pg_upgrade_support/pg_upgrade_support.c

@@ -11,10 +11,7 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
-#include "catalog/dependency.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
 #include "commands/extension.h"
 #include "miscadmin.h"

contrib/pgcrypto/crypt-blowfish.c

@@ -34,7 +34,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 #ifdef __i386__

contrib/pgcrypto/crypt-des.c

@@ -62,7 +62,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 /* for ntohl/htonl */

contrib/pgcrypto/crypt-gensalt.c

@@ -14,7 +14,6 @@
 
 #include "postgres.h"
 
-#include "px.h"
 #include "px-crypt.h"
 
 typedef unsigned int BF_word;

contrib/pgcrypto/internal.c

@@ -36,7 +36,6 @@
 #include "px.h"
 #include "md5.h"
 #include "sha1.h"
-#include "sha2.h"
 #include "blf.h"
 #include "rijndael.h"
 #include "fortuna.h"

contrib/pgcrypto/md5.c

@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 
-#include "px.h"
 #include "md5.h"
 
 #define SHIFT(X, s) (((X) << (s)) | ((X) >> (32 - (s))))

contrib/pgcrypto/pgcrypto.c

@@ -33,7 +33,6 @@
 
 #include <ctype.h>
 
-#include "fmgr.h"
 #include "parser/scansup.h"
 #include "utils/builtins.h"
 

contrib/pgcrypto/pgp-pgsql.c

@@ -31,8 +31,6 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
-#include "parser/scansup.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 

contrib/pgcrypto/sha1.c

@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 
-#include "px.h"
 #include "sha1.h"
 
 /* constant table */

contrib/pgrowlocks/pgrowlocks.c

@@ -24,7 +24,6 @@
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/xact.h"

contrib/seg/seg.c

@@ -13,7 +13,6 @@
 
 #include "access/gist.h"
 #include "access/skey.h"
-#include "utils/builtins.h"
 
 #include "segdata.h"
 

contrib/tablefunc/tablefunc.c

@@ -35,14 +35,10 @@
 #include <math.h>
 
 #include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "funcapi.h"
 #include "executor/spi.h"
-#include "lib/stringinfo.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/guc.h"
-#include "utils/lsyscache.h"
 
 #include "tablefunc.h"
 

contrib/tsearch2/tsearch2.c

@@ -16,10 +16,8 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "commands/trigger.h"
-#include "fmgr.h"
 #include "tsearch/ts_utils.h"
 #include "utils/builtins.h"
-#include "utils/guc.h"
 #include "utils/syscache.h"
 
 PG_MODULE_MAGIC;

contrib/unaccent/unaccent.c

@@ -13,10 +13,8 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "mb/pg_wchar.h"
 #include "tsearch/ts_cache.h"
 #include "tsearch/ts_locale.h"
 #include "tsearch/ts_public.h"

contrib/vacuumlo/vacuumlo.c

@@ -22,7 +22,6 @@
 #endif
 
 #include "libpq-fe.h"
-#include "libpq/libpq-fs.h"
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
 

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"

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"
 

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"
 

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"
 
 /*

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

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"
 
 /*

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"
 

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"
 

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"
 

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"
 

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"
 

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 */

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"

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"
 

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)

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"
 
 
 /*

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
 {

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"
 
 

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"
 
 

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,

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"
 
 

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"
 

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"
 

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"
 
 

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"
 

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 
 /*

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

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"

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"
 

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"
 
 

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"
 
 

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"
 
 

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"

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"
 
 

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"

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"

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"

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"

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"

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"
 
 

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,

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"

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"

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"