diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 3f50a2f84337dfcf9b4a7d391a5c9877ce2af0df..79729e822511b59ac003839f7b04ce9b6ffea0e7 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -37,6 +37,7 @@
 #include "access/xlogutils.h"
 #include "catalog/catalog.h"
 #include "catalog/catversion.h"
+#include "catalog/pg_authid.h"
 #include "catalog/pg_control.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_database.h"
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index 89c541849e741d5a581a47a4300b9c26debadf5d..164bdc8b546c11fcafa208f6c2fb634b40d8af99 100644
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -23,6 +23,7 @@
 #include "postgres.h"
 
 #include "access/xlogutils.h"
+#include "catalog/pg_tablespace.h"
 #include "storage/bufpage.h"
 #include "storage/smgr.h"
 #include "utils/hsearch.h"
diff --git a/src/backend/cdb/cdbdirectopen.c b/src/backend/cdb/cdbdirectopen.c
index 2f103575485ef45f2f5452f82e41b34f6ff40ba9..4d1125fb507e55c618fe25aa1733a4f694fa1e5b 100755
--- a/src/backend/cdb/cdbdirectopen.c
+++ b/src/backend/cdb/cdbdirectopen.c
@@ -9,14 +9,19 @@
 
 #include "postgres.h"
 
+#include "access/aosegfiles.h"
+#include "access/aocssegfiles.h"
 #include "cdb/cdbdirectopen.h"
 #include "utils/guc.h"
 #include "storage/smgr.h"
 #include "utils/memutils.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_authid.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_index.h"
+#include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_tablespace.h"
 #include "utils/builtins.h"
 
 /*
diff --git a/src/backend/cdb/cdbmirroredbufferpool.c b/src/backend/cdb/cdbmirroredbufferpool.c
index bf345df69b64b53e25ae30c3d7ddef677ee85295..2a6b0a87aa4e9940d542dd53108e3de7a4c7c098 100755
--- a/src/backend/cdb/cdbmirroredbufferpool.c
+++ b/src/backend/cdb/cdbmirroredbufferpool.c
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "access/xlogmm.h"
+#include "catalog/pg_tablespace.h"
 #include "cdb/cdbfilerepprimary.h"
 #include "cdb/cdbmirroredbufferpool.h"
 #include "cdb/cdbfilerepresyncmanager.h"
diff --git a/src/backend/cdb/cdbpath.c b/src/backend/cdb/cdbpath.c
index abce6ce6f7b5a09f3c3e5473dbaf5635e6590974..89326d58a6e30ba4345c9770c7351e3e79c14cff 100644
--- a/src/backend/cdb/cdbpath.c
+++ b/src/backend/cdb/cdbpath.c
@@ -27,6 +27,7 @@
 #include "cdb/cdbhash.h"        /* isGreenplumDbHashable() */
 
 #include "cdb/cdbpath.h"        /* me */
+#include "cdb/cdbvars.h"
 
 #ifdef small                    /* <socket.h> might #define small */
 #undef small                    /*  but I want it for a variable name */
diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c
index e9912472c24e5fdf0c447cc74215690362a100a8..cd4adbe70a5be141fd98e9096ee70f14d25a2a71 100644
--- a/src/backend/cdb/cdbtm.c
+++ b/src/backend/cdb/cdbtm.c
@@ -15,6 +15,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 
+#include "catalog/pg_authid.h"
 #include "cdb/cdbtm.h"
 #include "libpq/libpq-be.h"
 #include "miscadmin.h"
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index fefe7003c03db42f12d08632c9939da5f9d76d2b..ee6d1e2837fb49bb0d872d24b6e8838130d5700b 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -37,6 +37,7 @@
 #include "utils/syscache.h"
 
 #include "cdb/cdbdisp.h"
+#include "cdb/cdbdoublylinked.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
 #include "cdb/cdbmotion.h"
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index efbc56e86ca0e4175eb0c14eedf5781daa5f0056..29fd671e16dea3d0fccecf94a3ed7913cb63bc1c 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -78,11 +78,11 @@
 #include "cdb/cdbvars.h"
 #include "cdb/cdbutil.h"
 #include "access/persistentfilesysobjname.h"
+#include "cdb/cdbpersistentdatabase.h"
 #include "cdb/cdbpersistentrelation.h"
 #include "cdb/cdbmirroredfilesysobj.h"
 
 
-
 /* GUC variable */
 char	   *default_tablespace = NULL;
 
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 876029f5804086dadc68619d0e508747651a95e8..c31473d5160fda6c4668aa1b86e189ffe4328dbe 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -37,6 +37,7 @@
 #include "parser/parse_expr.h"
 #include "parser/parsetree.h"
 #include "rewrite/rewriteManip.h"
+#include "utils/guc.h"
 #include "utils/lsyscache.h"
 
 #include "cdb/cdbllize.h"                   /* repartitionPlan */
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 2a8381de841cc40817e3431f62ce0bd9f2c1640b..4eded6e4d6e89fe645b712ab82dcb77e947534bc 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -76,6 +76,7 @@
 #include "utils/tuplesort.h"
 
 #include "cdb/cdbpath.h"        /* cdbpath_rows() */
+#include "cdb/cdbvars.h"
 
 #define LOG2(x)  (log(x) / 0.693147180559945)
 
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 6e217e276875ba0bd686115f3545c66f6003950e..77a029e5da79c8c4e1211684c7c54f17dad815d6 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -46,6 +46,7 @@
 #include "cdb/cdbpathtoplan.h"  /* cdbpathtoplan_create_flow() etc. */
 #include "cdb/cdbpullup.h"      /* cdbpullup_targetlist() */
 #include "cdb/cdbsreh.h"
+#include "cdb/cdbvars.h"
 
 
 static Plan *create_subplan(PlannerInfo *root, Path *best_path);   /*CDB*/
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 1648266d6c08304d90725b005cc5bac61f35391d..808c0ae81111d1f637da7fd5ea2aef138dcdb1c6 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -29,6 +29,7 @@
 #include "utils/selfuncs.h"
 
 #include "cdb/cdbpath.h"        /* cdbpath_rows() */
+#include "cdb/cdbvars.h"
 
 static Bitmapset *distcols_in_groupclause(List *gc, Bitmapset *bms);
 
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index e6b62d6725ba153139c509ca7a1e7d24c7e79518..7906a2ae882a96db633d762db6594e7aa907ab10 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -51,9 +51,11 @@
 #include "cdb/cdbpath.h"        /* cdbpath_segments */
 #include "cdb/cdbpathtoplan.h"  /* cdbpathtoplan_create_flow() */
 #include "cdb/cdbpartition.h" /* query_has_external_partition() */
+#include "cdb/cdbplan.h"
 #include "cdb/cdbgroup.h" /* grouping_planner extensions */
 #include "cdb/cdbsetop.h" /* motion utilities */
 #include "cdb/cdbsubselect.h"   /* cdbsubselect_flatten_sublinks() */
+#include "cdb/cdbvars.h"
 
 /* GUC parameter */
 double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 49a28711e743f8dc899df9c4888d99a9b7ca46eb..3be2950d10fb13fd614b359557b58eccac21bb53 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -16,6 +16,7 @@
 #include "postgres.h"
 
 #include "access/reloptions.h"
+#include "access/transam.h"
 #include "access/url.h"
 #include "access/xlog_internal.h"
 #include "cdb/cdbappendonlyam.h"
diff --git a/src/include/cdb/cdbdatabaseinfo.h b/src/include/cdb/cdbdatabaseinfo.h
index fadcb44710aaf421cdb8f37cd143c8d2e998067b..57a332aa50a9f56c31b9a9eb5004de18ef2c019e 100755
--- a/src/include/cdb/cdbdatabaseinfo.h
+++ b/src/include/cdb/cdbdatabaseinfo.h
@@ -12,8 +12,6 @@
 #ifndef CDBDATABASEINFO_H
 #define CDBDATABASEINFO_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
 #include "storage/itemptr.h"
 #include "storage/dbdirnode.h"
 #include "catalog/pg_appendonly.h"
diff --git a/src/include/cdb/cdbdirectopen.h b/src/include/cdb/cdbdirectopen.h
index 0b79452e6c61b143dcddba8fa34a0b68118b6d44..1626fe8fd9985cc4e953e096af7256e977ac4916 100755
--- a/src/include/cdb/cdbdirectopen.h
+++ b/src/include/cdb/cdbdirectopen.h
@@ -9,24 +9,12 @@
 #ifndef CDBDIRECTOPEN_H
 #define CDBDIRECTOPEN_H
 
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "utils/palloc.h"
-#include "storage/fd.h"
-#include "storage/relfilenode.h"
-
+#include "access/transam.h"
 #include "catalog/catalog.h"
-#include "catalog/pg_namespace.h"
-#include "catalog/pg_authid.h"
-#include "catalog/pg_tablespace.h"
 #include "catalog/pg_class.h"
-#include "catalog/gp_persistent.h"
-#include "catalog/gp_global_sequence.h"
-#include "catalog/pg_appendonly.h"
+#include "catalog/pg_tablespace.h"
 #include "catalog/index.h"
-#include "access/transam.h"
-#include "access/aosegfiles.h"
-#include "access/aocssegfiles.h"
+#include "pgstat.h"
 
 /*
  * The goal here is to open any relations without going through
diff --git a/src/include/cdb/cdbdisp.h b/src/include/cdb/cdbdisp.h
index 9dee48f5d8a796ebd0de504d713f57cfb2257979..d0e64a1a181d1f635e3c2481469323e201cff7c2 100644
--- a/src/include/cdb/cdbdisp.h
+++ b/src/include/cdb/cdbdisp.h
@@ -13,7 +13,6 @@
 
 #include "lib/stringinfo.h"         /* StringInfo */
 
-#include "cdb/cdbselect.h"
 #include "cdb/cdbtm.h"
 #include <pthread.h>
 
diff --git a/src/include/cdb/cdbfilerep.h b/src/include/cdb/cdbfilerep.h
index 80fdaeb168022c5ced7da394fb35bc4a2f7f6b75..fb3bcd633ca7459cb560e67a4ad9fe52937cd74f 100644
--- a/src/include/cdb/cdbfilerep.h
+++ b/src/include/cdb/cdbfilerep.h
@@ -9,19 +9,16 @@
 #ifndef CDBFILEREP_H
 #define CDBFILEREP_H
 
-#include "c.h"
+#include <signal.h>
+
 #include "utils/pg_crc.h"
-#include "pg_config_manual.h"
 #include "storage/relfilenode.h"
 #include "access/xlogdefs.h"
-#include "cdb/cdbresynchronizechangetracking.h"
 #include "postmaster/primary_mirror_mode.h"
 #include "storage/fd.h"
 #include "storage/dbdirnode.h"
 #include "storage/lwlock.h"
 #include "storage/pg_sema.h"
-#include "storage/spin.h"
-#include "signal.h"
 #include "gpmon/gpmon.h"
 #include "utils/timestamp.h"
 
diff --git a/src/include/cdb/cdbfilerepprimaryrecovery.h b/src/include/cdb/cdbfilerepprimaryrecovery.h
index a6884d7d9431f7b1691798bd6615aa773d88782e..51f6c6287799d3bb0ef607be742c48453db10dd5 100644
--- a/src/include/cdb/cdbfilerepprimaryrecovery.h
+++ b/src/include/cdb/cdbfilerepprimaryrecovery.h
@@ -9,11 +9,8 @@
 #ifndef CDBFILEREPPRIMARYRECOVERY_H
 #define CDBFILEREPPRIMARYRECOVERY_H
 
-#include "cdb/cdbfilerep.h"
-
 
 extern void FileRepPrimary_StartRecovery(void);
 
-
 #endif
 
diff --git a/src/include/cdb/cdbglobalsequence.h b/src/include/cdb/cdbglobalsequence.h
index 61589391c951ca01a18e20b157eb30427943286f..912a676e3af1774a2140baa7511f96d121ec696e 100755
--- a/src/include/cdb/cdbglobalsequence.h
+++ b/src/include/cdb/cdbglobalsequence.h
@@ -9,10 +9,6 @@
 #ifndef CDBGLOBALSEQUENCE_H
 #define CDBGLOBALSEQUENCE_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
-#include "storage/itemptr.h"
-#include "utils/rel.h"
 #include "catalog/gp_global_sequence.h"
 
 int64 GlobalSequence_Next(
diff --git a/src/include/cdb/cdbinterconnect.h b/src/include/cdb/cdbinterconnect.h
index 38f10fde5da6dc5db6a9fc8b1a4cce0ef7b82b7b..d844078715bbfc26d860e5cb4684fa2cdaf46a43 100644
--- a/src/include/cdb/cdbinterconnect.h
+++ b/src/include/cdb/cdbinterconnect.h
@@ -16,6 +16,7 @@
 
 struct directTransportBuffer;
 
+#include "cdb/cdbselect.h"
 #include "cdb/tupser.h"
 #include "cdb/tupchunk.h"
 #include "cdb/tupchunklist.h"
@@ -23,6 +24,7 @@ struct directTransportBuffer;
 struct CdbProcess;                          /* #include "nodes/execnodes.h" */
 struct Slice;                               /* #include "nodes/execnodes.h" */
 struct SliceTable;                          /* #include "nodes/execnodes.h" */
+struct EState;                              /* #include "nodes/execnodes.h" */
 
 typedef struct icpkthdr
 {
@@ -513,7 +515,7 @@ typedef struct ChunkTransportState
 	int			sliceId;
 
 	/* Estate pointer for this statement (UDP-IC specific) */
-	EState		*estate;
+	struct EState *estate;
 
 	/* Function pointers to our send/receive functions */
 	bool (*SendChunk)(MotionLayerState *mlStates, struct ChunkTransportState *transportStates, ChunkTransportStateEntry *pEntry, MotionConn *conn, TupleChunkListItem tcItem, int16 motionId);
diff --git a/src/include/cdb/cdbllize.h b/src/include/cdb/cdbllize.h
index 8378d05904afd4f71be147e7a6cbf825680780e2..caa83aa0118a5ea450c5fce98c0811a9ebebbb93 100644
--- a/src/include/cdb/cdbllize.h
+++ b/src/include/cdb/cdbllize.h
@@ -18,7 +18,6 @@
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/params.h"
-#include "cdb/cdbplan.h"
 
 extern Plan *cdbparallelize(struct PlannerInfo *root, Plan *plan, Query *query,
 							int cursorOptions, 
diff --git a/src/include/cdb/cdbmirroredflatfile.h b/src/include/cdb/cdbmirroredflatfile.h
index ab34dd4988f419e6c53bbc86dc612cba1c2a578f..ec998db907d49ae74f8d2e100a77526af8db3d12 100755
--- a/src/include/cdb/cdbmirroredflatfile.h
+++ b/src/include/cdb/cdbmirroredflatfile.h
@@ -9,7 +9,7 @@
 #ifndef CDBMIRROREDFLATFILE_H
 #define CDBMIRROREDFLATFILE_H
 
-#include "utils/palloc.h"
+#include "access/xlogdefs.h"
 #include "storage/fd.h"
 #include "storage/dbdirnode.h"
 
diff --git a/src/include/cdb/cdbmotion.h b/src/include/cdb/cdbmotion.h
index 755d5e6961b1f47d5f8bae0d7e80912c618e79f9..26299a1924de349f36d550658ac119c6bb90118f 100644
--- a/src/include/cdb/cdbmotion.h
+++ b/src/include/cdb/cdbmotion.h
@@ -12,7 +12,6 @@
 #define CDBMOTION_H
 
 #include "access/htup.h"
-#include "cdb/htupfifo.h"
 #include "cdb/cdbselect.h"
 #include "cdb/cdbinterconnect.h"
 #include "cdb/ml_ipc.h"
diff --git a/src/include/cdb/cdbpath.h b/src/include/cdb/cdbpath.h
index 8c473af6e74e401635ba6ecac8973aa9e0194d33..612ddfc03cb3918d9b6c2a83eb908e62146d972c 100644
--- a/src/include/cdb/cdbpath.h
+++ b/src/include/cdb/cdbpath.h
@@ -10,7 +10,7 @@
 #ifndef CDBPATH_H
 #define CDBPATH_H
 
-#include "cdb/cdbvars.h"        /* getgpsegmentCount, gp_opt_segments, etc */
+#include "nodes/relation.h"
 
 void
 cdbpath_cost_motion(PlannerInfo *root, CdbMotionPath *motionpath);
diff --git a/src/include/cdb/cdbpersistentcheck.h b/src/include/cdb/cdbpersistentcheck.h
index 3543a37e55e0751315adace8687d5991118c31e5..f18f45bb4eea833388b29e53be3d42766f28119e 100644
--- a/src/include/cdb/cdbpersistentcheck.h
+++ b/src/include/cdb/cdbpersistentcheck.h
@@ -11,8 +11,8 @@
 
 #include "miscadmin.h"
 #include "utils/guc.h"
-#include "utils/palloc.h"
-#include "storage/fd.h"
+
+#include "cdb/cdbpersistentstore.h"
 
 /*
  * This struct provides accounting information to help Post DTM recovery
diff --git a/src/include/cdb/cdbpersistentdatabase.h b/src/include/cdb/cdbpersistentdatabase.h
index f37cbf7376b120e565f1e9bbc8f8ee5d423d0e3f..ac959d44abf800ab6a353169d2a9ad2f39eb098f 100755
--- a/src/include/cdb/cdbpersistentdatabase.h
+++ b/src/include/cdb/cdbpersistentdatabase.h
@@ -9,12 +9,9 @@
 #ifndef CDBPERSISTENTDATABASE_H
 #define CDBPERSISTENTDATABASE_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
 #include "storage/itemptr.h"
 #include "cdb/cdbsharedoidsearch.h"
 #include "access/persistentfilesysobjname.h"
-#include "cdb/cdbdoublylinked.h"
 #include "access/xlogmm.h"
 #include "cdb/cdbpersistentfilesysobj.h"
 
diff --git a/src/include/cdb/cdbpersistentfilespace.h b/src/include/cdb/cdbpersistentfilespace.h
index 73b44f5188e8dde8643ebe5abb58bbb8289700c7..25cf7e4b9bde13714540cfc083e528dcff3a2f32 100755
--- a/src/include/cdb/cdbpersistentfilespace.h
+++ b/src/include/cdb/cdbpersistentfilespace.h
@@ -12,10 +12,7 @@
 #include "access/persistentfilesysobjname.h"
 #include "access/xlogmm.h"
 #include "cdb/cdbsharedoidsearch.h"
-#include "cdb/cdbdoublylinked.h"
-#include "storage/fd.h"
 #include "storage/itemptr.h"
-#include "utils/palloc.h"
 #include "cdb/cdbpersistentfilesysobj.h"
 
 extern void PersistentFilespace_Reset(void);
diff --git a/src/include/cdb/cdbpersistentfilesysobj.h b/src/include/cdb/cdbpersistentfilesysobj.h
index 65cf0594f4cd267be07f2c5f2ca136ecfa0750ef..a30921c3b59d27713819bb4cefe9abcdf10f56bc 100755
--- a/src/include/cdb/cdbpersistentfilesysobj.h
+++ b/src/include/cdb/cdbpersistentfilesysobj.h
@@ -11,13 +11,9 @@
 
 #include "miscadmin.h"
 #include "utils/guc.h"
-#include "utils/palloc.h"
-#include "storage/fd.h"
 #include "access/persistentfilesysobjname.h"
 #include "access/persistentendxactrec.h"
 #include "cdb/cdbpersistentstore.h"
-#include "cdb/cdbdoublylinked.h"
-#include "storage/smgr.h"
 #include "catalog/gp_persistent.h"
 
 typedef struct PersistentFileSysObjSharedData
diff --git a/src/include/cdb/cdbpersistentrelation.h b/src/include/cdb/cdbpersistentrelation.h
index 5f8f35c2cf35f1fd3987c522c9a96edaab33c2cf..939149d65882820084386e97910f75d1cd811da5 100755
--- a/src/include/cdb/cdbpersistentrelation.h
+++ b/src/include/cdb/cdbpersistentrelation.h
@@ -9,12 +9,8 @@
 #ifndef CDBPERSISTENTRELATION_H
 #define CDBPERSISTENTRELATION_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
 #include "access/persistentfilesysobjname.h"
 #include "cdb/cdbpersistentfilesysobj.h"
-#include "cdb/cdbpersistentdatabase.h"
-#include "cdb/cdbdoublylinked.h"
 
 /*
  * This module is for generic relation file create and drop.
diff --git a/src/include/cdb/cdbpersistentstore.h b/src/include/cdb/cdbpersistentstore.h
index 27ff7c46b4516a3ee95b91684aa7346abaa8bc5c..b14a9d8e5f49dc5c974925838a0f1832b5d93fe4 100755
--- a/src/include/cdb/cdbpersistentstore.h
+++ b/src/include/cdb/cdbpersistentstore.h
@@ -9,14 +9,13 @@
 #ifndef CDBPERSISTENTSTORE_H
 #define CDBPERSISTENTSTORE_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
+#include "miscadmin.h"
 #include "access/persistentfilesysobjname.h"
 #include "catalog/gp_global_sequence.h"
 #include "storage/itemptr.h"
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "utils/rel.h"
+#include "utils/relcache.h"
 #include "cdb/cdbfilerepprimary.h"
 #include "cdb/cdbdirectopen.h"
 #include "utils/guc.h"
diff --git a/src/include/cdb/cdbpersistenttablespace.h b/src/include/cdb/cdbpersistenttablespace.h
index 5187d1bcbb729558af4ddbb7ebf6e8af2fe77845..a4a36e4397ce91428fbbaed7492f8f562f3bdca6 100755
--- a/src/include/cdb/cdbpersistenttablespace.h
+++ b/src/include/cdb/cdbpersistenttablespace.h
@@ -12,10 +12,7 @@
 #include "access/persistentfilesysobjname.h"
 #include "access/xlogmm.h"
 #include "cdb/cdbsharedoidsearch.h"
-#include "cdb/cdbdoublylinked.h"
-#include "storage/fd.h"
 #include "storage/itemptr.h"
-#include "utils/palloc.h"
 #include "cdb/cdbpersistentfilesysobj.h"
 
 extern void PersistentTablespace_Reset(void);
diff --git a/src/include/cdb/cdbrelsize.h b/src/include/cdb/cdbrelsize.h
index 1df00ed6cc811cf5291670394e60b82c960b6787..f925fa63ee105f1db8b0bccd96ed3ff1749637a7 100644
--- a/src/include/cdb/cdbrelsize.h
+++ b/src/include/cdb/cdbrelsize.h
@@ -12,7 +12,7 @@
 #ifndef CDBRELSIZE_H_
 #define CDBRELSIZE_H_
 
-#include "utils/rel.h"
+#include "utils/relcache.h"
 
 extern void clear_relsize_cache(void);
 
diff --git a/src/include/cdb/cdbsharedoidsearch.h b/src/include/cdb/cdbsharedoidsearch.h
index 3e5e9dd30dee085a88efd52633365230749a25a5..3c7be1c0c57fd7059bc4c4b247e9827ab93fba5b 100755
--- a/src/include/cdb/cdbsharedoidsearch.h
+++ b/src/include/cdb/cdbsharedoidsearch.h
@@ -9,10 +9,7 @@
 #ifndef CDBSHAREDOIDSEARCH_H
 #define CDBSHAREDOIDSEARCH_H
 
-#include "utils/palloc.h"
-#include "storage/fd.h"
 #include "cdb/cdbshareddoublylinked.h"
-#include "cdb/cdbsharedoidsearch.h"
 
 
 typedef struct SharedOidSearchFreeObjPool
diff --git a/src/include/cdb/cdbsreh.h b/src/include/cdb/cdbsreh.h
index 1b6f605f8c5f525cefb79688cc11d0ca67e46c31..145c3923cdef28a06949f17b63dd9a61574236c9 100644
--- a/src/include/cdb/cdbsreh.h
+++ b/src/include/cdb/cdbsreh.h
@@ -11,7 +11,6 @@
 #ifndef CDBSREH_H
 #define CDBSREH_H
 
-#include "c.h"
 #include "fmgr.h"
 #include "cdb/cdbcopy.h"
 #include "utils/memutils.h"
diff --git a/src/include/cdb/cdbsrlz.h b/src/include/cdb/cdbsrlz.h
index 1b5f7f5f26a766a1c3362f1c7c40a6d9e7ee897a..b2c451f0565f064f288e10cb0204b31e01cedf4d 100644
--- a/src/include/cdb/cdbsrlz.h
+++ b/src/include/cdb/cdbsrlz.h
@@ -13,12 +13,9 @@
 #ifndef CDBSRLZ_H
 #define CDBSRLZ_H
 
-#include "lib/stringinfo.h"
-#include "nodes/pg_list.h"
+#include "nodes/nodes.h"
 
 extern char *serializeNode(Node *node, int *size, int *uncompressed_size);
 extern Node *deserializeNode(const char *strNode, int size);
 
-
-
 #endif   /* CDBSRLZ_H */
diff --git a/src/include/cdb/cdbtm.h b/src/include/cdb/cdbtm.h
index eee7b9acdfaa6297b834b08aa3a74e20bc6731f4..ab02440adcaf0eb6f3f3cfe8d35d88ab037277a9 100644
--- a/src/include/cdb/cdbtm.h
+++ b/src/include/cdb/cdbtm.h
@@ -8,7 +8,6 @@
 #define CDBTM_H
 
 #include "storage/lwlock.h"
-#include "utils/hsearch.h"
 #include "lib/stringinfo.h"
 #include "access/xlogdefs.h"
 #include "cdb/cdbdistributedsnapshot.h"
diff --git a/src/include/cdb/htupfifo.h b/src/include/cdb/htupfifo.h
index f4e3dbf196e042391dfe730778f8f17437ef1b1b..d2963d8d6da3418970de3c2bdfa4ad586dcb3016 100644
--- a/src/include/cdb/htupfifo.h
+++ b/src/include/cdb/htupfifo.h
@@ -16,6 +16,8 @@
 #ifndef HTUPFIFO_H
 #define HTUPFIFO_H
 
+#include "access/htup.h"
+
 /* An entry in the HeapTuple FIFO.	Entries are formed into queues. */
 typedef struct htf_entry_data
 {
diff --git a/src/include/cdb/ml_ipc.h b/src/include/cdb/ml_ipc.h
index 824897cf3971f5ba58b2a84061d48bee7fade69b..f80dfbdd1008469a6163e370890dfde5c9965798 100644
--- a/src/include/cdb/ml_ipc.h
+++ b/src/include/cdb/ml_ipc.h
@@ -17,6 +17,7 @@
 #define IC_SHORT_PACKET_LIMIT (10) /* MPP-10351: treat some short-packets as drops */
 
 struct SliceTable;                          /* #include "nodes/execnodes.h" */
+struct EState;                              /* #include "nodes/execnodes.h" */
 
 /* listener filedescriptors */
 extern int		TCP_listenerFd;
@@ -100,10 +101,10 @@ extern int  GetSeqServerFD(void);
  *	 mySliceId - the index of the slice in the slicetable that we are a member of.
  *
  */
-extern void SetupInterconnect(EState *estate);
-extern void SetupUDPInterconnect(EState *estate);
-extern void SetupUDPIFCInterconnect(EState *estate);
-extern void SetupTCPInterconnect(EState *estate);
+extern void SetupInterconnect(struct EState *estate);
+extern void SetupUDPInterconnect(struct EState *estate);
+extern void SetupUDPIFCInterconnect(struct EState *estate);
+extern void SetupTCPInterconnect(struct EState *estate);
 
 /* The TeardownInterconnect() function should be called at the end of executing
  * a DML statement to close down all TCP socket resources that were setup during
diff --git a/src/include/cdb/tupser.h b/src/include/cdb/tupser.h
index da3cf49538fcb114946260c1a32d19127564d3ef..88fd5a5a1d41519bc7e6b8c0d255848c122320f6 100644
--- a/src/include/cdb/tupser.h
+++ b/src/include/cdb/tupser.h
@@ -79,6 +79,12 @@ typedef struct SerTupInfo
 	bool	   *nulls;
 }	SerTupInfo;
 
+/*
+ * forward declaration to avoid #including cdbmotion.h here, which would create a circular
+ * dependency
+ */
+struct directTransportBuffer;
+
 /* Populate a SerTupInfo struct with information looked up from the specified
  * tuple-descriptor.
  */