diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn
index 7542df6a822ddc6850425f03258452460e168413..5539326f47123e9d3dd6f97207589fb60a411b7f 100644
--- a/ets2panda/BUILD.gn
+++ b/ets2panda/BUILD.gn
@@ -23,7 +23,6 @@ config("libes2panda_public_config") {
   include_dirs = [
     "$target_gen_dir",
     "$target_gen_dir/include",
-    "$target_gen_dir/generated",
     "//third_party/icu/icu4c/source/common",
     "//third_party/icu/icu4c/source/i18n",
     "//third_party/icu/icu4c/source",
@@ -1096,23 +1095,15 @@ config("libes2panda_config") {
 }
 
 libes2panda_configs = [
-  "$ark_root/assembler:arkassembler_public_config",
   "$ark_root:ark_config",
   ":libes2panda_public_config",
   ":libes2panda_config",
-  "$ark_root/libpandabase:arkbase_public_config",
-  "$ark_root/libpandafile:arkfile_public_config",
 ]
 
 libes2panda_public_configs = [
-  "$ark_root/assembler:arkassembler_public_config",
   "$ark_root:ark_config",
   ":libes2panda_public_config",
   ":libes2panda_config",
-  "$ark_root/libpandabase:arkbase_public_config",
-  "$ark_root/libpandafile:arkfile_public_config",
-  "$ark_root/bytecode_optimizer:bytecodeopt_public_config",
-  "$ark_root/compiler:arkcompiler_public_config",
   "$ark_root/runtime:arkruntime_public_config",
 ]
 
@@ -1146,6 +1137,9 @@ ohos_source_set("libes2panda_frontend_static") {
     "$ark_third_party_root/icu/icu4c:static_icuuc",
   ]
   external_deps = [
+    "runtime_core:runtime_core_generated_headers",
+    "runtime_core:libpandafile_generate_headers",
+    "runtime_core:libpandabase_generated_headrs",
     "runtime_core:libarktsassembler_package",
     "runtime_core:libarktsbase_package",
     "runtime_core:libarktscompiler_package",
@@ -1199,6 +1193,12 @@ ohos_source_set("libes2panda_public_frontend_static") {
   }
 
   external_deps = [
+    "runtime_core:runtime_core_generated_headers",
+    "runtime_core:libpandafile_generate_headers",
+    "runtime_core:libpandabase_generated_headrs",
+    "runtime_core:bytecode_optimizer_generate_headers",
+    "runtime_core:compiler_generated_headers",
+    "runtime_core:gen_generate_headers",
     "runtime_core:libarktsbytecodeopt_package",
     sdk_libc_secshared_dep,
   ]
diff --git a/ets2panda/aot/BUILD.gn b/ets2panda/aot/BUILD.gn
index 2a76c53b3d2214e54eb8041d586d43d357d518bf..8760bb5daabf0b406a0d94d7322426e41d5f1d6a 100644
--- a/ets2panda/aot/BUILD.gn
+++ b/ets2panda/aot/BUILD.gn
@@ -29,13 +29,7 @@ ohos_executable("ets2panda") {
 
   configs = [
     "$ark_root:ark_config",
-    "$ark_root/assembler:arkassembler_public_config",
     "$ark_es2panda_root:libes2panda_public_config",
-    "$ark_root/libpandafile:arkfile_public_config",
-    "$ark_root/libpandabase:arkbase_public_config",
-    "$ark_root/bytecode_optimizer:bytecodeopt_public_config",
-    "$ark_root/compiler:arkcompiler_public_config",
-    "$ark_root/runtime:arkruntime_public_config",
   ]
 
   deps = [
@@ -52,6 +46,14 @@ ohos_executable("ets2panda") {
   }
 
   external_deps = [
+    "runtime_core:runtime_generated_headers",
+    "runtime_core:runtime_core_generated_headers",
+    "runtime_core:libpandafile_generate_headers",
+    "runtime_core:bytecode_optimizer_generate_headers",
+    "runtime_core:libpandabase_generated_headrs",
+    "runtime_core:compiler_generated_headers",
+    "runtime_core:runtime_headers",
+    "runtime_core:gen_generate_headers",
     "runtime_core:libarktsassembler_package",
     "runtime_core:libarktsbase_package",
     "runtime_core:libarktsbytecodeopt_package",