diff --git a/examples/models/llama/runner/CMakeLists.txt b/examples/models/llama/runner/CMakeLists.txt
index afbe12d7304..fefee61092d 100644
--- a/examples/models/llama/runner/CMakeLists.txt
+++ b/examples/models/llama/runner/CMakeLists.txt
@@ -53,7 +53,7 @@ else()
 endif()
 
 set(llama_runner_deps executorch_core extension_data_loader extension_module
-                      extension_tensor
+                      extension_tensor extension_flat_tensor
 )
 
 target_link_libraries(llama_runner PUBLIC ${llama_runner_deps})
diff --git a/examples/models/llava/runner/CMakeLists.txt b/examples/models/llava/runner/CMakeLists.txt
index dff1ee9a064..1f9d6fa8e1d 100644
--- a/examples/models/llava/runner/CMakeLists.txt
+++ b/examples/models/llava/runner/CMakeLists.txt
@@ -41,7 +41,7 @@ add_subdirectory(
 add_library(llava_runner STATIC ${_llava_runner__srcs})
 
 set(llava_runner_deps executorch_core extension_data_loader extension_llm_runner
-                      extension_module extension_tensor
+                      extension_module extension_tensor extension_flat_tensor
 )
 
 target_link_libraries(llava_runner PUBLIC ${llava_runner_deps})
diff --git a/extension/android/CMakeLists.txt b/extension/android/CMakeLists.txt
index 3a1fe79d8f5..b2f7b8d9f47 100644
--- a/extension/android/CMakeLists.txt
+++ b/extension/android/CMakeLists.txt
@@ -72,6 +72,7 @@ list(
   link_libraries
   executorch
   extension_data_loader
+  extension_flat_tensor
   extension_module
   extension_runner_util
   extension_tensor
diff --git a/tools/cmake/cmake_deps.toml b/tools/cmake/cmake_deps.toml
index 21cfde1bf23..748eb775921 100644
--- a/tools/cmake/cmake_deps.toml
+++ b/tools/cmake/cmake_deps.toml
@@ -198,7 +198,6 @@ filters = [
 deps = [
   "extension_flat_tensor_schema",
   "executorch_core",
-  "executorch",
 ]
 
 [targets.extension_module]
@@ -209,9 +208,9 @@ filters = [
   ".cpp$",
 ]
 deps = [
-  "executorch",
   "executorch_core",
   "extension_data_loader",
+  "extension_flat_tensor",
 ]
 
 [targets.extension_runner_util]
@@ -236,6 +235,8 @@ deps = [
   "executorch",
   "executorch_core",
   "extension_module",
+  "extension_data_loader",
+  "extension_flat_tensor",
   "extension_runner_util",
   "extension_tensor",
 ]
@@ -452,6 +453,7 @@ deps = [
   "executorch",
   "executorch_core",
   "extension_data_loader",
+  "extension_flat_tensor",
   "extension_module",
   "extension_threadpool",
   "optimized_cpublas",
diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake
index 56c7fa2d7d4..a8e756fbb77 100644
--- a/tools/cmake/executorch-config.cmake
+++ b/tools/cmake/executorch-config.cmake
@@ -66,6 +66,7 @@ set(lib_list
     etdump
     bundled_program
     extension_data_loader
+    extension_flat_tensor
     ${FLATCCRT_LIB}
     coreml_util
     coreml_inmemoryfs