diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h b/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h
index 3b5764973bf5efec7e9c755d9a77eccbd4f500a7..c22e5d6f6ab8368a79af9cc2b90cd1609f1dd96c 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h
@@ -14,6 +14,8 @@
 #include "gpos/base.h"
 #include "gpos/common/CList.h"
 
+#include "gpos/task/ITask.h"
+
 namespace gpopt
 {
 	using namespace gpos;
diff --git a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp b/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp
index 09576d9f8b8ccfd845c94d45319122afa0507be4..2c7c66025458bff4c65b39147ac34356af3d1b33 100644
--- a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp
@@ -10,6 +10,7 @@
 //---------------------------------------------------------------------------
 
 #include "gpos/base.h"
+#include "gpos/task/IWorker.h"
 
 #include "gpopt/base/CPrintPrefix.h"
 
diff --git a/src/backend/gporca/libgpos/include/gpos/base.h b/src/backend/gporca/libgpos/include/gpos/base.h
index 1fe960cc74917a34817e541abd86f42f26214b6f..b7c1aadab020e40185d5b74bae282119eff9b328 100644
--- a/src/backend/gporca/libgpos/include/gpos/base.h
+++ b/src/backend/gporca/libgpos/include/gpos/base.h
@@ -19,7 +19,6 @@
 #include "gpos/error/IErrorContext.h"
 #include "gpos/error/ILogger.h"
 #include "gpos/memory/CMemoryPool.h"
-#include "gpos/task/ITask.h"
 
 #endif // GPOS_base_H
 
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h b/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h
index 6fed60e3bd1d4944d6100bf2e3acf0c246172ea0..e8918d6a6338181a2d85f15d061dffe5f0553271 100644
--- a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h
+++ b/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h
@@ -24,6 +24,7 @@
 #include "gpos/utils.h"
 
 #include "gpos/common/CAutoP.h"
+#include "gpos/task/ITask.h"
 
 #define BYTES_PER_ULONG (GPOS_SIZEOF(ULONG))
 #define BITS_PER_ULONG  (BYTES_PER_ULONG * 8)
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h b/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h
index 0dfb84926374e43f5e1a3a9c5682451687772367..92482416b9002a3f5d4bf7e6ea768c8a006f2d9a 100644
--- a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h
+++ b/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h
@@ -20,6 +20,8 @@
 
 #include "gpos/base.h"
 
+#include "gpos/common/CStackObject.h"
+
 namespace gpos
 {
 
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h b/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h
index 9e6da9ae2acdd4612ea6824f12118f161b0ec5e1..4d5a5e9ac91847ece4413ffc60f61296f20761a8 100644
--- a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h
+++ b/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h
@@ -12,6 +12,7 @@
 #define GPOS_CAutoTrace_H
 
 #include "gpos/base.h"
+#include "gpos/common/CStackObject.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/string/CWStringDynamic.h"
 
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h b/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h
index 11049860b074a9d7734693ea3e04d3c4d2157edb..b3d6fb1f696eb1d914ddf9545857f69cc7591071 100644
--- a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h
+++ b/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h
@@ -12,6 +12,7 @@
 #define GPOS_CMiniDumper_H
 
 #include "gpos/base.h"
+#include "gpos/common/CStackObject.h"
 #include "gpos/io/COstream.h"
 
 namespace gpos
diff --git a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp b/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp
index f11dca8b494356af3cc0b3a660c2467f9d8dabd9..8ccf1e4697031e626c16a2b264d6e8474bfb0f52 100644
--- a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp
+++ b/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp
@@ -11,6 +11,8 @@
 
 #include "gpos/error/CAutoTrace.h"
 
+#include "gpos/task/ITask.h"
+
 using namespace gpos;
 
 //---------------------------------------------------------------------------
diff --git a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp b/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp
index 9878e419e56011502eacf347210c3d3b665825b3..f32f26837b07de24a2abda81b90d886a8d7c3bb9 100644
--- a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp
+++ b/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp
@@ -14,6 +14,7 @@
 #include "gpos/io/ioutils.h"
 #include "gpos/io/CFileDescriptor.h"
 #include "gpos/string/CStringStatic.h"
+#include "gpos/task/IWorker.h"
 
 using namespace gpos;
 
diff --git a/src/backend/gporca/libgpos/src/io/CFileReader.cpp b/src/backend/gporca/libgpos/src/io/CFileReader.cpp
index 9020f39c223b1b9aaf28e190ed283f697fd719e5..3018ad1e96d6edad1cced945d272b1552ec67517 100644
--- a/src/backend/gporca/libgpos/src/io/CFileReader.cpp
+++ b/src/backend/gporca/libgpos/src/io/CFileReader.cpp
@@ -12,6 +12,7 @@
 #include "gpos/base.h"
 #include "gpos/io/ioutils.h"
 #include "gpos/io/CFileReader.h"
+#include "gpos/task/IWorker.h"
 
 using namespace gpos;
 
diff --git a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp b/src/backend/gporca/libgpos/src/io/CFileWriter.cpp
index efd7035ca179ebe97e131caa36ca2fa400f7201e..aa8531af46e45568abfea97574e4d3758aac4752 100644
--- a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp
+++ b/src/backend/gporca/libgpos/src/io/CFileWriter.cpp
@@ -14,6 +14,7 @@
 #include "gpos/base.h"
 #include "gpos/io/ioutils.h"
 #include "gpos/io/CFileWriter.h"
+#include "gpos/task/IWorker.h"
 
 using namespace gpos;
 
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
index 59ffde94533c4054015570a719ad510f74fe5757..a234553a42a332f100935cfc1277f839c794a58d 100644
--- a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
+++ b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
@@ -22,6 +22,7 @@
 #include "gpos/common/CStackDescriptor.h"
 #include "gpos/memory/CMemoryVisitorPrint.h"
 #include "gpos/string/CWStringStatic.h"
+#include "gpos/task/ITask.h"
 
 using namespace gpos;
 
diff --git a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp b/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp
index b5eac656fe8e5d02bba698a236f274b4175cbd99..2a0d7349f2cd68c793783d57c1744e09f38dc96d 100644
--- a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp
+++ b/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp
@@ -10,6 +10,7 @@
 //---------------------------------------------------------------------------
 
 #include "gpos/base.h"
+#include "gpos/error/CAutoTrace.h"
 #include "gpos/task/CAutoTraceFlag.h"
 
 using namespace gpos;