diff --git a/tensorflow_lite_support/cc/task/core/BUILD b/tensorflow_lite_support/cc/task/core/BUILD
index c7f80b9ec..bfd00fa8c 100644
--- a/tensorflow_lite_support/cc/task/core/BUILD
+++ b/tensorflow_lite_support/cc/task/core/BUILD
@@ -20,6 +20,7 @@ cc_library_with_tflite(
         # to get included in the executable.
         "@org_tensorflow//tensorflow/lite/kernels:builtin_ops",
         "@org_tensorflow//tensorflow/lite:framework_stable",
+        "@org_tensorflow//tensorflow/lite/c:c_api",
         "@org_tensorflow//tensorflow/lite/tools:verifier",
         "//tensorflow_lite_support/cc/port:tflite_wrapper",
     ],
@@ -38,6 +39,7 @@ cc_library_with_tflite(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@org_tensorflow//tensorflow/lite:kernel_api",
+        "@org_tensorflow//tensorflow/lite/core/api:error_reporter",
         "@org_tensorflow//tensorflow/lite/core/api:op_resolver",
     ],
 )
diff --git a/tensorflow_lite_support/cc/task/core/tflite_engine.cc b/tensorflow_lite_support/cc/task/core/tflite_engine.cc
index 6ad112465..61ffceda0 100644
--- a/tensorflow_lite_support/cc/task/core/tflite_engine.cc
+++ b/tensorflow_lite_support/cc/task/core/tflite_engine.cc
@@ -19,18 +19,28 @@ limitations under the License.
 #include <unistd.h>
 #endif
 
+#include <stddef.h>
+
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "absl/status/status.h"  // from @com_google_absl
 #include "absl/strings/match.h"  // from @com_google_absl
 #include "absl/strings/str_cat.h"  // from @com_google_absl
-#include "tensorflow/lite/builtin_ops.h"
-#include "tensorflow/lite/kernels/register.h"
-#include "tensorflow/lite/stderr_reporter.h"
+#include "tensorflow/lite/c/c_api.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/interpreter_builder.h"
+#include "tensorflow/lite/model_builder.h"
 #include "tensorflow/lite/tools/verifier.h"
 #include "tensorflow_lite_support/cc/common.h"
 #include "tensorflow_lite_support/cc/port/configuration_proto_inc.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/task/core/external_file_handler.h"
+#include "tensorflow_lite_support/cc/task/core/proto/external_file_proto_inc.h"
+#include "tensorflow_lite_support/metadata/cc/metadata_extractor.h"
 
 namespace tflite {
 namespace task {
diff --git a/tensorflow_lite_support/cc/task/core/tflite_engine.h b/tensorflow_lite_support/cc/task/core/tflite_engine.h
index 919cae925..b1eba8d33 100644
--- a/tensorflow_lite_support/cc/task/core/tflite_engine.h
+++ b/tensorflow_lite_support/cc/task/core/tflite_engine.h
@@ -16,16 +16,23 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_SUPPORT_CC_TASK_CORE_TFLITE_ENGINE_H_
 #define TENSORFLOW_LITE_SUPPORT_CC_TASK_CORE_TFLITE_ENGINE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "absl/memory/memory.h"  // from @com_google_absl
 #include "absl/status/status.h"  // from @com_google_absl
 #include "absl/strings/string_view.h"  // from @com_google_absl
 #include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/core/api/op_resolver.h"
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/kernels/register.h"
 #include "tensorflow/lite/model.h"
+#include "tensorflow/lite/model_builder.h"
 #include "tensorflow_lite_support/cc/port/configuration_proto_inc.h"
 #include "tensorflow_lite_support/cc/port/tflite_wrapper.h"
 #include "tensorflow_lite_support/cc/task/core/error_reporter.h"