diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn
index be827ef5e573f047c187edc6f9fd5aed2fc67786..52bca6a68afb91bc41734b2fc512432f04d088eb 100644
--- a/es2panda/BUILD.gn
+++ b/es2panda/BUILD.gn
@@ -14,7 +14,8 @@
 import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
 import("//arkcompiler/ets_frontend/ets_frontend_config.gni")
 
-if ((defined(ark_standalone_build) && ark_standalone_build) || (defined(is_arkui_x) && is_arkui_x)) {
+if ((defined(ark_standalone_build) && ark_standalone_build) ||
+    (defined(is_arkui_x) && is_arkui_x)) {
   import("//arkcompiler/runtime_core/ark_config.gni")
 } else {
   import("//arkcompiler/ets_frontend/ark_config.gni")
@@ -431,13 +432,16 @@ ohos_static_library("es2panda_lib") {
       "//third_party/icu/icu4c/source/common",
       "//third_party/icu/icu4c/source/i18n",
       "//third_party/icu/icu4c/source",
+      "$ark_root/abc2program",
       "$ark_root/assembler",
+      "$ark_root/libpandafile",
       "$ark_root/libpandabase",
       "$ark_root/libpandabase/mem",
     ]
   } else {
     external_deps += [
       "icu:static_icuuc",
+      "runtime_core:arkabc2program_public_headers",
       "runtime_core:arkassembler_public_headers",
       "runtime_core:arkbase_public_headers",
       "runtime_core:arkfile_public_headers",
@@ -530,13 +534,16 @@ ohos_executable("es2panda") {
   ]
   if (ark_standalone_build || (defined(is_arkui_x) && is_arkui_x)) {
     include_dirs += [
+      "$ark_root/abc2program",
       "$ark_root/assembler",
+      "$ark_root/libpandafile",
       "$ark_root/libpandabase",
       "$ark_root/libpandabase/mem",
     ]
   } else {
     external_deps += [
       "icu:static_icuuc",
+      "runtime_core:arkabc2program_public_headers",
       "runtime_core:arkassembler_public_headers",
       "runtime_core:arkbase_public_headers",
       "runtime_core:arkfile_public_headers",
diff --git a/es2panda/aot/main.cpp b/es2panda/aot/main.cpp
index ae547863dc1ef07b3a5b2d5a6972e5f67c6a5c14..2bbd2ea31ca1bd5a1c51b65b7c2ddcd545548a6a 100644
--- a/es2panda/aot/main.cpp
+++ b/es2panda/aot/main.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <abc2program/program_dump.h>
+#include <program_dump.h>
 #include <mem/pool_manager.h>
 #include "utils/timers.h"
 
diff --git a/es2panda/compiler/core/compileQueue.h b/es2panda/compiler/core/compileQueue.h
index d0bd89cce4b308ab012d8f554966ca7d1cf7818a..68ba94bcf45b2fe7bd4fd41321cd9c2ba7b2c050 100644
--- a/es2panda/compiler/core/compileQueue.h
+++ b/es2panda/compiler/core/compileQueue.h
@@ -25,7 +25,7 @@
 #include <condition_variable>
 #include <mutex>
 
-#include <abc2program/abc2program_compiler.h>
+#include <abc2program_compiler.h>
 
 namespace panda::es2panda::binder {
 class FunctionScope;
diff --git a/es2panda/compiler/core/emitter/emitter.cpp b/es2panda/compiler/core/emitter/emitter.cpp
index 681de4c471fd27a7e012319f1b71aa3da57415ec..7664fc03261ee82586256fb97627ff4fcf8ddf58 100644
--- a/es2panda/compiler/core/emitter/emitter.cpp
+++ b/es2panda/compiler/core/emitter/emitter.cpp
@@ -15,7 +15,7 @@
 
 #include "emitter.h"
 
-#include <abc2program/common/abc_file_utils.h>
+#include <common/abc_file_utils.h>
 #include <compiler/base/literals.h>
 #include <compiler/core/compilerContext.h>
 #include <compiler/core/pandagen.h>
diff --git a/es2panda/es2panda.h b/es2panda/es2panda.h
index f8150524b96f08c20f934713fd3a97b72a564428..3b881ed63ba82862352ac991e0a9c186b90907d5 100644
--- a/es2panda/es2panda.h
+++ b/es2panda/es2panda.h
@@ -21,7 +21,7 @@
 #include <util/patchFix.h>
 #include <util/programCache.h>
 #include <util/symbolTable.h>
-#include <abc2program/abc2program_compiler.h>
+#include <abc2program_compiler.h>
 
 #include <string>
 #include <unordered_map>
diff --git a/es2panda/ir/statements/classDeclaration.cpp b/es2panda/ir/statements/classDeclaration.cpp
index d46af2e4ad03cf8741e5e1c0cb7cc0db842f31f9..abfc220179045ed478bdb5d586f3347b67f670b7 100644
--- a/es2panda/ir/statements/classDeclaration.cpp
+++ b/es2panda/ir/statements/classDeclaration.cpp
@@ -15,7 +15,7 @@
 
 #include "classDeclaration.h"
 
-#include <abc2program/common/abc_file_utils.h>
+#include <common/abc_file_utils.h>
 #include <compiler/base/lreference.h>
 #include <compiler/core/compilerContext.h>
 #include <compiler/core/emitter/emitter.h>
diff --git a/es2panda/util/helpers.cpp b/es2panda/util/helpers.cpp
index 4ef312d76ee8c4ec769d347c0864ea01ffc7e365..8d25180d969a9211d6a458b46689e0f2723de643 100644
--- a/es2panda/util/helpers.cpp
+++ b/es2panda/util/helpers.cpp
@@ -15,7 +15,7 @@
 
 #include "helpers.h"
 
-#include <abc2program/common/abc_file_utils.h>
+#include <common/abc_file_utils.h>
 #include <ir/base/classDefinition.h>
 #include <ir/base/property.h>
 #include <ir/base/scriptFunction.h>
diff --git a/es2panda/util/patchFix.h b/es2panda/util/patchFix.h
index db26b4a25e12f078c2755562b9858b636c8bd9b3..a1da88777877b28371fa569c3363027e4ac64c37 100644
--- a/es2panda/util/patchFix.h
+++ b/es2panda/util/patchFix.h
@@ -20,7 +20,7 @@
 #include <assembly-ins.h>
 #include <assembly-literals.h>
 #include <assembly-program.h>
-#include <libpandabase/utils/arena_containers.h>
+#include <utils/arena_containers.h>
 #include <util/helpers.h>
 #include <util/symbolTable.h>
 
diff --git a/es2panda/util/symbolTable.h b/es2panda/util/symbolTable.h
index ebba7cf0d4eecc67c8de3f93f14ae0404b8c7aeb..cae5fa9fb9176c8b3922319e44636705f9624921 100644
--- a/es2panda/util/symbolTable.h
+++ b/es2panda/util/symbolTable.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_SYMBOL_TABLE_H
 #define ES2PANDA_UTIL_SYMBOL_TABLE_H
 
-#include <libpandabase/utils/arena_containers.h>
+#include <utils/arena_containers.h>
 
 #include <mutex>
 
diff --git a/ets2panda/aot/main.cpp b/ets2panda/aot/main.cpp
index 8e1d99e3c2b547ef3ad3b972e3d111480d1865f1..df7b35d0dcd6d0e3dffaec26fa50696024d6b4f3 100644
--- a/ets2panda/aot/main.cpp
+++ b/ets2panda/aot/main.cpp
@@ -24,7 +24,7 @@
 #include "util/generateBin.h"
 #include "util/options.h"
 #include "util/plugin.h"
-#include "libpandabase/os/stacktrace.h"
+#include "os/stacktrace.h"
 #include "generated/diagnostic.h"
 
 #include <iostream>
diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.h b/ets2panda/declgen_ets2ts/declgenEts2Ts.h
index a8d1f5c148ab7c73247bf1a7e46b9f3aad71f20d..47079f8e23e5594a1806390092d2fb469c7a0575 100644
--- a/ets2panda/declgen_ets2ts/declgenEts2Ts.h
+++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.h
@@ -18,8 +18,8 @@
 
 #include "parser/program/program.h"
 #include "checker/ETSchecker.h"
-#include "libpandabase/os/file.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "os/file.h"
+#include "utils/arena_containers.h"
 #include "util/options.h"
 #include "util/diagnosticEngine.h"
 
diff --git a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
index 4d01ef2e30664d65fa490ffd00bc7bd4c2bcb745..19755d26a71ab85f0b5d02f0d047a1e3f7bfe37f 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
@@ -18,7 +18,7 @@
 
 #include "ir/base/classDefinition.h"
 #include "util/ustring.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 
 namespace ark::panda_file {
 class ClassDataAccessor;
diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
index fe5e9ac7d38d534a0d016ac881f0e619639ff43e..0ddd5a330f5ba53d74e2d8e07e5b0e3f82ab50c8 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H
 #define ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 #include "libpandafile/debug_info_extractor.h"
 #include "libpandafile/file.h"
 
diff --git a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
index 7a1c5d6305126ec86a9db865397e15a3af3ca88d..5eb1927e7159123cf067f5f0b86a5174ccf8ffd7 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
@@ -19,7 +19,7 @@
 #include "util/ustring.h"
 #include "ir/astNodeFlags.h"
 #include "generated/signatures.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 
 namespace ark::panda_file {
 class ClassDataAccessor;
diff --git a/ets2panda/evaluate/entityDeclarator.h b/ets2panda/evaluate/entityDeclarator.h
index 234d3007fbcce6c7a3162a946567ff88c3f87832..b066cb18695e9942f276a7ca2884e403dd2b864f 100644
--- a/ets2panda/evaluate/entityDeclarator.h
+++ b/ets2panda/evaluate/entityDeclarator.h
@@ -19,7 +19,7 @@
 #include "checker/ETSchecker.h"
 #include "evaluate/proxyProgramsCache.h"
 #include "evaluate/helpers.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 
 namespace ark::es2panda::parser {
 class Program;
diff --git a/ets2panda/evaluate/evaluateContext.h b/ets2panda/evaluate/evaluateContext.h
index 848719954f6edb5ae62a15d6b74a3640109257e4..daff23cce981406d20eb30726be0d17ee13bf707 100644
--- a/ets2panda/evaluate/evaluateContext.h
+++ b/ets2panda/evaluate/evaluateContext.h
@@ -19,7 +19,7 @@
 #include "util/ustring.h"
 #include "util/options.h"
 
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 #include "libpandafile/debug_info_extractor.h"
 #include "libpandafile/file.h"
 
diff --git a/ets2panda/evaluate/importExportTable.h b/ets2panda/evaluate/importExportTable.h
index 35f00ca3bb11d1b15741480524b7b2e13566d5b3..9c38071cad277f1ec69cf1c947459d50e78cffac 100644
--- a/ets2panda/evaluate/importExportTable.h
+++ b/ets2panda/evaluate/importExportTable.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H
 #define ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 
 namespace ark::es2panda::evaluate {
 
diff --git a/ets2panda/evaluate/irCheckHelper.h b/ets2panda/evaluate/irCheckHelper.h
index 01b034fd873d99cb7b570f8e3fc7565116a4a462..687573c4dd202f5a4b8838f75efe92022dcacc9f 100644
--- a/ets2panda/evaluate/irCheckHelper.h
+++ b/ets2panda/evaluate/irCheckHelper.h
@@ -16,8 +16,8 @@
 #ifndef ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H
 #define ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H
 
-#include "libpandabase/mem/arena_allocator.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "mem/arena_allocator.h"
+#include "utils/arena_containers.h"
 
 namespace ark::es2panda::checker {
 class ETSChecker;
diff --git a/ets2panda/evaluate/pathResolver.h b/ets2panda/evaluate/pathResolver.h
index e678a2240af0ac88f5e596a4463b01c992df5ae4..42139f49c323c1a70ccb34cfedb8e4a862580f46 100644
--- a/ets2panda/evaluate/pathResolver.h
+++ b/ets2panda/evaluate/pathResolver.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_PATH_RESOLVER_H
 #define ES2PANDA_EVALUATE_PATH_RESOLVER_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "utils/arena_containers.h"
 
 namespace ark::es2panda::evaluate {
 
diff --git a/ets2panda/evaluate/proxyProgramsCache.h b/ets2panda/evaluate/proxyProgramsCache.h
index 59211afa91e1aaf16eaf719b927ab3476e57e82e..55264127b49d0b21b8ab771b9a909af2c6bc3da8 100644
--- a/ets2panda/evaluate/proxyProgramsCache.h
+++ b/ets2panda/evaluate/proxyProgramsCache.h
@@ -18,8 +18,8 @@
 
 #include "util/ustring.h"
 
-#include "libpandabase/mem/arena_allocator.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "mem/arena_allocator.h"
+#include "utils/arena_containers.h"
 
 namespace ark::es2panda::parser {
 class Program;
diff --git a/ets2panda/parser/program/entityNameVisitor.h b/ets2panda/parser/program/entityNameVisitor.h
index e8f64ffc46900ce165d1f94ac2c7ace714da9649..83e9287ed3300f75f60c399025fc1f57c74a4f20 100644
--- a/ets2panda/parser/program/entityNameVisitor.h
+++ b/ets2panda/parser/program/entityNameVisitor.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H
 #define ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H
 
-#include "libpandabase/mem/arena_allocator.h"
+#include "mem/arena_allocator.h"
 #include "util/es2pandaMacros.h"
 #include "ir/visitor/IterateAstVisitor.h"
 #include "util/ustring.h"
diff --git a/ets2panda/public/public.h b/ets2panda/public/public.h
index 2e6fa5dba806d6279ed2343b503fb3c9c04461e9..fdb2cff29869c152918aace3a00773868dd97eda 100644
--- a/ets2panda/public/public.h
+++ b/ets2panda/public/public.h
@@ -20,7 +20,7 @@
 #include "public/es2panda_lib.h"
 
 #include "assembler/assembly-program.h"
-#include "libpandabase/mem/arena_allocator.h"
+#include "mem/arena_allocator.h"
 
 #include "compiler/core/compileQueue.h"
 #include "parser/ETSparser.h"
diff --git a/ets2panda/test/unit/ast_dumper_test.cpp b/ets2panda/test/unit/ast_dumper_test.cpp
index f7e590006198100678f9644e1c3154b0c02eb02e..d05b7581ae3fdf4a4fb74cad83bdabbaa90d11a2 100644
--- a/ets2panda/test/unit/ast_dumper_test.cpp
+++ b/ets2panda/test/unit/ast_dumper_test.cpp
@@ -27,7 +27,7 @@
 #include "es2panda.h"
 #include "util/arktsconfig.h"
 #include "util/generateBin.h"
-#include "libpandabase/mem/mem.h"
+#include "mem/mem.h"
 #include "test/utils/panda_executable_path_getter.h"
 #include "test/utils/asm_test.h"
 
diff --git a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
index c5310786f98a09fa512e9b11a5db6a52adf9f83c..3c7a6de6007f3a21c46d5b6b0cedba78c1a7c092 100644
--- a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
+++ b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
@@ -30,8 +30,8 @@
 #include "compiler/optimizer/ir/inst.h"
 #include "compiler/optimizer/ir/ir_constructor.h"
 #include "compiler/optimizer/optimizations/regalloc/reg_alloc_linear_scan.h"
-#include "libpandabase/utils/logger.h"
-#include "libpandabase/utils/utils.h"
+#include "utils/logger.h"
+#include "utils/utils.h"
 #include "mem/arena_allocator.h"
 #include "mem/pool_manager.h"
 #include "optimizer/ir/inst.h"
diff --git a/ets2panda/test/unit/extern_flag_test.cpp b/ets2panda/test/unit/extern_flag_test.cpp
index 85b3fd21adfed71a70e7a3bb921a0010fdd8b93d..5cf11d41e019fc2c9dc6224cd014511254baf4fc 100644
--- a/ets2panda/test/unit/extern_flag_test.cpp
+++ b/ets2panda/test/unit/extern_flag_test.cpp
@@ -17,7 +17,7 @@
 
 #include "assembler/assembly-program.h"
 #include "generated/signatures.h"
-#include "libpandabase/mem/mem.h"
+#include "mem/mem.h"
 #include "macros.h"
 #include "mem/pool_manager.h"
 #include "util/options.h"
diff --git a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
index 1bfb5a30effa8c3c2fcb7d418bc7b2b046e4f4c1..f4d0a106fc8b28051f531d3b4cf50ad08f519644 100644
--- a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
+++ b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
@@ -28,7 +28,7 @@
 #include "ir/base/methodDefinition.h"
 #include "public/public.h"
 #include "util/options.h"
-#include "abc2program/abc2program_driver.h"
+#include "abc2program_driver.h"
 
 // NOLINTBEGIN
 
diff --git a/ets2panda/test/unit/rest_parameter_flag_test.cpp b/ets2panda/test/unit/rest_parameter_flag_test.cpp
index 6a86bc31954191e0dd3d279ca74231b720e3f51e..fb6cb4ea3dbfd8fc7403da80300fcc0b1b642dc3 100644
--- a/ets2panda/test/unit/rest_parameter_flag_test.cpp
+++ b/ets2panda/test/unit/rest_parameter_flag_test.cpp
@@ -18,7 +18,7 @@
 #include "assembler/assembly-program.h"
 #include "es2panda.h"
 #include "generated/signatures.h"
-#include "libpandabase/mem/mem.h"
+#include "mem/mem.h"
 #include "macros.h"
 #include "mem/pool_manager.h"
 #include "test/utils/asm_test.h"
diff --git a/ets2panda/util/arktsconfig.cpp b/ets2panda/util/arktsconfig.cpp
index 557c238a340a71ef2c79f2487f508f8576a72417..93f122aaf6bce564e49a8214930216c7051bbcc3 100644
--- a/ets2panda/util/arktsconfig.cpp
+++ b/ets2panda/util/arktsconfig.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "arktsconfig.h"
-#include "libpandabase/os/filesystem.h"
+#include "os/filesystem.h"
 #include "util/language.h"
 #include "util/diagnosticEngine.h"
 #include "generated/signatures.h"
diff --git a/ets2panda/util/arktsconfig.h b/ets2panda/util/arktsconfig.h
index fec474785a06fc2237606dc25adce0ad5d7f9aff..f6b206d463984c626d0e7cdbbcc7588f6b13032e 100644
--- a/ets2panda/util/arktsconfig.h
+++ b/ets2panda/util/arktsconfig.h
@@ -25,8 +25,8 @@
 
 #include "util/language.h"
 #include "util/diagnostic.h"
-#include "libpandabase/utils/json_builder.h"
-#include "libpandabase/utils/json_parser.h"
+#include "utils/json_builder.h"
+#include "utils/json_parser.h"
 
 // NOTE(ivagin): If ARKTSCONFIG_USE_FILESYSTEM is not defined part of ArkTsConfig functionality is disabled.
 //       Only build configuration which prevents us from usage of std::filesystem is "MOBILE" build
diff --git a/ets2panda/util/dtoa_helper.cpp b/ets2panda/util/dtoa_helper.cpp
index 05a259cf9013d3c16e634c6fcd9d70b29f4bf1cb..a346757a5aa3945483d46cce9fc048946e23ed4a 100644
--- a/ets2panda/util/dtoa_helper.cpp
+++ b/ets2panda/util/dtoa_helper.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "dtoa_helper.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "globals.h"
 
 // Almost copy of ets_runtime/ecmascript/base/dtoa_helper.cpp
diff --git a/ets2panda/util/helpers.cpp b/ets2panda/util/helpers.cpp
index 6d102d6af7e3ad8896977f290fca368ad53599d6..aa296ae641bbd39fffa7e4a885118c78aec77865 100644
--- a/ets2panda/util/helpers.cpp
+++ b/ets2panda/util/helpers.cpp
@@ -51,7 +51,7 @@
 #include "ir/ts/tsInterfaceDeclaration.h"
 #include "ir/ts/tsEnumDeclaration.h"
 
-#include "libpandabase/utils/utf.h"
+#include "utils/utf.h"
 
 namespace ark::es2panda::util {
 // Helpers
diff --git a/ets2panda/util/importPathManager.cpp b/ets2panda/util/importPathManager.cpp
index e6d8a1e8b118a667dc39e6898a0199e58aa76edb..2acc261a378c604c4a9f79078bbfd87096c3f233 100644
--- a/ets2panda/util/importPathManager.cpp
+++ b/ets2panda/util/importPathManager.cpp
@@ -15,7 +15,7 @@
 
 #include "importPathManager.h"
 #include "es2panda.h"
-#include <libpandabase/os/filesystem.h>
+#include <os/filesystem.h>
 #include "util/arktsconfig.h"
 #include "util/diagnostic.h"
 #include "util/diagnosticEngine.h"
diff --git a/ets2panda/util/options.h b/ets2panda/util/options.h
index f7bf991b9cc2f70d0dfde0ce4b0367380075e8be..7524c76cb13e5f9c31d17a94017ff8de77642abd 100644
--- a/ets2panda/util/options.h
+++ b/ets2panda/util/options.h
@@ -16,8 +16,8 @@
 #ifndef ES2PANDA_UTIL_OPTIONS_H
 #define ES2PANDA_UTIL_OPTIONS_H
 
-#include "libpandabase/os/file.h"
-#include "libpandabase/utils/logger.h"
+#include "os/file.h"
+#include "utils/logger.h"
 #include "util/helpers.h"
 #include "utils/pandargs.h"
 #include "arktsconfig.h"
diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn
index fef25713a9de4d182f110bec2a725c27486841c6..d767be4eac339d82cf52b23a601814ee7ec4563d 100644
--- a/merge_abc/BUILD.gn
+++ b/merge_abc/BUILD.gn
@@ -13,7 +13,8 @@
 
 import("//arkcompiler/ets_frontend/ets_frontend_config.gni")
 
-if ((defined(ark_standalone_build) && ark_standalone_build) || (defined(is_arkui_x) && is_arkui_x)) {
+if ((defined(ark_standalone_build) && ark_standalone_build) ||
+    (defined(is_arkui_x) && is_arkui_x)) {
   import("//arkcompiler/runtime_core/ark_config.gni")
 } else {
   import("//arkcompiler/ets_frontend/ark_config.gni")
@@ -45,7 +46,6 @@ protobuf_snapshot_generator_sources = [
 
 config("panda_assembly_proto_public_config") {
   include_dirs = [
-    "$ark_root",
     "src",
     "$proto_out_dir",
     "../es2panda",
@@ -54,21 +54,17 @@ config("panda_assembly_proto_public_config") {
 }
 
 if (ark_standalone_build || is_arkui_x) {
-  assembly_proto_configs = [ 
+  assembly_proto_configs = [
     "$ark_root:ark_config",
     "$ark_root/assembler:arkassembler_public_config",
     "$ark_root/libpandafile:arkfile_public_config",
     "$ark_root/libpandabase:arkbase_public_config",
   ]
 } else {
-  assembly_proto_configs = [
-    "//arkcompiler/ets_frontend:ark_config"
-  ]
+  assembly_proto_configs = [ "//arkcompiler/ets_frontend:ark_config" ]
 }
 
-assembly_proto_configs += [
-  ":panda_assembly_proto_public_config",
-]
+assembly_proto_configs += [ ":panda_assembly_proto_public_config" ]
 
 if (defined(is_arkui_x) && is_arkui_x) {
   assembly_proto_configs += [ sdk_libc_secshared_config ]
@@ -189,15 +185,19 @@ ohos_source_set("assembly_proto_static") {
   }
   if (!ark_standalone_build && !is_arkui_x) {
     external_deps += [
+      "runtime_core:arkabc2program_public_headers",
       "runtime_core:arkassembler_public_headers",
       "runtime_core:arkbase_public_headers",
       "runtime_core:arkfile_public_headers",
+      "runtime_core:arkplatform_public_headers",
     ]
   } else {
     include_dirs += [
+      "$ark_root/abc2program",
       "$ark_root/assembler",
       "$ark_root/libpandabase",
       "$ark_root/libpandabase/mem",
+      "$ark_root/libpandafile",
     ]
   }
 
@@ -246,13 +246,14 @@ ohos_executable("merge_abc") {
   external_deps = []
 
   if (ark_standalone_build || is_arkui_x) {
-    configs = [ 
+    configs = [
       "$ark_root:ark_config",
       "$ark_root/assembler:arkassembler_public_config",
       "$ark_root/libpandafile:arkfile_public_config",
       "$ark_root/libpandabase:arkbase_public_config",
     ]
     include_dirs += [
+      "$ark_root/abc2program",
       "$ark_root/assembler",
       "$ark_root/libpandabase",
       "$ark_root/libpandabase/mem",
@@ -260,9 +261,11 @@ ohos_executable("merge_abc") {
   } else {
     configs = [ "//arkcompiler/ets_frontend:ark_config" ]
     external_deps += [
+      "runtime_core:arkabc2program_public_headers",
       "runtime_core:arkassembler_public_headers",
       "runtime_core:arkbase_public_headers",
       "runtime_core:arkfile_public_headers",
+      "runtime_core:arkplatform_public_headers",
     ]
   }