diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn
index a7d027eff524491a00c579190885a3e525b7ee38..f5fb55822666c6264522c8b7338f1f3970cc72b1 100644
--- a/ets2panda/BUILD.gn
+++ b/ets2panda/BUILD.gn
@@ -23,12 +23,14 @@ 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",
     "$ark_es2panda_root",
   ]
+  if (ark_static_standalone_build) {
+    include_dirs += [ "$target_gen_dir/generated" ]
+  }
 }
 
 libes2panda_sources = [
@@ -1096,24 +1098,16 @@ 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",
 ]
 
 ohos_shared_library("libes2panda") {
@@ -1155,8 +1149,17 @@ ohos_source_set("libes2panda_frontend_static") {
       "$ark_third_party_root/icu/icu4c:static_icui18n",
       "$ark_third_party_root/icu/icu4c:static_icuuc",
     ]
+    configs += [
+      "$ark_root/assembler:arkassembler_public_config",
+      "$ark_root/libpandabase:arkbase_public_config",
+      "$ark_root/libpandafile:arkfile_public_config",
+    ]
   } else {
     external_deps += [
+      "runtime_core:assembler_headers",
+      "runtime_core:runtime_gen_headers",
+      "runtime_core:libpandabase_headers",
+      "runtime_core:libpandafile_headers",
       "icu:static_icui18n",
       "icu:static_icuuc",
     ]
@@ -1198,10 +1201,6 @@ ohos_source_set("libes2panda_public_frontend_static") {
 
   deps = [ ":libes2panda_frontend_static" ]
 
-  if (ark_standalone_build || ark_static_standalone_build) {
-    deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package" ]
-  }
-
   if (target_os != "win" && target_os != "mingw" && target_os != "winuwp") {
     deps += [ ":generate_ets2panda_info" ]
     defines = [ "ES2PANDA_COMPILE_BY_GN" ]
@@ -1211,6 +1210,28 @@ ohos_source_set("libes2panda_public_frontend_static") {
     "runtime_core:libarktsbytecodeopt_package",
     sdk_libc_secshared_dep,
   ]
+
+  if (ark_standalone_build || ark_static_standalone_build) {
+    configs += [
+      "$ark_root/assembler:arkassembler_public_config",
+      "$ark_root/libpandabase:arkbase_public_config",
+      "$ark_root/libpandafile:arkfile_public_config",
+      "$ark_root/bytecode_optimizer:bytecodeopt_public_config",
+      "$ark_root/runtime:arkruntime_public_config", 
+    ]
+    deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package" ]
+  } else {
+    external_deps += [
+      "runtime_core:assembler_headers",
+      "runtime_core:runtime_gen_headers",
+      "runtime_core:libpandabase_headers",
+      "runtime_core:libpandafile_headers",
+      "runtime_core:bytecode_optimizer_headers",
+      "runtime_core:runtime_headers",
+      "runtime_core:verification_headers",
+    ]
+  }
+
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
diff --git a/ets2panda/aot/BUILD.gn b/ets2panda/aot/BUILD.gn
index 0a8d75cffd5c6a880a53e3d4721e60d59b3b342b..5428b70674dc5b8641d3feb130476dab78ae8573 100644
--- a/ets2panda/aot/BUILD.gn
+++ b/ets2panda/aot/BUILD.gn
@@ -29,13 +29,8 @@ 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 = [
@@ -43,14 +38,6 @@ ohos_executable("ets2panda") {
     "$ark_es2panda_root:libes2panda_public_frontend_static",
   ]
 
-  if (ark_standalone_build) {
-    deps += [
-      "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package",
-      "$ark_root/libpandabase:libarktsbase_package",
-      "$ark_root/libpandafile:libarktsfile_package",
-    ]
-  }
-
   external_deps = [
     "runtime_core:libarktsassembler_package",
     "runtime_core:libarktsbase_package",
@@ -60,6 +47,31 @@ ohos_executable("ets2panda") {
     sdk_libc_secshared_dep,
   ]
 
+  if (ark_standalone_build || ark_static_standalone_build) {
+    configs += [ 
+      "$ark_root/assembler:arkassembler_public_config",
+      "$ark_root/libpandafile:arkfile_public_config",
+      "$ark_root/libpandabase:arkbase_public_config",
+      "$ark_root/bytecode_optimizer:bytecodeopt_public_config",
+      "$ark_root/runtime:arkruntime_public_config",
+    ]
+    deps += [
+      "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package",
+      "$ark_root/libpandabase:libarktsbase_package",
+      "$ark_root/libpandafile:libarktsfile_package",
+    ]
+  } else {
+      external_deps += [
+        "runtime_core:assembler_headers",
+        "runtime_core:runtime_gen_headers",
+        "runtime_core:libpandafile_headers",
+        "runtime_core:libpandabase_headers",
+        "runtime_core:bytecode_optimizer_headers",
+        "runtime_core:runtime_headers",
+        "runtime_core:verification_headers",
+      ]
+  }
+
   if (defined(ohos_indep_compiler_enable) && ohos_indep_compiler_enable) {
     external_deps += [ "icu:shared_icuuc" ]
   }