diff --git a/extension/llm/runner/CMakeLists.txt b/extension/llm/runner/CMakeLists.txt
index dd6fb2e3b00..9696737f471 100644
--- a/extension/llm/runner/CMakeLists.txt
+++ b/extension/llm/runner/CMakeLists.txt
@@ -43,7 +43,7 @@ target_include_directories(
 
 add_library(extension_llm_runner STATIC ${_extension_llm_runner__srcs})
 
-set(runner_deps executorch extension_module extension_tensor)
+set(runner_deps executorch_core extension_module extension_tensor)
 
 target_link_libraries(extension_llm_runner PUBLIC ${runner_deps})
 
diff --git a/tools/cmake/cmake_deps.toml b/tools/cmake/cmake_deps.toml
index 748eb775921..78befd62aac 100644
--- a/tools/cmake/cmake_deps.toml
+++ b/tools/cmake/cmake_deps.toml
@@ -196,7 +196,6 @@ filters = [
   ".cpp$",
 ]
 deps = [
-  "extension_flat_tensor_schema",
   "executorch_core",
 ]
 
@@ -232,8 +231,9 @@ filters = [
   ".cpp$",
 ]
 deps = [
-  "executorch",
   "executorch_core",
+  "extension_data_loader",
+  "extension_flat_tensor",
   "extension_module",
   "extension_data_loader",
   "extension_flat_tensor",
@@ -249,7 +249,6 @@ filters = [
   ".cpp$",
 ]
 deps = [
-  "executorch",
   "executorch_core",
 ]
 
@@ -261,7 +260,6 @@ filters = [
   ".cpp$",
 ]
 deps = [
-  "executorch",
   "executorch_core",
 ]
 
@@ -455,6 +453,7 @@ deps = [
   "extension_data_loader",
   "extension_flat_tensor",
   "extension_module",
+  "extension_tensor",
   "extension_threadpool",
   "optimized_cpublas",
   "portable_kernels",