Remove unnecessary #include references, per pgrminclude script.

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"