diff --git a/src/backend/cdb/cdbllize.c b/src/backend/cdb/cdbllize.c
index 67b31e7afe22b25ddd289b35e2c1f69bd83bc5a7..9ec054e9cf98e906360408fc279e39cd97e89573 100644
--- a/src/backend/cdb/cdbllize.c
+++ b/src/backend/cdb/cdbllize.c
@@ -35,7 +35,6 @@
 #include "cdb/cdbplan.h"
 #include "cdb/cdbpullup.h"
 #include "cdb/cdbllize.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbmutate.h"
 #include "optimizer/tlist.h"
 
diff --git a/src/backend/cdb/cdbpathlocus.c b/src/backend/cdb/cdbpathlocus.c
index 6a8d3069b18f5f7b384280536acc4ba78f6e49bc..b3e9d7e0334e3a19d8b1718cd0f8f22432b57cf2 100644
--- a/src/backend/cdb/cdbpathlocus.c
+++ b/src/backend/cdb/cdbpathlocus.c
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#include "cdb/cdbcat.h"         /* GpPolicy */
+#include "catalog/gp_policy.h"         /* GpPolicy */
 #include "cdb/cdbdef.h"         /* CdbSwap() */
 #include "cdb/cdbpullup.h"      /* cdbpullup_missing_var_walker() */
 #include "nodes/makefuncs.h"    /* makeVar() */
diff --git a/src/backend/cdb/cdbutil.c b/src/backend/cdb/cdbutil.c
index 28414129de5f4d3d5b22f87b952f73185f68df87..b086e5fd0085a84b58979c797b70a531c5116db3 100644
--- a/src/backend/cdb/cdbutil.c
+++ b/src/backend/cdb/cdbutil.c
@@ -29,7 +29,6 @@
 #include "utils/memutils.h"
 #include "catalog/gp_configuration.h"
 #include "catalog/gp_segment_config.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbutil.h"
 #include "nodes/execnodes.h"	/* Slice, SliceTable */
 #include "cdb/cdbmotion.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 245092d51f0a00d582fae7e5d202344c101f4111..cbd8fd4e53e72d54bcf0106e55d75c3bba9b917a 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -66,7 +66,6 @@
 #include "cdb/cdbsreh.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbpersistentdatabase.h"
 #include "cdb/cdbpersistentrelation.h"
 #include "cdb/cdbmirroredfilesysobj.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index fb1d2be77ac63e00a1fc43bb9534e29a440f23fd..d0e5747e7ded8dfd80328d5530f60629eca691c7 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -36,7 +36,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 
 static void AlterSchemaOwner_internal(cqContext  *pcqCtx, 
 									  HeapTuple tup, Relation rel, Oid newOwnerId);
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 843a4a806899eb032566c21514311c8ce8cd60b6..fefe7003c03db42f12d08632c9939da5f9d76d2b 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -39,7 +39,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbmotion.h"
 #include "cdb/ml_ipc.h"
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index d323cc4f5674c2f23fdb98b6757b54d350ee0716..544cf3f54c578222b42cc663a5c64d3ed100cb13 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -110,7 +110,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbrelsize.h"
 #include "cdb/cdboidsync.h"
 #include "cdb/cdbsreh.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 5f38970ec30bbd1cbcb59b39aecaffbc7bd75214..874015c1391ebf6125dd260c35c416d2eaef2df5 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -45,7 +45,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 
 
 typedef struct genericPair
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 2b54e45e7cd58616cdf81d7f5f8a4205de69fb8b..46b6d458d13a5b16e646c3edae8a8b4c8e6314d5 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -82,7 +82,6 @@
 
 #include "cdb/cdbappendonlyam.h"
 #include "cdb/cdbaocsam.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbdispatchresult.h"
 #include "cdb/cdbexplain.h"             /* cdbexplain_sendExecStats() */
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a7d60733a3a8b6fcb6ca1e3b00231bc9c0f11bb8..a6215a04852358053872190510116c1dcc2034b8 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -73,7 +73,7 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
-#include "cdb/cdbcat.h"         /* GpPolicy */
+#include "catalog/gp_policy.h"         /* GpPolicy */
 #include "cdb/cdbtm.h"
 #include "cdb/cdbvars.h"        /* Gp_role */
 #include "cdb/cdbmirroredflatfile.h"
diff --git a/src/include/cdb/cdbcat.h b/src/include/cdb/cdbcat.h
index c9be55e291271f28e8d4ae8c0cf41806bd2178f5..826e8c8d37299b13df56d7100db6c2e1355c44b2 100644
--- a/src/include/cdb/cdbcat.h
+++ b/src/include/cdb/cdbcat.h
@@ -11,10 +11,8 @@
 #ifndef CDBCAT_H
 #define CDBCAT_H
 
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/gp_id.h"
-#include "catalog/gp_policy.h"
+#include "access/attnum.h"
+#include "utils/relcache.h"
 
 extern void checkPolicyForUniqueIndex(Relation rel, AttrNumber *indattr,
 									  int nidxatts, bool isprimary,