Remove unnecessary #includes

src/backend/access/nbtree/nbtinsert.c

@@ -20,7 +20,6 @@
 #include "access/transam.h"
 #include "cdb/cdbappendonlyam.h"
 #include "cdb/cdbaocsam.h"
-#include "cdb/cdbvars.h"  /*Gp_is_primary*/
 #include "miscadmin.h"
 #include "utils/inval.h"
 

src/backend/access/transam/xlog.c

@@ -48,20 +48,17 @@
 #include "pgstat.h"
 #include "postmaster/postmaster.h"
 #include "postmaster/checkpoint.h"
-#include "storage/latch.h"
-#include "storage/proc.h"
 #include "storage/bufpage.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
-#include "storage/latch.h"
 #include "storage/pmsignal.h"
 #include "storage/procarray.h"
 #include "storage/spin.h"
 #include "utils/builtins.h"
+#include "utils/nabstime.h"
 #include "utils/faultinjector.h"
 #include "utils/flatfiles.h"
 #include "utils/pg_locale.h"
-#include "utils/nabstime.h"
 #include "utils/guc.h"
 #include "utils/ps_status.h"
 #include "utils/resscheduler.h"
@@ -85,9 +82,6 @@
 #include "cdb/cdbresynchronizechangetracking.h"
 #include "cdb/cdbpersistentfilesysobj.h"
 #include "cdb/cdbpersistentcheck.h"
-#include "cdb/cdbfilerep.h"
-#include "postmaster/primary_mirror_mode.h"
-#include "utils/elog.h"
 
 /*
  *	Because O_DIRECT bypasses the kernel buffers, and because we never

src/backend/catalog/heap.c

@@ -32,10 +32,8 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/sysattr.h"
 #include "access/transam.h"
 #include "access/reloptions.h"
-#include "access/sysattr.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catquery.h"
@@ -58,7 +56,6 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
-#include "catalog/gp_fastsequence.h"
 #include "cdb/cdbpartition.h"
 #include "cdb/cdbsreh.h"
 #include "commands/tablecmds.h"

src/backend/commands/portalcmds.c

@@ -34,7 +34,6 @@
 #include "utils/resscheduler.h"
 
 #include "cdb/cdbgang.h"
-#include "cdb/cdbtm.h"
 #include "cdb/cdbvars.h"
 #include "postmaster/backoff.h"
 

src/backend/commands/prepare.c

@@ -22,14 +22,8 @@
 #include "catalog/pg_type.h"
 #include "commands/explain.h"
 #include "commands/prepare.h"
-#include "executor/executor.h"
 #include "funcapi.h"
 #include "miscadmin.h"
-#include "nodes/nodeFuncs.h"
-#include "parser/analyze.h"
-#include "parser/parse_coerce.h"
-#include "parser/parse_expr.h"
-#include "parser/parse_type.h"
 #include "rewrite/rewriteHandler.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
@@ -37,10 +31,6 @@
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 
-#include "commands/tablespace.h"
-#include "catalog/catalog.h"
-#include "catalog/pg_type.h"
-
 extern char *savedSeqServerHost;
 extern int savedSeqServerPort;
 

src/backend/commands/view.c

@@ -20,7 +20,6 @@
 #include "catalog/dependency.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_depend.h"
-#include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "commands/tablecmds.h"
 #include "commands/view.h"
@@ -37,9 +36,7 @@
 
 
 #include "cdb/cdbdisp.h"
-#include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 
 
 static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);

src/backend/optimizer/plan/planner.c

@@ -14,13 +14,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <dlfcn.h>
 #include "postgres.h"
 
 #include <limits.h>
 
 #include "catalog/pg_operator.h"
-#include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "executor/execHHashagg.h"
 #include "executor/nodeAgg.h"
@@ -43,12 +41,10 @@
 #endif
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
-#include "parser/parse_relation.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
 #include "utils/syscache.h"
-#include "nodes/bitmapset.h"
 
 #include "cdb/cdbllize.h"
 #include "cdb/cdbmutate.h" 	/* apply_shareinput */
@@ -59,9 +55,6 @@
 #include "cdb/cdbsetop.h" /* motion utilities */
 #include "cdb/cdbsubselect.h"   /* cdbsubselect_flatten_sublinks() */
 
-#include "utils/debugbreak.h"
-#include "catalog/gp_policy.h"
-
 /* GUC parameter */
 double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
 

src/backend/optimizer/util/plancat.c

@@ -21,12 +21,8 @@
 #include "access/genam.h"
 #include "catalog/catquery.h"
 #include "access/heapam.h"
-#include "access/aocssegfiles.h"
-#include "catalog/gp_policy.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_exttable.h"
-#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
 #include "commands/tablecmds.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
@@ -41,18 +37,10 @@
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
-#include "utils/array.h"
-#include "utils/fmgroids.h"
-#include "utils/builtins.h"
-#include "utils/uri.h"
 #include "catalog/catalog.h"
-#include "cdb/cdbvars.h"
 #include "miscadmin.h"
 #include "cdb/cdbappendonlyam.h"
-#include "cdb/cdbdisp.h"
 #include "cdb/cdbrelsize.h"
-#include "mb/pg_wchar.h"
-#include "commands/vacuum.h"
 
 
 /* GUC parameter */

src/backend/parser/analyze.c

@@ -71,9 +71,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
-#include "cdb/cdbappendonlyam.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbhash.h"
 #include "cdb/cdbsreh.h"
 

src/backend/postmaster/autovacuum.c

@@ -24,7 +24,6 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/reloptions.h"
 #include "access/transam.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"
@@ -45,7 +44,6 @@
 #include "storage/proc.h"
 #include "storage/procarray.h"
 #include "storage/procsignal.h"
-//#include "storage/sinvaladt.h"
 #include "storage/sinval.h"
 #include "tcop/tcopprot.h"
 #include "utils/flatfiles.h"

src/backend/tcop/utility.c

@@ -63,11 +63,8 @@
 #include "utils/syscache.h"
 #include "lib/stringinfo.h"
 
-#include "cdb/cdbcat.h"
 #include "cdb/cdbdisp.h"
-#include "cdb/cdbsrlz.h"
 #include "cdb/cdbpartition.h"
-#include "cdb/cdbtm.h"
 #include "cdb/cdbvars.h"
 
 /*

src/backend/utils/mmgr/portalmem.c

@@ -21,20 +21,13 @@
 #include "access/heapam.h"
 #include "access/xact.h"
 #include "catalog/pg_type.h"
-#include "commands/variable.h"			/* show_session_authorization */
-#include "commands/dbcommands.h" 		/* get_database_name */
 #include "commands/portalcmds.h"
+#include "funcapi.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"            /* EState */
 #include "utils/builtins.h"
 #include "utils/memutils.h"
-#include "utils/portal.h"
 #include "utils/resscheduler.h"
-#include "utils/tuplestore.h"           /* tuplestore_begin_heap, etc */
 
-#include "cdb/cdbdisp.h"                /* CdbShutdownPortals, CdbCheckDispatchResult */
-#include "cdb/cdbvars.h"
-#include "cdb/cdbgang.h"
 #include "cdb/ml_ipc.h"
 
 /*

src/backend/utils/time/combocid.c

@@ -50,8 +50,6 @@
 #include "utils/tqual.h"
 #include "cdb/cdbdtxcontextinfo.h"
 
-#include "miscadmin.h"
-#include "storage/proc.h"
 #include "access/twophase.h"  /* max_prepared_xacts */
 
 #include "storage/buffile.h"