Remove unnecessary #include references, per pgrminclude script.

47 files changed, 3 insertions, 80 deletions

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index a95b3d745b..7154ae385b 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -17,7 +17,6 @@
 #include "access/sdir.h"
 #include "access/skey.h"
 #include "nodes/tidbitmap.h"
-#include "storage/buf.h"
 #include "storage/lock.h"
 #include "utils/relcache.h"
 #include "utils/snapshot.h"
diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index 31e9733546..aeba4c1e08 100644
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -11,7 +11,6 @@
 #define GIN_H
 
 #include "access/xlog.h"
-#include "storage/block.h"
 #include "utils/relcache.h"
 
 
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 56036a8370..b8d06abf1f 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -14,13 +14,9 @@
 #ifndef HEAPAM_H
 #define HEAPAM_H
 
-#include "access/htup.h"
 #include "access/sdir.h"
 #include "access/skey.h"
 #include "access/xlog.h"
-#include "nodes/primnodes.h"
-#include "storage/bufpage.h"
-#include "storage/lock.h"
 #include "utils/relcache.h"
 #include "utils/snapshot.h"
 
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index 977e0b4748..1ae44e0e69 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -14,7 +14,6 @@
 #define TUPTOASTER_H
 
 #include "access/htup.h"
-#include "storage/bufpage.h"
 #include "utils/relcache.h"
 
 /*
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 799bf8bf38..0019df5f0c 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -14,10 +14,7 @@
 #ifndef TWOPHASE_H
 #define TWOPHASE_H
 
-#include "access/xlogdefs.h"
-#include "storage/backendid.h"
 #include "storage/proc.h"
-#include "utils/timestamp.h"
 
 /*
  * GlobalTransactionData is defined in twophase.c; other places have no
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index c585752b00..575bcd3cde 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -15,9 +15,6 @@
 #define XACT_H
 
 #include "access/xlog.h"
-#include "nodes/pg_list.h"
-#include "storage/relfilenode.h"
-#include "utils/timestamp.h"
 
 
 /*
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
index 4eaa243948..097072ced1 100644
--- a/src/include/access/xlog_internal.h
+++ b/src/include/access/xlog_internal.h
@@ -17,10 +17,6 @@
 #define XLOG_INTERNAL_H
 
 #include "access/xlog.h"
-#include "fmgr.h"
-#include "pgtime.h"
-#include "storage/block.h"
-#include "storage/relfilenode.h"
 
 
 /*
diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h
index bc3db143eb..5a26d26889 100644
--- a/src/include/access/xlogutils.h
+++ b/src/include/access/xlogutils.h
@@ -11,11 +11,7 @@
 #ifndef XLOG_UTILS_H
 #define XLOG_UTILS_H
 
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/relfilenode.h"
-#include "storage/block.h"
-#include "utils/relcache.h"
 
 
 extern void XLogCheckInvalidPages(void);
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index e4f1535db3..1e1e12d36d 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -14,7 +14,6 @@
 #ifndef CATALOG_H
 #define CATALOG_H
 
-#include "catalog/catversion.h"
 #include "catalog/pg_class.h"
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index 5dfb25fee7..5302e50b4e 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -14,7 +14,6 @@
 #ifndef DEPENDENCY_H
 #define DEPENDENCY_H
 
-#include "nodes/parsenodes.h"	/* for DropBehavior */
 #include "catalog/objectaddress.h"
 
 
diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h
index cda9b72827..438635c31a 100644
--- a/src/include/catalog/pg_db_role_setting.h
+++ b/src/include/catalog/pg_db_role_setting.h
@@ -21,8 +21,6 @@
 #ifndef PG_DB_ROLE_SETTING_H
 #define PG_DB_ROLE_SETTING_H
 
-#include "catalog/genbki.h"
-#include "nodes/parsenodes.h"
 #include "utils/guc.h"
 #include "utils/relcache.h"
 
diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h
index 6907d83670..5b4d674e5d 100644
--- a/src/include/catalog/storage.h
+++ b/src/include/catalog/storage.h
@@ -15,9 +15,6 @@
 #define STORAGE_H
 
 #include "access/xlog.h"
-#include "lib/stringinfo.h"
-#include "storage/block.h"
-#include "storage/relfilenode.h"
 #include "utils/relcache.h"
 
 extern void RelationCreateStorage(RelFileNode rnode, char relpersistence);
diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h
index e942b538af..6cf9de1eca 100644
--- a/src/include/commands/alter.h
+++ b/src/include/commands/alter.h
@@ -14,7 +14,6 @@
 #ifndef ALTER_H
 #define ALTER_H
 
-#include "nodes/parsenodes.h"
 #include "utils/acl.h"
 #include "utils/relcache.h"
 
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index a31479defb..06337e6114 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -15,8 +15,6 @@
 #define COPY_H
 
 #include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
-#include "tcop/dest.h"
 
 /* CopyStateData is private in commands/copy.c */
 typedef struct CopyStateData *CopyState;
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 21dacff39c..e704380b60 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -15,7 +15,6 @@
 #define DBCOMMANDS_H
 
 #include "access/xlog.h"
-#include "nodes/parsenodes.h"
 
 /* XLOG stuff */
 #define XLOG_DBASE_CREATE		0x00
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index c64aabf0ba..49605da63e 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -14,8 +14,6 @@
 #ifndef PORTALCMDS_H
 #define PORTALCMDS_H
 
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
 #include "utils/portal.h"
 
 
diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h
index 4375fdbafe..63c06ad8d6 100644
--- a/src/include/commands/prepare.h
+++ b/src/include/commands/prepare.h
@@ -15,7 +15,6 @@
 
 #include "commands/explain.h"
 #include "utils/plancache.h"
-#include "utils/timestamp.h"
 
 /*
  * The data structure representing a prepared statement.  This is now just
diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h
index 1a0282c8ca..8c7ecbf76b 100644
--- a/src/include/commands/seclabel.h
+++ b/src/include/commands/seclabel.h
@@ -10,8 +10,6 @@
 #define SECLABEL_H
 
 #include "catalog/objectaddress.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
 
 /*
  * Internal APIs
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 3f3ba52948..1ef0f91e95 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -13,10 +13,7 @@
 #ifndef SEQUENCE_H
 #define SEQUENCE_H
 
-#include "nodes/parsenodes.h"
-#include "storage/relfilenode.h"
 #include "access/xlog.h"
-#include "fmgr.h"
 
 
 typedef struct FormData_pg_sequence
diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h
index 4692098a65..5b1fb6eddc 100644
--- a/src/include/commands/tablespace.h
+++ b/src/include/commands/tablespace.h
@@ -15,7 +15,6 @@
 #define TABLESPACE_H
 
 #include "access/xlog.h"
-#include "nodes/parsenodes.h"
 
 /* XLOG stuff */
 #define XLOG_TBLSPC_CREATE		0x00
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index fe21298b64..3ac4a823ec 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -14,7 +14,6 @@
 #define TRIGGER_H
 
 #include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
 
 /*
  * TriggerData is the node type that is passed as fmgr "context" info
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 1a636a0987..1c00b0dd27 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -16,8 +16,6 @@
 #define EXECDESC_H
 
 #include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "tcop/dest.h"
 
 
 /* ----------------
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index aaa36c5826..d565469b26 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -15,7 +15,6 @@
 #define FUNCTIONS_H
 
 #include "nodes/execnodes.h"
-#include "tcop/dest.h"
 
 /* This struct is known only within executor/functions.c */
 typedef struct SQLFunctionParseInfo *SQLFunctionParseInfoPtr;
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 0c6e06f8ff..85e595be1b 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -14,7 +14,6 @@
 #ifndef HASHJOIN_H
 #define HASHJOIN_H
 
-#include "fmgr.h"
 #include "nodes/execnodes.h"
 #include "storage/buffile.h"
 
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 98d194a37d..d0c7696d34 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -13,10 +13,7 @@
 #ifndef SPI_H
 #define SPI_H
 
-#include "nodes/parsenodes.h"
 #include "utils/portal.h"
-#include "utils/relcache.h"
-#include "utils/snapshot.h"
 
 
 typedef struct SPITupleTable
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index f774f2d0ab..69ade2fd4c 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -15,7 +15,6 @@
 #define TUPTABLE_H
 
 #include "access/htup.h"
-#include "access/tupdesc.h"
 #include "storage/buf.h"
 
 /*----------
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 1e49044191..c49f30c61d 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -12,7 +12,6 @@
 #define HBA_H
 
 #include "nodes/pg_list.h"
-#include "libpq/pqcomm.h"
 
 
 typedef enum UserAuth
diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h
index 149c1ff9b4..0b5d2e364f 100644
--- a/src/include/libpq/ip.h
+++ b/src/include/libpq/ip.h
@@ -15,8 +15,8 @@
 #ifndef IP_H
 #define IP_H
 
-#include "getaddrinfo.h"
-#include "libpq/pqcomm.h"
+#include "getaddrinfo.h"	/* pgrminclude ignore */
+#include "libpq/pqcomm.h"	/* pgrminclude ignore */
 
 
 #ifdef	HAVE_UNIX_SOCKETS
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 6ed739c290..b3eed7d189 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -16,13 +16,9 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/skey.h"
 #include "nodes/params.h"
 #include "nodes/plannodes.h"
-#include "nodes/tidbitmap.h"
-#include "utils/hsearch.h"
 #include "utils/reltrigger.h"
-#include "utils/snapshot.h"
 #include "utils/tuplestore.h"
 
 
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index 3b87e181bd..8bac7b024b 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -14,7 +14,6 @@
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "nodes/parsenodes.h"
 #include "executor/tuptable.h"
 
 
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index f6592697e4..722567df5c 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -15,7 +15,6 @@
 #define RELATION_H
 
 #include "access/sdir.h"
-#include "nodes/bitmapset.h"
 #include "nodes/params.h"
 #include "nodes/parsenodes.h"
 #include "storage/block.h"
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 83d80671f3..fcafbcd515 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -22,7 +22,6 @@
 #ifndef GEQO_MISC_H
 #define GEQO_MISC_H
 
-#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 
 #ifdef GEQO_DEBUG
diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h
index cf82363ce7..682cabe2c6 100644
--- a/src/include/postmaster/autovacuum.h
+++ b/src/include/postmaster/autovacuum.h
@@ -14,7 +14,6 @@
 #ifndef AUTOVACUUM_H
 #define AUTOVACUUM_H
 
-#include "storage/lock.h"
 
 /* GUC variables */
 extern bool autovacuum_start_daemon;
diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h
index 876d2aa61f..465072d17a 100644
--- a/src/include/replication/walsender.h
+++ b/src/include/replication/walsender.h
@@ -16,9 +16,9 @@
 #include "nodes/nodes.h"
 #include "storage/latch.h"
 #include "replication/syncrep.h"
+#include "storage/shmem.h"
 #include "storage/spin.h"
 
-
 typedef enum WalSndState
 {
 	WALSNDSTATE_STARTUP = 0,
diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index 1c15db8f10..54dc6499a3 100644
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -15,7 +15,6 @@
 #define FREESPACE_H_
 
 #include "storage/block.h"
-#include "storage/bufpage.h"
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"
 
diff --git a/src/include/storage/fsm_internals.h b/src/include/storage/fsm_internals.h
index 4508b7c9c6..8b5a2dbc1b 100644
--- a/src/include/storage/fsm_internals.h
+++ b/src/include/storage/fsm_internals.h
@@ -16,7 +16,6 @@
 
 #include "storage/buf.h"
 #include "storage/bufpage.h"
-#include "lib/stringinfo.h"
 
 /*
  * Structure of a FSM page. See src/backend/storage/freespace/README for
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
index 3c20fc48f6..a11d4385b7 100644
--- a/src/include/storage/procarray.h
+++ b/src/include/storage/procarray.h
@@ -14,8 +14,6 @@
 #ifndef PROCARRAY_H
 #define PROCARRAY_H
 
-#include "storage/lock.h"
-#include "storage/procsignal.h"
 #include "storage/standby.h"
 #include "utils/snapshot.h"
 
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index e4792668c2..96d0642a0a 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -14,9 +14,7 @@
 #ifndef SMGR_H
 #define SMGR_H
 
-#include "access/xlog.h"
 #include "fmgr.h"
-#include "storage/backendid.h"
 #include "storage/block.h"
 #include "storage/relfilenode.h"
 
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index 6ebac62db5..d2e3e92d19 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -15,9 +15,7 @@
 #define STANDBY_H
 
 #include "access/xlog.h"
-#include "storage/lock.h"
 #include "storage/procsignal.h"
-#include "storage/relfilenode.h"
 
 /* User-settable GUC parameters */
 extern int	vacuum_defer_cleanup_age;
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 2a5e871c92..018577ecad 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -14,7 +14,6 @@
 #ifndef PQUERY_H
 #define PQUERY_H
 
-#include "nodes/parsenodes.h"
 #include "utils/portal.h"
 
 
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index d5192d9855..898c732681 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -20,9 +20,7 @@
 #define TCOPPROT_H
 
 #include "executor/execdesc.h"
-#include "nodes/parsenodes.h"
 #include "storage/procsignal.h"
-#include "utils/guc.h"
 
 
 /* Required daylight between max_stack_depth and the kernel limit, in bytes */
diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h
index 01550eddfe..84e451ce6d 100644
--- a/src/include/tsearch/ts_cache.h
+++ b/src/include/tsearch/ts_cache.h
@@ -13,7 +13,6 @@
 #ifndef TS_CACHE_H
 #define TS_CACHE_H
 
-#include "fmgr.h"
 #include "utils/guc.h"
 
 
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 606b778f10..fbcddbc245 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -15,7 +15,6 @@
 #define INVAL_H
 
 #include "access/htup.h"
-#include "storage/relfilenode.h"
 #include "utils/relcache.h"
 
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index f4490adc31..215951589a 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -13,9 +13,7 @@
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
-#include "access/attnum.h"
 #include "access/htup.h"
-#include "nodes/pg_list.h"
 
 /* Result list element for get_op_btree_interpretation */
 typedef struct OpBtreeInterpretation
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index fc49ee3acc..9aaf9695f5 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -16,7 +16,6 @@
 
 #include "access/tupdesc.h"
 #include "nodes/bitmapset.h"
-#include "nodes/pg_list.h"
 
 
 typedef struct RelationData *Relation;
diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 2d08312b34..cff0ac8b49 100644
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -19,7 +19,6 @@
 #ifndef RESOWNER_H
 #define RESOWNER_H
 
-#include "storage/buf.h"
 #include "storage/fd.h"
 #include "utils/catcache.h"
 #include "utils/plancache.h"
diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h
index a7e7d3dc2b..c969a37796 100644
--- a/src/include/utils/snapmgr.h
+++ b/src/include/utils/snapmgr.h
@@ -14,7 +14,6 @@
 #define SNAPMGR_H
 
 #include "utils/resowner.h"
-#include "utils/snapshot.h"
 
 
 extern bool FirstSnapshotSet;