diff --git a/arkguard/test/grammar/wildcard_filename/keep_filename1/myfilename*.ts b/arkguard/test/grammar/wildcard_filename/keep_filename1/myfilename*.ts
deleted file mode 100644
index d7aae6d9c1551e959302a0de347b09c8565c0b17..0000000000000000000000000000000000000000
--- a/arkguard/test/grammar/wildcard_filename/keep_filename1/myfilename*.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import assert from 'assert';
-import path from 'path';
-
-const fileName: string = path.basename(__filename);
-assert(fileName === 'myfilename*.ts', 'success');
\ No newline at end of file
diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn
index a7d027eff524491a00c579190885a3e525b7ee38..4d2aa7560e08b8d65cf3fb66cb181c8ddf89300e 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,24 +1095,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") {
@@ -1144,6 +1135,9 @@ ohos_source_set("libes2panda_frontend_static") {
     ":isa_gen_es2panda_isa_h",
   ]
   external_deps = [
+    "runtime_core:assembler_headers",
+    "runtime_core:runtime_gen_headers",
+    "runtime_core:libpandabase_headers",
     "runtime_core:libarktsassembler_package",
     "runtime_core:libarktsbase_package",
     "runtime_core:libarktscompiler_package",
@@ -1155,8 +1149,11 @@ ohos_source_set("libes2panda_frontend_static") {
       "$ark_third_party_root/icu/icu4c:static_icui18n",
       "$ark_third_party_root/icu/icu4c:static_icuuc",
     ]
+    libes2panda_configs += [ "$ark_root/libpandafile:arkfile_public_config" ]
+
   } else {
     external_deps += [
+      "runtime_core:libpandafile_headers",
       "icu:static_icui18n",
       "icu:static_icuuc",
     ]
@@ -1199,7 +1196,10 @@ ohos_source_set("libes2panda_public_frontend_static") {
   deps = [ ":libes2panda_frontend_static" ]
 
   if (ark_standalone_build || ark_static_standalone_build) {
+    libes2panda_public_configs += [ "$ark_root/libpandafile:arkfile_public_config" ]
     deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package" ]
+  } else {
+    external_deps = [ "runtime_core:libpandafile_headers" ]
   }
 
   if (target_os != "win" && target_os != "mingw" && target_os != "winuwp") {
@@ -1207,7 +1207,13 @@ ohos_source_set("libes2panda_public_frontend_static") {
     defines = [ "ES2PANDA_COMPILE_BY_GN" ]
   }
 
-  external_deps = [
+  external_deps += [
+    "runtime_core:assembler_headers",
+    "runtime_core:runtime_gen_headers",
+    "runtime_core:libpandabase_headers",
+    "runtime_core:bytecode_optimizer_headers",
+    "runtime_core:runtime_headers",
+    "runtime_core:verification_headers",
     "runtime_core:libarktsbytecodeopt_package",
     sdk_libc_secshared_dep,
   ]
diff --git a/ets2panda/aot/BUILD.gn b/ets2panda/aot/BUILD.gn
index 0a8d75cffd5c6a880a53e3d4721e60d59b3b342b..a3e5822100776250713be94030ca7dda644e05f0 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 = [
@@ -44,14 +39,23 @@ ohos_executable("ets2panda") {
   ]
 
   if (ark_standalone_build) {
+    config += [ "$ark_root/libpandafile:arkfile_public_config" ]
     deps += [
       "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package",
       "$ark_root/libpandabase:libarktsbase_package",
       "$ark_root/libpandafile:libarktsfile_package",
     ]
+  } else {
+    external_deps = [ "runtime_core:libpandafile_headers" ]
   }
 
-  external_deps = [
+  external_deps += [
+    "runtime_core:assembler_headers",
+    "runtime_core:runtime_gen_headers",
+    "runtime_core:libpandabase_headers",
+    "runtime_core:bytecode_optimizer_headers",
+    "runtime_core:runtime_headers",
+    "runtime_core:verification_headers",
     "runtime_core:libarktsassembler_package",
     "runtime_core:libarktsbase_package",
     "runtime_core:libarktsbytecodeopt_package",