diff --git a/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h b/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h
index 6fabf8e2846218bc471e1aa07ff7ff6ae17f6ba9..b976e1d231978ef3690253beacb7a984ab7bf870 100644
--- a/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h
+++ b/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h
@@ -13,6 +13,8 @@
 
 #include "gpos/base.h"
 #include "gpos/common/CMainArgs.h"
+#include "gpos/common/CStackObject.h"
+#include "gpos/task/ITask.h"
 
 // helper macros
 #define GPOS_UNITTEST_FUNC(x)			gpos::CUnittest(#x, CUnittest::EttStandard, x)
diff --git a/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h b/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h
index 936e854c38a9f48b3abc6e0dab6d921634593164..67900e601143d24afd221fa6c8ae57f7a2aa225f 100644
--- a/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h
+++ b/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h
@@ -16,6 +16,7 @@
 #include "gpopt/base/CAutoOptCtxt.h"
 #include "gpopt/base/CColRef.h"
 #include "gpopt/base/CQueryContext.h"
+#include "gpopt/base/CRange.h"
 #include "gpopt/engine/CEnumeratorConfig.h"
 #include "gpopt/mdcache/CMDAccessor.h"
 #include "gpopt/metadata/CTableDescriptor.h"
diff --git a/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp b/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp
index 2404bf63f9fb5334501d04fd297fecdc0d2253d5..e53a6a2f78031e5c63fb23eeb58ffbcaa9a18e83 100644
--- a/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp
+++ b/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp
@@ -20,6 +20,7 @@
 #include "unittest/gpopt/CSubqueryTestUtils.h"
 
 #include "naucrates/md/CMDIdGPDB.h"
+#include "naucrates/md/IMDTypeBool.h"
 
 using namespace gpopt;
 
diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp b/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp
index b2f231e822a319f7499e39bafac457bf74f2a582..d8cd53c8c5d2b6b1fd839e18f62c594893e4108e 100644
--- a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp
@@ -1,9 +1,10 @@
 //	Greenplum Database
 //	Copyright (C) 2018 Pivotal, Inc.
 
+#include "gpos/io/COstreamString.h"
 #include "unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h"
 #include "naucrates/dxl/xml/CXMLSerializer.h"
- #include "unittest/gpopt/CTestUtils.h"
+#include "unittest/gpopt/CTestUtils.h"
 #include "gpopt/optimizer/COptimizerConfig.h"
 #include "naucrates/dxl/CDXLUtils.h"
 
diff --git a/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp b/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp
index 320281c5ccfbc1e040a37439845c94de05ebe946..0439df822db70a04c56ffad796026adb1067121b 100644
--- a/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp
@@ -8,6 +8,7 @@
 //	@doc:
 //		Tests for datum classes
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp b/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp
index f7293915fc5ba37f84e28ec9f158b59174ce1870..cbce291ddc5eb9f448cbb436ff969c4264008f3e 100644
--- a/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp
@@ -13,6 +13,8 @@
 #define __STDC_CONSTANT_MACROS
 #endif
 
+#include "gpos/io/COstreamString.h"
+
 #include "naucrates/statistics/CPoint.h"
 #include "naucrates/statistics/CBucket.h"
 #include "naucrates/statistics/CHistogram.h"
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp b/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp
index 6191c079f681ff4b099ad4b740e10504241cc32f..d8d3e8b887f290395daddace161034bf059e7f31 100644
--- a/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp
@@ -15,6 +15,7 @@
 
 #include <stdint.h>
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp b/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp
index 082d9d9adffec7152c484e338b3a26bd11b8982f..3f034bd83a71c4c07be4f56eb1fab935e7634d79 100644
--- a/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp
@@ -15,6 +15,7 @@
 
 #include <stdint.h>
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp b/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp
index fd78b416fb4089ebe5016baae30e023acedb789a..608a2005d41718dc3832b9914bff6b9f499a4bf9 100644
--- a/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp
+++ b/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp
@@ -15,6 +15,7 @@
 
 #include <stdint.h>
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp
index feff1e02196c73495de731e3e2d6b95969bbfbfb..44ad8714c07d056bea6c1627eec5b4d7f978b5ea 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp
@@ -9,6 +9,8 @@
 //		Tests for distribution specification
 //---------------------------------------------------------------------------
 
+#include "gpos/error/CAutoTrace.h"
+
 #include "naucrates/md/IMDTypeInt4.h"
 #include "naucrates/md/CMDProviderMemory.h"
 
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp
index 0cfe3b56da507ac37995bba2250b261fe93aaaf1..0be52b6b9a0a24e7649c56eabdf0192e293aa41e 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp
@@ -8,6 +8,8 @@
 //	@doc:
 //		Tests for functional dependencies
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
+
 #include "gpopt/base/CFunctionalDependency.h"
 #include "gpopt/eval/CConstExprEvaluatorDefault.h"
 
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp
index 1665659fe3872173ac4bcde0620877691b88f945..af14e4eeabe4ffae6c4d000b31935bb98062ffc5 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp
@@ -11,6 +11,8 @@
 #include "unittest/base.h"
 #include "unittest/gpopt/base/CRangeTest.h"
 
+#include "gpos/error/CAutoTrace.h"
+
 #include "naucrates/base/CDatumInt2GPDB.h"
 #include "naucrates/base/CDatumInt4GPDB.h"
 #include "naucrates/base/CDatumInt8GPDB.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp
index 758b14fda052c76bc4ecda8814d3e2bddf19bc82..2c5f30ff892aabab2ba0768a5e21ccbfe50e9cc4 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp
@@ -8,6 +8,7 @@
 //	@doc:
 //		Test for CEngine
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/task/CAutoTraceFlag.h"
 
 #include "gpopt/base/CUtils.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp
index 67c30a75c6a9b58ba2527b5ea1f2165b5bc1673e..ea41fee0eb5c230257677ad23d0a2f8ebb49eb81 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp
@@ -9,6 +9,7 @@
 //		Test for CEngine
 //---------------------------------------------------------------------------
 #include "gpos/base.h"
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/memory/CAutoMemoryPool.h"
 #include "gpos/task/CAutoTraceFlag.h"
 #include "gpos/test/CUnittest.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp
index 75e941b6cfef204eb3e0d97db2c8a573323aaaa9..0b157864c1062b3b95a72f127d821cb8d3a976d3 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp
@@ -9,6 +9,7 @@
 //		Test for installcheck-good bugs
 //---------------------------------------------------------------------------
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/task/CAutoTraceFlag.h"
 
 #include "gpopt/base/CAutoOptCtxt.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp
index 62efecea7c5c31d733dd7c75fcfea15f5dd321b7..5e15ed15fd283f5210f4d91c8cfbcccb0cdaccb4 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp
@@ -10,6 +10,7 @@
 //---------------------------------------------------------------------------
 #include <string.h>
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 #include "gpos/task/CAutoTraceFlag.h"
@@ -21,6 +22,7 @@
 #include "gpopt/operators/CPredicateUtils.h"
 #include "gpopt/operators/CScalarProjectElement.h"
 #include "gpopt/operators/CLogicalNAryJoin.h"
+#include "gpopt/operators/CLogicalSelect.h"
 #include "gpopt/operators/CLogicalInnerJoin.h"
 #include "gpopt/operators/CLogicalLeftOuterJoin.h"
 #include "gpopt/operators/CExpressionUtils.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp
index e934185c85b50c8ae9664a1faa660de019e65bad..de5cc00c9d80ee0eddfcaa8636d6cbc55af21db3 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp
@@ -8,6 +8,7 @@
 //	@doc:
 //		Test for CExpression
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp
index 87103775bedbdb48955760e590dcbbb208780ecc..871beaecaf803728ab340ac8397032188a7a0423 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp
@@ -8,6 +8,8 @@
 //	@doc:
 //		Test for predicate utilities
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
+
 #include "gpopt/base/CColRefSetIter.h"
 #include "gpopt/base/CUtils.h"
 #include "gpopt/eval/CConstExprEvaluatorDefault.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp
index 48aaf34ff647e9169696b77cc8f3f959c398ae74..d9750d6bd6f711cf088305b3a50df129a3a66760 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp
@@ -8,6 +8,8 @@
 //	@doc:
 //		Test for optimization jobs
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
+
 #include "gpopt/engine/CEngine.h"
 #include "gpopt/eval/CConstExprEvaluatorDefault.h"
 #include "gpopt/operators/CLogicalInnerJoin.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp
index a4b738b35007192045d6f494a74e2a78c7caf161..afa2d6e5ca216ad6057a7072eb6a7ad7901d31bb 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp
@@ -13,6 +13,7 @@
 #include "gpopt/engine/CEngine.h"
 #include "gpopt/eval/CConstExprEvaluatorDefault.h"
 #include "gpopt/search/CSearchStage.h"
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/task/CAutoTraceFlag.h"
 #include "gpopt/xforms/CXformFactory.h"
 
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp
index cdf4da163df92256cedfca3b3060b8c8179ace1a..e0b4169f23ed9932c8ae86525454a4a5e7e5adfb 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp
@@ -9,6 +9,7 @@
 //		Test of tree map facility
 //---------------------------------------------------------------------------
 
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/types.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp
index 7bebe2d2dffa744f0e51390760e441ab94442774..c0c399d7f504df207b9a2fe95984bfc6d0f05df8 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp
@@ -8,6 +8,7 @@
 //	@doc:
 //		Test for join ordering
 //---------------------------------------------------------------------------
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/test/CUnittest.h"