diff --git a/BUILD.gn b/BUILD.gn
index eeb318d6af4cf513f2d79da39e891e8f7857e6ae..b14ae7b2bf7746ee8dbc7278d2763805acd20c5f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1746,6 +1746,7 @@ ohos_shared_library("libark_jsruntime") {
       "icu:shared_icuuc",
       "runtime_core:arkplatform_header",
       "runtime_core:common_interfaces_header",
+      "runtime_core:runtime_core_header",
     ]
   }
   innerapi_tags = [ "platformsdk_indirect" ]
diff --git a/common_components/base/atomic_spin_lock.h b/common_components/base/atomic_spin_lock.h
index f267cd4465eb575de4ddb26636de63db9391d50e..777792b229dd4f9af0e4a4e89c79ffed6df14d82 100755
--- a/common_components/base/atomic_spin_lock.h
+++ b/common_components/base/atomic_spin_lock.h
@@ -18,7 +18,7 @@
 
 #include <atomic>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 class AtomicSpinLock {
diff --git a/common_components/base/c_string.h b/common_components/base/c_string.h
index 959607a29bc6c1ba57620c1e3f847e1b99deaecd..36a1e4817f99d372860fbc02c2a68838cedc59f7 100755
--- a/common_components/base/c_string.h
+++ b/common_components/base/c_string.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cstdlib>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include "securec.h"
 
 namespace common {
diff --git a/common_components/base/globals.h b/common_components/base/globals.h
index 6321c957962379d50b6191782090dd7205abe996..9ad5ec1e35437d132a1a638465401487c729a69f 100755
--- a/common_components/base/globals.h
+++ b/common_components/base/globals.h
@@ -19,7 +19,7 @@
 #include <cstddef>
 
 #include "common_components/base/ark_sanitizer.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 // Time Factors
diff --git a/common_components/base/spin_lock.h b/common_components/base/spin_lock.h
index bfe8b7157867dc09702dd21b51bff179f5373f46..34fb539dd03fb8ba951ee6c2f3b5a31757325b2f 100755
--- a/common_components/base/spin_lock.h
+++ b/common_components/base/spin_lock.h
@@ -18,7 +18,7 @@
 
 #include <pthread.h>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 class SpinLock {
diff --git a/common_components/base/time_utils.h b/common_components/base/time_utils.h
index 049ff029de9a8b5373d071e343f8dbbd37f08298..7335408adad8a10687cac7c4c4cda80f2275f3cc 100755
--- a/common_components/base/time_utils.h
+++ b/common_components/base/time_utils.h
@@ -19,7 +19,7 @@
 #include <cinttypes>
 
 #include "common_components/base/c_string.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 namespace TimeUtil {
diff --git a/common_components/base/utf_helper.h b/common_components/base/utf_helper.h
index b2c7e02494e0784b4df4c09ab227fc3793131d24..d0dd8556ecf9136b3f8e0924eba9175a40cd7ced 100644
--- a/common_components/base/utf_helper.h
+++ b/common_components/base/utf_helper.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common::utf_helper {
 constexpr size_t HI_SURROGATE_MIN = 0xd800;
diff --git a/common_components/common/base_object.h b/common_components/common/base_object.h
index 51b818cd584d7f1b505586a69453ab4383b850c1..a8233de1860011c0c94eca7029b32265474edf7d 100755
--- a/common_components/common/base_object.h
+++ b/common_components/common/base_object.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_COMPONENTS_COMMON_BASE_OBJECT_H
 #define COMMON_COMPONENTS_COMMON_BASE_OBJECT_H
 
-#include "common_interfaces/objects/base_object.h"
+#include "objects/base_object.h"
 namespace common {
 using common::BaseObject;
 using ObjectPtr = BaseObject*;
diff --git a/common_components/common/work_stack.h b/common_components/common/work_stack.h
index b42928753e1611bb2b6d87c9775909ab9fe28ff9..5da721da7af2bf093817417fc85699fa6d22bcb4 100644
--- a/common_components/common/work_stack.h
+++ b/common_components/common/work_stack.h
@@ -19,7 +19,7 @@
 #include <mutex>
 #include <type_traits>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include "common_components/log/log.h"
 
 namespace common {
diff --git a/common_components/common_runtime/base_runtime_param.h b/common_components/common_runtime/base_runtime_param.h
index d8b68cd2e63ab99eb45154731c09587d87691528..412b3efb023effffbec435dbe226758db0a5129d 100755
--- a/common_components/common_runtime/base_runtime_param.h
+++ b/common_components/common_runtime/base_runtime_param.h
@@ -17,8 +17,8 @@
 #define COMMON_COMPONENTS_BASE_RUNTIME_BASE_RUNTIME_PARAM_H
 
 #include "common_components/base/globals.h"
-#include "common_interfaces/base/common.h"
-#include "common_interfaces/base/runtime_param.h"
+#include "base/common.h"
+#include "base/runtime_param.h"
 
 namespace common {
 class BaseRuntimeParam {
diff --git a/common_components/common_runtime/hooks.h b/common_components/common_runtime/hooks.h
index a59c64f5b813c6c7865b674b5e8a4bda18df6852..d2fc9cecf1140e743cd0d71f27889f80d48bf978 100644
--- a/common_components/common_runtime/hooks.h
+++ b/common_components/common_runtime/hooks.h
@@ -18,8 +18,8 @@
 
 #include <cstdint>
 
-#include "common_interfaces/heap/heap_visitor.h"
-#include "common_interfaces/thread/mutator_base.h"
+#include "heap/heap_visitor.h"
+#include "thread/mutator_base.h"
 
 // Visitor that iterate all `RefField`s in a TaggedObject and add them to
 // `LocalMarkStack` Should be moved to BaseRT and panda namespace later
diff --git a/common_components/heap/allocator/memory_map.h b/common_components/heap/allocator/memory_map.h
index b8ef42950976050bc2f3bc4470ec98cd4146db41..ec2c502c38e3d76aea6c662377d046621a54290d 100755
--- a/common_components/heap/allocator/memory_map.h
+++ b/common_components/heap/allocator/memory_map.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_COMPONENTS_HEAP_ALLOCATOR_ALLOC_MEM_MAP_H
 #define COMMON_COMPONENTS_HEAP_ALLOCATOR_ALLOC_MEM_MAP_H
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #ifdef _WIN64
 #include <handleapi.h>
 #include <memoryapi.h>
diff --git a/common_components/heap/allocator/regional_heap.h b/common_components/heap/allocator/regional_heap.h
index 2bc0cc98d5c982ac558a5541bbd8e73f045aa1d8..6104a0da4352cf23fded615370856a44ba8efa4e 100755
--- a/common_components/heap/allocator/regional_heap.h
+++ b/common_components/heap/allocator/regional_heap.h
@@ -39,7 +39,7 @@
 #if defined(COMMON_SANITIZER_SUPPORT)
 #include "common_components/sanitizer/sanitizer_interface.h"
 #endif
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 
 namespace common {
 class Taskpool;
diff --git a/common_components/heap/ark_collector/ark_collector.h b/common_components/heap/ark_collector/ark_collector.h
index a26e5786f1e78636d5cecaec9298eb1293399ac8..5c7176a5789ed3dadcac311f8f63b1f691a67322 100755
--- a/common_components/heap/ark_collector/ark_collector.h
+++ b/common_components/heap/ark_collector/ark_collector.h
@@ -21,7 +21,7 @@
 #include "common_components/heap/allocator/regional_heap.h"
 #include "common_components/heap/collector/copy_data_manager.h"
 #include "common_components/heap/collector/marking_collector.h"
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 
 namespace common {
 
diff --git a/common_components/heap/collector/collector.h b/common_components/heap/collector/collector.h
index fe65398193a5b0ac6cfbb3aab5ecf5f4cba4cafb..d1c3cb2ff00fc18e26dc55ce8a32c9849be97ae5 100755
--- a/common_components/heap/collector/collector.h
+++ b/common_components/heap/collector/collector.h
@@ -26,8 +26,8 @@
 #include "common_components/common/base_object.h"
 #include "common_components/heap/collector/gc_request.h"
 #include "common_components/heap/collector/gc_stats.h"
-#include "common_interfaces/thread/mutator_base.h"
-#include "common_interfaces/base/runtime_param.h"
+#include "thread/mutator_base.h"
+#include "base/runtime_param.h"
 
 namespace common {
 enum CollectorType {
diff --git a/common_components/heap/collector/gc_request.h b/common_components/heap/collector/gc_request.h
index b3269ee6ce0166d1faed894593a3d7c37c6020c9..58fdf86bf8e472fa96d3c229044899d786d92cf4 100755
--- a/common_components/heap/collector/gc_request.h
+++ b/common_components/heap/collector/gc_request.h
@@ -19,7 +19,7 @@
 #include <limits>
 
 #include "common_components/base/globals.h"
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 
 namespace common {
 // Minimum time between async GC (heuristic, native).
diff --git a/common_components/heap/collector/gc_stats.h b/common_components/heap/collector/gc_stats.h
index ceb21991b8dfa3789c51b3abcffba27366fd873e..40405b2743765441f7902e8ea197b76608491c34 100755
--- a/common_components/heap/collector/gc_stats.h
+++ b/common_components/heap/collector/gc_stats.h
@@ -25,7 +25,7 @@
 #include "common_components/base/immortal_wrapper.h"
 #include "common_components/heap/collector/gc_request.h"
 #include "common_components/log/log.h"
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 
 namespace common {
 // statistics for previous gc.
diff --git a/common_components/heap/collector/heuristic_gc_policy.h b/common_components/heap/collector/heuristic_gc_policy.h
index 4b5ba71fb24beec85b25a1769e87ad2ea41f9987..a539cdda40dc30e4639c6dea667f7da87391ee9f 100644
--- a/common_components/heap/collector/heuristic_gc_policy.h
+++ b/common_components/heap/collector/heuristic_gc_policy.h
@@ -17,7 +17,7 @@
 #define COMMON_COMPONENTS_HEAP_HEURISTIC_GC_POLICY_H
 
 #include "common_components/base/globals.h"
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 #include "common_components/taskpool/taskpool.h"
 #include "common_components/log/log.h"
 
diff --git a/common_components/heap/heap.h b/common_components/heap/heap.h
index e3b548e9df4723dc834a4519f3d9e051c7fed311..ddc6761bcebeb950fa4282d00da1e6e2574beaf0 100755
--- a/common_components/heap/heap.h
+++ b/common_components/heap/heap.h
@@ -25,9 +25,9 @@
 #include "common_components/heap/barrier/barrier.h"
 #include "common_components/heap/collector/collector.h"
 #include "common_components/heap/collector/heuristic_gc_policy.h"
-#include "common_interfaces/base/runtime_param.h"
-#include "common_interfaces/base_runtime.h"
-#include "common_interfaces/profiler/heap_profiler_listener.h"
+#include "base/runtime_param.h"
+#include "base_runtime.h"
+#include "profiler/heap_profiler_listener.h"
 
 namespace common {
 class Allocator;
diff --git a/common_components/heap/heap_manager.h b/common_components/heap/heap_manager.h
index cbb15c4b23c3f701e32aad8211360484273892dd..5a62313deb9288f480eebe4925d3c159c97c509b 100755
--- a/common_components/heap/heap_manager.h
+++ b/common_components/heap/heap_manager.h
@@ -18,7 +18,7 @@
 
 #include "common_components/common/type_def.h"
 #include "common_components/heap/collector/gc_request.h"
-#include "common_interfaces/base/runtime_param.h"
+#include "base/runtime_param.h"
 
 namespace common {
 class BaseObject;
diff --git a/common_components/heap/space/regional_space.h b/common_components/heap/space/regional_space.h
index d8fcef3838cd7dacb3db0dc02ddcdef2e587016d..91c43e92c8c0c0bf08bd65088da604ed481b9d52 100644
--- a/common_components/heap/space/regional_space.h
+++ b/common_components/heap/space/regional_space.h
@@ -22,7 +22,7 @@
 #include <thread>
 #include <vector>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include "common_components/heap/allocator/alloc_util.h"
 #include "common_components/heap/allocator/allocator.h"
 #include "common_components/heap/allocator/region_manager.h"
diff --git a/common_components/log/log_base.h b/common_components/log/log_base.h
index 00806123ccfeee9763e1a3df85c14df69719ea25..7f794cf5fc1e90cdd6ef90f2ac810ba9739419bd 100644
--- a/common_components/log/log_base.h
+++ b/common_components/log/log_base.h
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <sstream>
  
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
  
 enum class Level: uint8_t {
     VERBOSE,
diff --git a/common_components/mutator/mutator.h b/common_components/mutator/mutator.h
index f534e1afefe27a1b3e5305b339731d249261dcdb..385a4c90ba99e575c2a977910add64af12dc4009 100755
--- a/common_components/mutator/mutator.h
+++ b/common_components/mutator/mutator.h
@@ -22,8 +22,8 @@
 #include "common_components/heap/collector/gc_infos.h"
 #include "common_components/mutator/thread_local.h"
 #include "common_components/mutator/satb_buffer.h"
-#include "common_interfaces/thread/mutator_base.h"
-#include "common_interfaces/thread/thread_holder.h"
+#include "thread/mutator_base.h"
+#include "thread/thread_holder.h"
 
 namespace common {
 class Mutator;
diff --git a/common_components/mutator/mutator.inline.h b/common_components/mutator/mutator.inline.h
index f84e79c41763fd36d20b08b1ed44338e7015e273..07002acf737769b5d1006108b52197e9e2410da1 100755
--- a/common_components/mutator/mutator.inline.h
+++ b/common_components/mutator/mutator.inline.h
@@ -17,7 +17,7 @@
 #define COMMON_COMPONENTS_MUTATOR_MUTATOR_INLINE_H
 
 #include "common_components/mutator/mutator_manager.h"
-#include "common_interfaces/thread/mutator_base-inl.h"
+#include "thread/mutator_base-inl.h"
 
 namespace common {
 inline void Mutator::DoEnterSaferegion()
diff --git a/common_components/objects/string_table/hashtriemap-inl.h b/common_components/objects/string_table/hashtriemap-inl.h
index d6c89eb4a4c52acb3facef2a189219ab731cb6fa..de6a1a6c89eb00dc2dcc5f6cce5ffc15d250ed1b 100644
--- a/common_components/objects/string_table/hashtriemap-inl.h
+++ b/common_components/objects/string_table/hashtriemap-inl.h
@@ -17,8 +17,8 @@
 #define COMMON_COMPONENTS_OBJECTS_STRING_TABLE_HASHTRIEMAP_INL_H
 
 #include "common_components/log/log.h"
-#include "common_interfaces/objects/readonly_handle.h"
-#include "common_interfaces/objects/base_string.h"
+#include "objects/readonly_handle.h"
+#include "objects/base_string.h"
 #include "common_components/objects/string_table/hashtriemap.h"
 #include "common_components/objects/string_table/integer_cache.h"
 
diff --git a/common_components/objects/string_table/hashtriemap.h b/common_components/objects/string_table/hashtriemap.h
index 4a51642851c7843e929f2a074fd735bb68194484..b6c8a86a07a33dc91c34c6ccb2b5c6c95cb75abb 100644
--- a/common_components/objects/string_table/hashtriemap.h
+++ b/common_components/objects/string_table/hashtriemap.h
@@ -18,8 +18,8 @@
 
 #include "common_components/heap/heap.h"
 #include "common_components/log/log.h"
-#include "common_interfaces/objects/readonly_handle.h"
-#include "common_interfaces/objects/base_string.h"
+#include "objects/readonly_handle.h"
+#include "objects/base_string.h"
 
 namespace panda::ecmascript {
 class TaggedObject;
diff --git a/common_components/objects/string_table/integer_cache.h b/common_components/objects/string_table/integer_cache.h
index 0c875414bb4d9a47488af125ab6e818eef462340..e697ffe2c01bbf76fa31fd246b77adf3e6206691 100644
--- a/common_components/objects/string_table/integer_cache.h
+++ b/common_components/objects/string_table/integer_cache.h
@@ -17,7 +17,7 @@
 #define COMMON_COMPONENTS_OBJECTS_STRING_TABLE_INTEGER_CACHE_H
 
 #include <array>
-#include "common_interfaces/objects/base_string.h"
+#include "objects/base_string.h"
 
 namespace common {
 
diff --git a/common_components/objects/string_table_internal.h b/common_components/objects/string_table_internal.h
index 0834bd1e47f84dcca2b9f3a414fc2cc4139016a2..d1921af0ef06e8ffa6ca23386c2a2f985ab82370 100644
--- a/common_components/objects/string_table_internal.h
+++ b/common_components/objects/string_table_internal.h
@@ -18,8 +18,8 @@
 
 #include "common_components/base/globals.h"
 #include "common_components/platform/mutex.h"
-#include "common_interfaces/thread/thread_holder.h"
-#include "common_interfaces/objects/base_string_table.h"
+#include "thread/thread_holder.h"
+#include "objects/base_string_table.h"
 #include "common_components/objects/string_table/hashtriemap.h"
 #include "common_components/taskpool/task.h"
 
diff --git a/common_components/platform/mutex.h b/common_components/platform/mutex.h
index 08ec3ec7e76761a92c3152b2b79a7f5199f1cf6d..bddf551ced1830e3e285411188ff9e7150e7d51b 100644
--- a/common_components/platform/mutex.h
+++ b/common_components/platform/mutex.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_COMPONENTS_PLATFORM_MUTEX_H
 #define COMMON_COMPONENTS_PLATFORM_MUTEX_H
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include "thread/thread_state_transition.h"
 
 #ifdef DEBUG
diff --git a/common_components/taskpool/runner.h b/common_components/taskpool/runner.h
index a9c1ad4e9697092d09966b7fdb5be0e34bcc9f36..d25e6846680e22969bf75396c8949f8b00f357b6 100644
--- a/common_components/taskpool/runner.h
+++ b/common_components/taskpool/runner.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 #include "common_components/taskpool/task_queue.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 static constexpr uint32_t MIN_TASKPOOL_THREAD_NUM = 3;
diff --git a/common_components/taskpool/task.h b/common_components/taskpool/task.h
index 102439db1b5a9594694af2c2bdcfc166ae42a15e..135b246401aee12773e8892c4d1b5881e1256236 100644
--- a/common_components/taskpool/task.h
+++ b/common_components/taskpool/task.h
@@ -20,7 +20,7 @@
 #include <condition_variable>
 #include <mutex>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 enum class TaskType : uint8_t {
diff --git a/common_components/taskpool/task_queue.h b/common_components/taskpool/task_queue.h
index bfdbe5109688dd3d661d3a6a2ad91cf0add7f844..562ff3750a7e0e5f5164c13b8561329c1f528249 100644
--- a/common_components/taskpool/task_queue.h
+++ b/common_components/taskpool/task_queue.h
@@ -27,7 +27,7 @@
 #include <condition_variable>
 
 #include "common_components/taskpool/task.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 using SteadyTimePoint = std::chrono::steady_clock::time_point;
diff --git a/common_components/taskpool/taskpool.h b/common_components/taskpool/taskpool.h
index 95b1f0420a8fee9da858380baec182e46f32ab03..610d6b5751d6b48ac978b81756b276d1a00341a8 100644
--- a/common_components/taskpool/taskpool.h
+++ b/common_components/taskpool/taskpool.h
@@ -20,7 +20,7 @@
 #include <mutex>
 
 #include "common_components/taskpool/runner.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 
 namespace common {
 class PUBLIC_API Taskpool {
diff --git a/ecmascript/base/block_hook_scope.h b/ecmascript/base/block_hook_scope.h
index fe400d1c0a304fceabda7046faeab1809f7e67ca..5990113d0a72d0aae98b02fd522c5f9a06a05cb6 100644
--- a/ecmascript/base/block_hook_scope.h
+++ b/ecmascript/base/block_hook_scope.h
@@ -16,7 +16,7 @@
 #ifndef BLOCK_HOOK_SCOPE_H
 #define BLOCK_HOOK_SCOPE_H
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::base {
 class BlockHookScope {
diff --git a/ecmascript/base/config.h b/ecmascript/base/config.h
index 612c9205e14dfad42bc263da17e52d13c240baf5..463d346365675193833dcaddc1d57744a413bfa9 100644
--- a/ecmascript/base/config.h
+++ b/ecmascript/base/config.h
@@ -17,7 +17,7 @@
 #define ECMASCRIPT_BASE_CONFIG_H
 
 #include "common_components/base/config.h"
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include <cstdint>
 
 namespace panda::ecmascript {
diff --git a/ecmascript/base/dtoa_helper.h b/ecmascript/base/dtoa_helper.h
index c84a09b278c523401eca6431c93c79ce39596270..3bb11da718b95fbb8cecb801e8b3aa959b2053c5 100644
--- a/ecmascript/base/dtoa_helper.h
+++ b/ecmascript/base/dtoa_helper.h
@@ -22,7 +22,7 @@
 #include <limits>
 
 #include "ecmascript/common.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::base {
 
diff --git a/ecmascript/base/gc_ring_buffer.h b/ecmascript/base/gc_ring_buffer.h
index 2bea5edc445598a9540946e371e5a27c391b8bf3..7d0a0da0410d9bca64f5dbc9feb4f0175854fa50 100644
--- a/ecmascript/base/gc_ring_buffer.h
+++ b/ecmascript/base/gc_ring_buffer.h
@@ -18,7 +18,7 @@
 
 #include <array>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::base {
 // GC Ring Buffer is base tool class. It will be used to collect the data of the last N GCs. The max length is
diff --git a/ecmascript/base/hash_combine.h b/ecmascript/base/hash_combine.h
index e01bee63cc40d43a8dfc7ee2d79d32ca8d555023..1bec8a597bace05b721a8f8e1eb03a77dc215f3f 100644
--- a/ecmascript/base/hash_combine.h
+++ b/ecmascript/base/hash_combine.h
@@ -18,7 +18,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::base {
 class HashCombiner {
diff --git a/ecmascript/base/json_helper.h b/ecmascript/base/json_helper.h
index d860523de903e8d157efc5482087bad58c9c5882..2ca1e8982b89813de0421e01ca47c31e5e7d64b4 100644
--- a/ecmascript/base/json_helper.h
+++ b/ecmascript/base/json_helper.h
@@ -19,7 +19,7 @@
 #include "ecmascript/js_handle.h"
 #include "ecmascript/mem/c_string.h"
 #include "ecmascript/property_attributes.h"
-#include "libpandabase/utils/span.h"
+#include "utils/span.h"
 
 namespace panda::ecmascript::base {
 constexpr int HEX_DIGIT_MASK = 0xF;
diff --git a/ecmascript/base/string_helper.h b/ecmascript/base/string_helper.h
index e029fe18b10cd5f5ad0a3abe456cc80476b32e0b..0e303ed5720f4911d0a5fa46508eec4ac5a5799f 100644
--- a/ecmascript/base/string_helper.h
+++ b/ecmascript/base/string_helper.h
@@ -27,7 +27,7 @@
 #include "common_components/base/utf_helper.h"
 #include "ecmascript/mem/c_containers.h"
 #include "ecmascript/mem/c_string.h"
-#include "libpandabase/utils/span.h"
+#include "utils/span.h"
 
 #include "securec.h"
 #include "unicode/unistr.h"
diff --git a/ecmascript/common.h b/ecmascript/common.h
index 1c916b79dd4d04edc4b1ecacd5e541d565ae7ecc..649ebc1ee56b1f943b920f87cf172377af643ff7 100644
--- a/ecmascript/common.h
+++ b/ecmascript/common.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <limits>
 
-#include "common_interfaces/base/common.h"
+#include "base/common.h"
 #include "ecmascript/common_enum.h"
 
 namespace panda {
diff --git a/ecmascript/compiler/aot_compiler_preprocessor.h b/ecmascript/compiler/aot_compiler_preprocessor.h
index 40023aa3cc62b46c3e038208592c1251d0cfc2a2..cef1f4bcccbfa308afdbe17936b5efe244f8be69 100644
--- a/ecmascript/compiler/aot_compiler_preprocessor.h
+++ b/ecmascript/compiler/aot_compiler_preprocessor.h
@@ -19,7 +19,7 @@
 #include "ecmascript/compiler/compiler_log.h"
 #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h"
 #include "ecmascript/ecma_vm.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "ecmascript/compiler/aot_compilation_env.h"
 #include "ecmascript/compiler/aot_file/aot_file_manager.h"
 #include "ecmascript/ohos/ohos_preload_app_info.h"
diff --git a/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h b/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h
index 43e00713ab28f7a129c3c74cfc5b614e605d24f4..9a7686a91dba4d490971d81ccc37cc416ad53294 100644
--- a/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h
+++ b/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h
@@ -20,7 +20,7 @@
 #include "ecmascript/jspandafile/js_pandafile.h"
 #include "ecmascript/mem/c_containers.h"
 #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h"
-#include "libpandafile/bytecode_instruction.h"
+#include "bytecode_instruction.h"
 
 namespace panda::ecmascript::kungfu {
 using ApEntityId = pgo::ApEntityId;
diff --git a/ecmascript/compiler/binary_section.h b/ecmascript/compiler/binary_section.h
index 347a9b20ecb1da351ef4e0d0c89e9fea1109fe45..a161323370bbd493dc243b75b37a626bff6844ec 100644
--- a/ecmascript/compiler/binary_section.h
+++ b/ecmascript/compiler/binary_section.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <map>
 #include "ecmascript/common.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "llvm/BinaryFormat/ELF.h"
 
 namespace panda::ecmascript {
diff --git a/ecmascript/compiler/bytecode_circuit_builder.h b/ecmascript/compiler/bytecode_circuit_builder.h
index 1f89290364b77d1f9b7181269cfd7fc02813221d..41a72169166cb606a9e99b374e3aa5bdd3184422 100644
--- a/ecmascript/compiler/bytecode_circuit_builder.h
+++ b/ecmascript/compiler/bytecode_circuit_builder.h
@@ -31,7 +31,7 @@
 #include "ecmascript/jit/jit_profiler.h"
 #include "ecmascript/jspandafile/js_pandafile.h"
 #include "ecmascript/jspandafile/method_literal.h"
-#include "libpandafile/index_accessor.h"
+#include "index_accessor.h"
 
 namespace panda::ecmascript::kungfu {
 struct ExceptionItem {
diff --git a/ecmascript/compiler/bytecode_info_collector.h b/ecmascript/compiler/bytecode_info_collector.h
index c94c50594b771ac796e9208e3a14be1c6649ebd4..5527ed20368d54fe3d00665cb64bf34774476b63 100644
--- a/ecmascript/compiler/bytecode_info_collector.h
+++ b/ecmascript/compiler/bytecode_info_collector.h
@@ -23,7 +23,7 @@
 #include "ecmascript/jspandafile/method_literal.h"
 #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h"
 #include "ecmascript/compiler/compilation_env.h"
-#include "libpandafile/bytecode_instruction-inl.h"
+#include "bytecode_instruction-inl.h"
 
 namespace panda::ecmascript::kungfu {
 using PGOProfilerDecoder = pgo::PGOProfilerDecoder;
diff --git a/ecmascript/compiler/bytecodes.h b/ecmascript/compiler/bytecodes.h
index 533c340994f05d0e36b5167719ee6c124f9a9bc7..e2033e45e7cb4c0da07b843a017c5428c5b64f6c 100644
--- a/ecmascript/compiler/bytecodes.h
+++ b/ecmascript/compiler/bytecodes.h
@@ -19,9 +19,9 @@
 #include <cstddef>
 #include <array>
 
-#include "libpandabase/macros.h"
-#include "libpandabase/utils/bit_field.h"
-#include "libpandafile/bytecode_instruction-inl.h"
+#include "macros.h"
+#include "utils/bit_field.h"
+#include "bytecode_instruction-inl.h"
 #include "ecmascript/common.h"
 #include "ecmascript/js_tagged_value.h"
 
diff --git a/ecmascript/compiler/call_signature.h b/ecmascript/compiler/call_signature.h
index a39c47be8a39ed7f25f24d0fcc1e284311acfb20..61d7141b26dd60b9507f39f6d45fc125fd67a7cb 100644
--- a/ecmascript/compiler/call_signature.h
+++ b/ecmascript/compiler/call_signature.h
@@ -22,8 +22,8 @@
 
 #include "ecmascript/compiler/variable_type.h"
 
-#include "libpandabase/macros.h"
-#include "libpandabase/utils/bit_field.h"
+#include "macros.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript::kungfu {
 class Circuit;
diff --git a/ecmascript/compiler/circuit.h b/ecmascript/compiler/circuit.h
index 9841712fa85ef009a20fadbff0f53cff46be9032..8b7f9978852c291828d8136e6422284095ee4bd3 100644
--- a/ecmascript/compiler/circuit.h
+++ b/ecmascript/compiler/circuit.h
@@ -30,7 +30,7 @@
 #include "ecmascript/compiler/gate_meta_data_builder.h"
 #include "ecmascript/frames.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "securec.h"
 
 namespace panda::ecmascript::kungfu {
diff --git a/ecmascript/compiler/gate.h b/ecmascript/compiler/gate.h
index e1f47a40708012e5d42995fe82e4be097cc2cd19..8cbd3cc38372b03f59c93838fe068646f9093fbe 100644
--- a/ecmascript/compiler/gate.h
+++ b/ecmascript/compiler/gate.h
@@ -32,7 +32,7 @@
 #include "ecmascript/compiler/lcr_gate_meta_data.h"
 #include "ecmascript/compiler/type.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::kungfu {
 using BitField = uint64_t;
diff --git a/ecmascript/compiler/gate_meta_data_builder.h b/ecmascript/compiler/gate_meta_data_builder.h
index 5db416c4abd2568e98aaca6ce8400c17886bb748..6c79cd4e07d9be02019a1a88ff82644e5a8a4687 100644
--- a/ecmascript/compiler/gate_meta_data_builder.h
+++ b/ecmascript/compiler/gate_meta_data_builder.h
@@ -28,7 +28,7 @@
 #include "ecmascript/mem/chunk.h"
 #include "ecmascript/mem/chunk_containers.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::kungfu {
 
diff --git a/ecmascript/compiler/hcr_gate_meta_data.h b/ecmascript/compiler/hcr_gate_meta_data.h
index c4a802ed8dbd39c2340863028e28797d5232e515..089befc4cf534ab08a8567cdaa9e7771fb0cfbfa 100644
--- a/ecmascript/compiler/hcr_gate_meta_data.h
+++ b/ecmascript/compiler/hcr_gate_meta_data.h
@@ -27,7 +27,7 @@
 #include "ecmascript/elements.h"
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
 #include "ecmascript/on_heap.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include "ecmascript/compiler/share_gate_meta_data.h"
 
diff --git a/ecmascript/compiler/lcr_gate_meta_data.h b/ecmascript/compiler/lcr_gate_meta_data.h
index 8f1196cd469901470e856adb15a8515d0776b070..8f36292744be8ba39b7e06dab2e41036d1df2190 100644
--- a/ecmascript/compiler/lcr_gate_meta_data.h
+++ b/ecmascript/compiler/lcr_gate_meta_data.h
@@ -19,7 +19,7 @@
 #include <string>
 
 #include "ecmascript/compiler/type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::kungfu {
     
diff --git a/ecmascript/compiler/mcr_gate_meta_data.h b/ecmascript/compiler/mcr_gate_meta_data.h
index f9a8dd3e24b1d2b0e23e5a1edcb6182bc34f339c..c231ae6e320b22f209b33ca84a4cb8a67f50064e 100644
--- a/ecmascript/compiler/mcr_gate_meta_data.h
+++ b/ecmascript/compiler/mcr_gate_meta_data.h
@@ -25,7 +25,7 @@
 
 #include "ecmascript/elements.h"
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include "ecmascript/compiler/share_gate_meta_data.h"
 
diff --git a/ecmascript/compiler/pgo_bc_info.h b/ecmascript/compiler/pgo_bc_info.h
index 6f4e8fc3cbd575d24eb3d692856a487ed879b3d4..6754eb973545ce20ddc1b59658a241679077df67 100644
--- a/ecmascript/compiler/pgo_bc_info.h
+++ b/ecmascript/compiler/pgo_bc_info.h
@@ -18,7 +18,7 @@
 
 #include "ecmascript/jspandafile/method_literal.h"
 #include "ecmascript/mem/c_containers.h"
-#include "libpandafile/bytecode_instruction.h"
+#include "bytecode_instruction.h"
 
 namespace panda::ecmascript::kungfu {
 class PGOBCInfo {
diff --git a/ecmascript/compiler/share_gate_meta_data.h b/ecmascript/compiler/share_gate_meta_data.h
index 13bfd51929bab1d393f75d6712340943fcf20bd7..92b6e473228ce063d1fc6e4e3ac230605a1deb78 100644
--- a/ecmascript/compiler/share_gate_meta_data.h
+++ b/ecmascript/compiler/share_gate_meta_data.h
@@ -28,7 +28,7 @@
 #include "ecmascript/mem/chunk_containers.h"
 #include "ecmascript/mem/region.h"
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::kungfu {
 using ProfileType = pgo::ProfileType;
diff --git a/ecmascript/compiler/type_info_accessors.h b/ecmascript/compiler/type_info_accessors.h
index cdadaa822d21bd925b3af41c6dbb79236dec94c8..3b52a14ff4601e3ece5aae46092d13f3e3d6dcf1 100644
--- a/ecmascript/compiler/type_info_accessors.h
+++ b/ecmascript/compiler/type_info_accessors.h
@@ -24,7 +24,7 @@
 #include "ecmascript/global_index.h"
 #include "ecmascript/jspandafile/program_object.h"
 #include "ecmascript/mem/chunk.h"
-#include "libpandafile/index_accessor.h"
+#include "index_accessor.h"
 
 namespace panda::ecmascript::kungfu {
 class TypeInfoAccessor {
diff --git a/ecmascript/cross_vm/cross_vm_operator.h b/ecmascript/cross_vm/cross_vm_operator.h
index 8d8af2be2c329be45f3e6bdbe24d4c640162fcd5..c071b80921c5272716294b89c8216d3326797e88 100644
--- a/ecmascript/cross_vm/cross_vm_operator.h
+++ b/ecmascript/cross_vm/cross_vm_operator.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include "hybrid/ecma_vm_interface.h"
 #include "hybrid/sts_vm_interface.h"
diff --git a/ecmascript/cross_vm/dynamic_object_accessor.h b/ecmascript/cross_vm/dynamic_object_accessor.h
index 468cc0fbc0bbd65a0661c7f69ecf20c98842c403..6a0dce8dd134838eaba5c75f84a51eff274b14ae 100644
--- a/ecmascript/cross_vm/dynamic_object_accessor.h
+++ b/ecmascript/cross_vm/dynamic_object_accessor.h
@@ -16,8 +16,8 @@
 #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_ACCESSOR_H
 #define ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_ACCESSOR_H
 
-#include "common_interfaces/objects/base_object.h"
-#include "common_interfaces/objects/base_object_accessor.h"
+#include "objects/base_object.h"
+#include "objects/base_object_accessor.h"
 
 namespace panda::ecmascript {
 using common::ThreadHolder;
diff --git a/ecmascript/cross_vm/dynamic_object_descriptor.h b/ecmascript/cross_vm/dynamic_object_descriptor.h
index 053e9944b8a39cda51d281bceb3adbd2940fee62..afd2e98be51776f04f8fc1cd7a4a2473d9fa4e36 100644
--- a/ecmascript/cross_vm/dynamic_object_descriptor.h
+++ b/ecmascript/cross_vm/dynamic_object_descriptor.h
@@ -16,8 +16,8 @@
 #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_DESCRIPTOR_H
 #define ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_DESCRIPTOR_H
 
-#include "common_interfaces/objects/base_object.h"
-#include "common_interfaces/objects/base_object_descriptor.h"
+#include "objects/base_object.h"
+#include "objects/base_object_descriptor.h"
 #include "ecmascript/ic/ic_handler.h"
 
 namespace panda::ecmascript {
diff --git a/ecmascript/cross_vm/dynamic_type_converter.h b/ecmascript/cross_vm/dynamic_type_converter.h
index 4e16b8ebbcdc3d61aeeef63b5a66f1cf041631d9..f2f17a7afb77ff235a10e3071accb81ab02f28fc 100644
--- a/ecmascript/cross_vm/dynamic_type_converter.h
+++ b/ecmascript/cross_vm/dynamic_type_converter.h
@@ -16,8 +16,8 @@
 #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_TYPE_CONVERTER_H
 #define ECMASCRIPT_CROSS_VM_DYNAMIC_TYPE_CONVERTER_H
 
-#include "common_interfaces/objects/base_object.h"
-#include "common_interfaces/objects/base_type_converter.h"
+#include "objects/base_object.h"
+#include "objects/base_type_converter.h"
 
 namespace panda::ecmascript {
 using common::BaseType;
diff --git a/ecmascript/debugger/dropframe_manager.h b/ecmascript/debugger/dropframe_manager.h
index 153366b91949287855b30eb260a93e7d7244014a..ea4735b4699f13f07330be3486adcf0dea1773c0 100644
--- a/ecmascript/debugger/dropframe_manager.h
+++ b/ecmascript/debugger/dropframe_manager.h
@@ -19,7 +19,7 @@
 #include "ecmascript/js_handle.h"
 #include "ecmascript/js_thread.h"
 #include "ecmascript/method.h"
-#include "libpandafile/bytecode_instruction.h"
+#include "bytecode_instruction.h"
 
 namespace panda::ecmascript::tooling {
 enum class MethodType : uint8_t {
diff --git a/ecmascript/debugger/js_debugger_manager.h b/ecmascript/debugger/js_debugger_manager.h
index 9c5ace70d5d7875e09f696862f944b299ac264a2..1d070b96f7d642de4185c1d7e39fae5f9c644c77 100644
--- a/ecmascript/debugger/js_debugger_manager.h
+++ b/ecmascript/debugger/js_debugger_manager.h
@@ -29,7 +29,7 @@
 #include "ecmascript/napi/include/jsnapi.h"
 #include "ecmascript/global_handle_collection.h"
 
-#include "libpandabase/os/library_loader.h"
+#include "os/library_loader.h"
 
 namespace panda::ecmascript::tooling {
 class ProtocolHandler;
diff --git a/ecmascript/debugger/js_pt_location.h b/ecmascript/debugger/js_pt_location.h
index 762efe87d0a9d9d874e28cc63299f01ac33df894..53705ba41daa62f19f019c80f349d26ae3cbe571 100644
--- a/ecmascript/debugger/js_pt_location.h
+++ b/ecmascript/debugger/js_pt_location.h
@@ -19,8 +19,8 @@
 #include <cstring>
 
 #include "ecmascript/jspandafile/js_pandafile.h"
-#include "libpandafile/file.h"
-#include "libpandabase/macros.h"
+#include "file.h"
+#include "macros.h"
 
 namespace panda::ecmascript::tooling {
 class JSPtLocation {
diff --git a/ecmascript/debugger/js_pt_method.h b/ecmascript/debugger/js_pt_method.h
index 0441db8ceaf6498ac1c7e517e1ec914e646fd380..5b7ce86813ebe17b10c1e060881d4dd19656e36a 100644
--- a/ecmascript/debugger/js_pt_method.h
+++ b/ecmascript/debugger/js_pt_method.h
@@ -18,8 +18,8 @@
 
 #include "ecmascript/jspandafile/js_pandafile.h"
 
-#include "libpandafile/code_data_accessor-inl.h"
-#include "libpandafile/method_data_accessor-inl.h"
+#include "code_data_accessor-inl.h"
+#include "method_data_accessor-inl.h"
 
 namespace panda::ecmascript::tooling {
 class PtMethod {
diff --git a/ecmascript/dfx/cpu_profiler/sampling_processor.h b/ecmascript/dfx/cpu_profiler/sampling_processor.h
index a2a6d110b934e459e83e9613154d4b1fe4b557e0..7ebb509d790450b75508c1a897532bf397f7b2bf 100644
--- a/ecmascript/dfx/cpu_profiler/sampling_processor.h
+++ b/ecmascript/dfx/cpu_profiler/sampling_processor.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <pthread.h>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class SamplesRecord;
diff --git a/ecmascript/dfx/hprof/heap_profiler_interface.h b/ecmascript/dfx/hprof/heap_profiler_interface.h
index ca1aac2ea7af8525d7d6b799187667bb42d5746a..6970dfe16a98b1b1a3fa6e225e71928889fca2e5 100644
--- a/ecmascript/dfx/hprof/heap_profiler_interface.h
+++ b/ecmascript/dfx/hprof/heap_profiler_interface.h
@@ -18,7 +18,7 @@
 
 #include <functional>
 #include <memory>
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class EcmaVM;
diff --git a/ecmascript/dfx/hprof/heap_tracker.h b/ecmascript/dfx/hprof/heap_tracker.h
index cb105291a053b76117db08f1db1fdc79c2ba888e..c14894351ba1e9070090fba6c00bd44219af5112 100644
--- a/ecmascript/dfx/hprof/heap_tracker.h
+++ b/ecmascript/dfx/hprof/heap_tracker.h
@@ -23,7 +23,7 @@
 #include "ecmascript/dfx/hprof/file_stream.h"
 #include "ecmascript/mem/tagged_object.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class HeapSnapshot;
diff --git a/ecmascript/dfx/vm_thread_control.h b/ecmascript/dfx/vm_thread_control.h
index 27a4d80f9190698424f00b9797275b0e16f8ef25..ccd5758b93a32ba2de4e039e345ad28ea3d396d3 100644
--- a/ecmascript/dfx/vm_thread_control.h
+++ b/ecmascript/dfx/vm_thread_control.h
@@ -18,7 +18,7 @@
 
 #include "ecmascript/js_thread.h"
 #include "ecmascript/platform/mutex.h"
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 class VmThreadControl {
diff --git a/ecmascript/dfx/vmstat/caller_stat.h b/ecmascript/dfx/vmstat/caller_stat.h
index ba765e32418791300f16ce6d49c5572d05699e57..7fde3641cce4217c7956c75ca8e252f02240696a 100644
--- a/ecmascript/dfx/vmstat/caller_stat.h
+++ b/ecmascript/dfx/vmstat/caller_stat.h
@@ -22,7 +22,7 @@
 
 #include "ecmascript/mem/c_string.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class EcmaRuntimeStat;
diff --git a/ecmascript/ecma_param_configuration.h b/ecmascript/ecma_param_configuration.h
index ed3edbc9d603f2877e89386310e8b36d6217025f..1e698d12939f5d1b47698ac72b068fbe35913e04 100644
--- a/ecmascript/ecma_param_configuration.h
+++ b/ecmascript/ecma_param_configuration.h
@@ -20,7 +20,7 @@
 
 #include "ecmascript/log_wrapper.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 static constexpr size_t DEFAULT_HEAP_SIZE = 448_MB;                 // Recommended range: 128-448MB
diff --git a/ecmascript/ecma_string-inl.h b/ecmascript/ecma_string-inl.h
index df4380f88f33d8e8fbacfe1cb3c5b27ac81f3910..92c5fc36c7ab18c6b09315094c4deb2bf7b12349 100644
--- a/ecmascript/ecma_string-inl.h
+++ b/ecmascript/ecma_string-inl.h
@@ -24,7 +24,7 @@
 #include "ecmascript/mem/space.h"
 #include "ecmascript/object_factory-inl.h"
 #include "ecmascript/debugger/js_debugger_manager.h"
-#include "common_interfaces/objects/string/base_string-inl2.h"
+#include "objects/string/base_string-inl2.h"
 
 namespace panda::ecmascript {
 /* static */
diff --git a/ecmascript/ecma_string.h b/ecmascript/ecma_string.h
index c57e4c8550b5093dbbd21f0b4d6d68f1bdb5c66e..239d6f8b374ccb0db2a3b20357f11ab642f81a08 100755
--- a/ecmascript/ecma_string.h
+++ b/ecmascript/ecma_string.h
@@ -21,11 +21,11 @@
 #include <cstring>
 
 #include "common_components/base/utf_helper.h"
-#include "common_interfaces/objects/base_string.h"
-#include "common_interfaces/objects/string/line_string.h"
-#include "common_interfaces/objects/string/sliced_string.h"
-#include "common_interfaces/objects/string/tree_string.h"
-#include "common_interfaces/objects/string/base_string-inl1.h"
+#include "objects/base_string.h"
+#include "objects/string/line_string.h"
+#include "objects/string/sliced_string.h"
+#include "objects/string/tree_string.h"
+#include "objects/string/base_string-inl1.h"
 #include "ecmascript/common.h"
 #include "ecmascript/ecma_macros.h"
 #include "ecmascript/js_hclass.h"
@@ -33,7 +33,7 @@
 #include "ecmascript/mem/barriers.h"
 #include "ecmascript/mem/space.h"
 #include "ecmascript/mem/tagged_object.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "securec.h"
 #include "unicode/locid.h"
 
diff --git a/ecmascript/ecma_string_table.h b/ecmascript/ecma_string_table.h
index c9524bb1d9f3553f095a7c950eb2d22d0f8fb685..5943d114002b07cd845695934538f529e76a8aad 100644
--- a/ecmascript/ecma_string_table.h
+++ b/ecmascript/ecma_string_table.h
@@ -27,8 +27,8 @@
 #include "ecmascript/mem/visitor.h"
 #include "ecmascript/platform/mutex.h"
 #include "ecmascript/tagged_array.h"
-#include "common_interfaces/objects/base_string_table.h"
-#include "common_interfaces/objects/string/base_string_declare.h"
+#include "objects/base_string_table.h"
+#include "objects/string/base_string_declare.h"
 
 namespace panda::ecmascript {
 #if ENABLE_NEXT_OPTIMIZATION
diff --git a/ecmascript/ecma_vm.h b/ecmascript/ecma_vm.h
index f7eaf4961f9704eb47d20e7df0a17455d0a4b9e2..3d630aee89bb22c74169ecb1f251d59e04fc6850 100644
--- a/ecmascript/ecma_vm.h
+++ b/ecmascript/ecma_vm.h
@@ -41,7 +41,7 @@
 #include "ecmascript/napi/include/jsnapi_expo.h"
 #include "ecmascript/platform/mutex.h"
 #include "ecmascript/waiter_list.h"
-#include "libpandafile/bytecode_instruction-inl.h"
+#include "bytecode_instruction-inl.h"
 
 namespace panda {
 class JSNApi;
diff --git a/ecmascript/global_env_constants.h b/ecmascript/global_env_constants.h
index 4f2e5e7bc962f61d9deedbef655062d47e8e877e..59ac19c066fbadf69ec3e7730199fb0c69949c0b 100644
--- a/ecmascript/global_env_constants.h
+++ b/ecmascript/global_env_constants.h
@@ -19,7 +19,7 @@
 #include "ecmascript/compiler/builtins/builtins_call_signature_list.h"
 #include "ecmascript/js_tagged_value.h"
 #include "ecmascript/mem/visitor.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "ecmascript/cross_vm/global_env_constants_hybrid.h"
 
 namespace panda::ecmascript {
diff --git a/ecmascript/interpreter/interpreter.h b/ecmascript/interpreter/interpreter.h
index 697ab00aaab318138877a06526f5524721e208ba..82f663dcf4819678b5892bcdaf616a75295cc2f1 100644
--- a/ecmascript/interpreter/interpreter.h
+++ b/ecmascript/interpreter/interpreter.h
@@ -24,7 +24,7 @@
 #include "ecmascript/method.h"
 #include "ecmascript/require/js_cjs_module.h"
 #include "ecmascript/object_factory.h"
-#include "libpandafile/bytecode_instruction-inl.h"
+#include "bytecode_instruction-inl.h"
 
 namespace panda::ecmascript {
 class ConstantPool;
diff --git a/ecmascript/js_api/js_api_deque.h b/ecmascript/js_api/js_api_deque.h
index 7bf010b4cc9faeb915f7a193b08992f8fcec293b..ef5deccf349647798a283c69d4fbacfebb1dbf2e 100644
--- a/ecmascript/js_api/js_api_deque.h
+++ b/ecmascript/js_api/js_api_deque.h
@@ -24,7 +24,7 @@
 #include "ecmascript/js_object.h"
 #include "ecmascript/js_tagged_value.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class JSThread;
diff --git a/ecmascript/js_api/js_api_deque_iterator.h b/ecmascript/js_api/js_api_deque_iterator.h
index 83972be235e1517908a761b063f049e6325af04d..9fbe54387fd384e5a6114558efd61af156e70554 100644
--- a/ecmascript/js_api/js_api_deque_iterator.h
+++ b/ecmascript/js_api/js_api_deque_iterator.h
@@ -23,7 +23,7 @@
 #include "ecmascript/js_object.h"
 #include "ecmascript/js_tagged_value.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class TaggedObject;
diff --git a/ecmascript/js_handle.h b/ecmascript/js_handle.h
index be45f1da020b4562a919afedaad3d9ab38d77ee1..6a4efcb39b13ae14c89bc1871fed3e291c4d5dda 100644
--- a/ecmascript/js_handle.h
+++ b/ecmascript/js_handle.h
@@ -22,7 +22,7 @@
 #include "ecmascript/js_tagged_value.h"
 #include "ecmascript/mem/assert_scope.h"
 #include "ecmascript/mem/barriers.h"
-#include "common_interfaces/objects/readonly_handle.h"
+#include "objects/readonly_handle.h"
 /*
  * JSHandle: A JSHandle provides a reference to an object that survives relocation by the garbage collector.
  *
diff --git a/ecmascript/js_hclass.h b/ecmascript/js_hclass.h
index 13ae3dd9adda37dcbe5809e2b8446b9facdd0a2c..57ef51fa20e0a8efb8babff24ced3d101cc26ab2 100644
--- a/ecmascript/js_hclass.h
+++ b/ecmascript/js_hclass.h
@@ -26,9 +26,9 @@
 #include "ecmascript/mem/slots.h"
 #include "ecmascript/mem/visitor.h"
 #include "ecmascript/property_attributes.h"
-#include "common_interfaces/objects/composite_base_class.h"
+#include "objects/composite_base_class.h"
 
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 /*
  *                         JS Object and JS HClass Layout
diff --git a/ecmascript/js_runtime_options.h b/ecmascript/js_runtime_options.h
index da92db275b4d4f7af717236d01544b7fb95141b7..da3adc99b9a66a9ff344a3b1c2cfc4099f891ddb 100644
--- a/ecmascript/js_runtime_options.h
+++ b/ecmascript/js_runtime_options.h
@@ -24,14 +24,14 @@
 
 #include "common_components/common_runtime/base_runtime_param.h"
 #include "common_components/log/log_base.h"
-#include "common_interfaces/base/common.h"
-#include "common_interfaces/base/runtime_param.h"
+#include "base/common.h"
+#include "base/runtime_param.h"
 #include "ecmascript/base/bit_helper.h"
 #include "ecmascript/base/config.h"
 #include "ecmascript/common.h"
 #include "ecmascript/mem/c_string.h"
 #include "ecmascript/mem/mem_common.h"
-#include "libpandabase/os/file.h"
+#include "os/file.h"
 
 namespace {
 constexpr size_t DEFAULT_OPT_LEVEL = 3;  // 3: default opt level
diff --git a/ecmascript/js_thread.h b/ecmascript/js_thread.h
index 408779420d267f1bea71fb12285f2b196129c775..2b77324e22fd7942e3aae95453972ba33f789dac 100644
--- a/ecmascript/js_thread.h
+++ b/ecmascript/js_thread.h
@@ -38,9 +38,9 @@
 #include "ecmascript/napi/include/jsnapi_expo.h"
 #include "ecmascript/patch/patch_loader.h"
 #include "common_components/heap/collector/gc_request.h"
-#include "common_interfaces/base_runtime.h"
-#include "common_interfaces/thread/base_thread.h"
-#include "common_interfaces/thread/thread_holder.h"
+#include "base_runtime.h"
+#include "thread/base_thread.h"
+#include "thread/thread_holder.h"
 #include "ecmascript/cross_vm/js_thread_hybrid.h"
 
 #if defined(ENABLE_FFRT_INTERFACES)
diff --git a/ecmascript/jspandafile/bytecode_inst/instruction.h b/ecmascript/jspandafile/bytecode_inst/instruction.h
index 803fdb6eaece6b3e52ff791e2feb293b101075c3..0c5106dfa5e2188293c2de71e003731eae34b890 100644
--- a/ecmascript/jspandafile/bytecode_inst/instruction.h
+++ b/ecmascript/jspandafile/bytecode_inst/instruction.h
@@ -18,7 +18,7 @@
 
 #include <cstdint>
 
-#include "libpandabase/utils/bit_helpers.h"
+#include "utils/bit_helpers.h"
 
 #if !PANDA_TARGET_WINDOWS
 #include "securec.h"
diff --git a/ecmascript/jspandafile/constpool_value.h b/ecmascript/jspandafile/constpool_value.h
index 0eeed716e68f7bd05bfe5e8bfc1162443f247fd8..e60cedff0aba1ae0bed83f6ac1cf167eb44f1350 100644
--- a/ecmascript/jspandafile/constpool_value.h
+++ b/ecmascript/jspandafile/constpool_value.h
@@ -16,7 +16,7 @@
 #ifndef ECMASCRIPT_JSPANDAFILE_CONSTPOOL_VALUE_H
 #define ECMASCRIPT_JSPANDAFILE_CONSTPOOL_VALUE_H
 
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 enum class ConstPoolType : uint8_t {
diff --git a/ecmascript/jspandafile/debug_info_extractor.h b/ecmascript/jspandafile/debug_info_extractor.h
index cbe86299527a4dd5633dea7db989936cf91b7fc7..7ed39437b811ef41e39727f2ab50a1ea348ddfcd 100644
--- a/ecmascript/jspandafile/debug_info_extractor.h
+++ b/ecmascript/jspandafile/debug_info_extractor.h
@@ -24,9 +24,9 @@
 #include "ecmascript/mem/c_containers.h"
 #include "ecmascript/mem/c_string.h"
 
-#include "libpandafile/class_data_accessor-inl.h"
-#include "libpandafile/file.h"
-#include "libpandabase/utils/utf.h"
+#include "class_data_accessor-inl.h"
+#include "file.h"
+#include "utils/utf.h"
 
 namespace panda::ecmascript {
 class JSPandaFile;
diff --git a/ecmascript/jspandafile/js_pandafile.h b/ecmascript/jspandafile/js_pandafile.h
index 053416d15309a098512c06ee4a67bca7a4dc2659..fe9f54b6ad0022463803f60461b01ea5ef191a5b 100644
--- a/ecmascript/jspandafile/js_pandafile.h
+++ b/ecmascript/jspandafile/js_pandafile.h
@@ -25,9 +25,9 @@
 #include "ecmascript/mem/c_containers.h"
 #include "ecmascript/platform/mutex.h"
 
-#include "libpandafile/file-inl.h"
-#include "libpandafile/file_items.h"
-#include "libpandafile/literal_data_accessor.h"
+#include "file-inl.h"
+#include "file_items.h"
+#include "literal_data_accessor.h"
 
 namespace panda {
 namespace ecmascript {
diff --git a/ecmascript/jspandafile/literal_data_extractor.h b/ecmascript/jspandafile/literal_data_extractor.h
index 727f4f5293c6de349caf83d77606d3ec5719c198..29532202d971632ed14fe30f43f8c1cb9a1ff31c 100644
--- a/ecmascript/jspandafile/literal_data_extractor.h
+++ b/ecmascript/jspandafile/literal_data_extractor.h
@@ -18,7 +18,7 @@
 
 #include "ecmascript/jspandafile/js_pandafile.h"
 #include "ecmascript/js_tagged_value-inl.h"
-#include "libpandafile/literal_data_accessor-inl.h"
+#include "literal_data_accessor-inl.h"
 
 namespace panda::ecmascript {
 class LiteralDataExtractor {
diff --git a/ecmascript/jspandafile/method_literal.h b/ecmascript/jspandafile/method_literal.h
index f39d66a832dc55eb9454c0d1a12e5c2fdbba51b3..270e283f553c86ff9e9dd3e9358d81744f06cabc 100644
--- a/ecmascript/jspandafile/method_literal.h
+++ b/ecmascript/jspandafile/method_literal.h
@@ -23,7 +23,7 @@
 #include "ecmascript/js_function_kind.h"
 #include "ecmascript/js_tagged_value.h"
 #include "ecmascript/mem/c_string.h"
-#include "libpandafile/file.h"
+#include "file.h"
 
 static constexpr uint32_t CALL_TYPE_MASK = 0xF;  // 0xF: the last 4 bits are used as callType
 
diff --git a/ecmascript/jspandafile/panda_file_translator.h b/ecmascript/jspandafile/panda_file_translator.h
index 60dd77793ca9147203bc28754867c230792cf1b8..3288989467d194ce9a802c9626cf60b6543925b2 100644
--- a/ecmascript/jspandafile/panda_file_translator.h
+++ b/ecmascript/jspandafile/panda_file_translator.h
@@ -21,8 +21,8 @@
 #include "ecmascript/jspandafile/constpool_value.h"
 #include "ecmascript/jspandafile/js_pandafile.h"
 
-#include "libpandabase/utils/bit_field.h"
-#include "libpandafile/code_data_accessor-inl.h"
+#include "utils/bit_field.h"
+#include "code_data_accessor-inl.h"
 
 namespace panda::ecmascript {
 class Program;
diff --git a/ecmascript/jspandafile/program_object.h b/ecmascript/jspandafile/program_object.h
index ee0e2751325edae7321447ddca88a5ab9bcdf433..532e27fdc99192a19d1274af8275c25e4f131c11 100644
--- a/ecmascript/jspandafile/program_object.h
+++ b/ecmascript/jspandafile/program_object.h
@@ -35,8 +35,8 @@
 
 #include "ecmascript/pgo_profiler/pgo_profiler_manager.h"
 #include "ecmascript/pgo_profiler/pgo_utils.h"
-#include "libpandafile/class_data_accessor-inl.h"
-#include "libpandafile/index_accessor.h"
+#include "class_data_accessor-inl.h"
+#include "index_accessor.h"
 
 namespace panda {
 namespace ecmascript {
diff --git a/ecmascript/mem/allocation_inspector.h b/ecmascript/mem/allocation_inspector.h
index 0fb626dadb8f7bb13e4955de7de6e368444ed0f9..431e521d6180419148b0a2857e7f1b273cc625bf 100644
--- a/ecmascript/mem/allocation_inspector.h
+++ b/ecmascript/mem/allocation_inspector.h
@@ -17,7 +17,7 @@
 #define ECMASCRIPT_MEM_ALLOCATION_INSPECTOR_H
 
 #include "ecmascript/common.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class Heap;
diff --git a/ecmascript/mem/assert_scope.h b/ecmascript/mem/assert_scope.h
index fd9010b7085042d4b9256cc7b942045f35e92852..8fb7d0b41fc5767f6b8a8ee103567792296f4058 100644
--- a/ecmascript/mem/assert_scope.h
+++ b/ecmascript/mem/assert_scope.h
@@ -19,7 +19,7 @@
 #include <optional>
 
 #include "ecmascript/common.h"
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 
diff --git a/ecmascript/mem/barriers.h b/ecmascript/mem/barriers.h
index 478f9653782b9e90b43d0f17d503b9d1097f1210..f03e5104d6d3a52685a9122dab16b9ba04470cd6 100644
--- a/ecmascript/mem/barriers.h
+++ b/ecmascript/mem/barriers.h
@@ -20,8 +20,8 @@
 #include "ecmascript/js_tagged_value.h"
 #include "ecmascript/mem/mark_word.h"
 #include "ecmascript/mem/mem_common.h"
-#include "common_interfaces/base_runtime.h"
-#include "common_interfaces/thread/mutator_base.h"
+#include "base_runtime.h"
+#include "thread/mutator_base.h"
 
 namespace panda::ecmascript {
 class Region;
diff --git a/ecmascript/mem/clock_scope.h b/ecmascript/mem/clock_scope.h
index 1d4bd3f3aaf867d70da5a17c946234dfc8ea20b7..06c6b77c5cbc0db93bda06b04e7eac9740d8a2d2 100644
--- a/ecmascript/mem/clock_scope.h
+++ b/ecmascript/mem/clock_scope.h
@@ -19,7 +19,7 @@
 #include <ctime>
 #include <chrono>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class ClockScope {
diff --git a/ecmascript/mem/dynamic_object_operator.h b/ecmascript/mem/dynamic_object_operator.h
index b2983f6768423e23992df5f09e0e09992ed45eb9..6e0ba655089414d486317958f6f407e100d2a457 100644
--- a/ecmascript/mem/dynamic_object_operator.h
+++ b/ecmascript/mem/dynamic_object_operator.h
@@ -16,12 +16,12 @@
 #ifndef ECMASCRIPT_MEM_DYNAMIC_OBJECT_OPERATOR_H
 #define ECMASCRIPT_MEM_DYNAMIC_OBJECT_OPERATOR_H
 
-#include "common_interfaces/objects/base_object.h"
-#include "common_interfaces/objects/base_object_operator.h"
+#include "objects/base_object.h"
+#include "objects/base_object_operator.h"
 #include "ecmascript/free_object.h"
 #include "ecmascript/js_hclass-inl.h"
 #include "ecmascript/mem/tagged_object.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class RefFieldObjectVisitor final : public BaseObjectVisitor<RefFieldObjectVisitor> {
diff --git a/ecmascript/mem/free_object_list.h b/ecmascript/mem/free_object_list.h
index 3f9f75e3903a8e656cfac1122d446d08bb02080a..dbf7d0c2f9427351ec42f31bde35f451cd691512 100644
--- a/ecmascript/mem/free_object_list.h
+++ b/ecmascript/mem/free_object_list.h
@@ -21,7 +21,7 @@
 #include "ecmascript/mem/free_object_set.h"
 #include "ecmascript/mem/mem_common.h"
 
-#include "libpandabase/utils/span.h"
+#include "utils/span.h"
 
 namespace panda::ecmascript {
 class JitFort;
diff --git a/ecmascript/mem/free_object_set.h b/ecmascript/mem/free_object_set.h
index 1313a7a8e738bc5322f7d2662b69a5afcf7bbc09..825b049c37432b02eb14b3b5934485d11eba15e2 100644
--- a/ecmascript/mem/free_object_set.h
+++ b/ecmascript/mem/free_object_set.h
@@ -18,7 +18,7 @@
 
 #include <cstdint>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "ecmascript/mem/jit_fort_memdesc.h"
 
 namespace panda::ecmascript {
diff --git a/ecmascript/mem/garbage_collector.h b/ecmascript/mem/garbage_collector.h
index c458f7240a8b9979888833819dbae6b1df79949f..bc0d6e003527764522297d67b02cc1f85705713d 100644
--- a/ecmascript/mem/garbage_collector.h
+++ b/ecmascript/mem/garbage_collector.h
@@ -16,7 +16,7 @@
 #ifndef ECMASCRIPT_MEM_GARBAGE_COLLECTOR_H
 #define ECMASCRIPT_MEM_GARBAGE_COLLECTOR_H
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda {
 namespace ecmascript {
diff --git a/ecmascript/mem/gc_key_stats.h b/ecmascript/mem/gc_key_stats.h
index c8f49b0569301a973d7b655ff1b7b7789caffcd3..ec3d7dc1b4104c224fa86271a1b330105bab0670 100644
--- a/ecmascript/mem/gc_key_stats.h
+++ b/ecmascript/mem/gc_key_stats.h
@@ -24,7 +24,7 @@
 #include "ecmascript/mem/mem_common.h"
 #include "ecmascript/log_wrapper.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 using Clock = std::chrono::high_resolution_clock;
diff --git a/ecmascript/mem/gc_stats.h b/ecmascript/mem/gc_stats.h
index a7aed23b8165d227710dbbb56a6c700ff607d0b4..2a433d7771ce508d163d6709d886cb21fd368048 100644
--- a/ecmascript/mem/gc_stats.h
+++ b/ecmascript/mem/gc_stats.h
@@ -24,7 +24,7 @@
 #include "ecmascript/mem/clock_scope.h"
 #include "ecmascript/mem/mem_common.h"
 #include "ecmascript/mem/long_gc_stats.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class Heap;
diff --git a/ecmascript/mem/heap-inl.h b/ecmascript/mem/heap-inl.h
index 1f53da3e0b45f79f0443c328f0419d1dbd7a68e5..fadd64a876c7496abded0dd06ecf904a85fc3af6 100644
--- a/ecmascript/mem/heap-inl.h
+++ b/ecmascript/mem/heap-inl.h
@@ -18,7 +18,7 @@
 
 #include "clang.h"
 #include "common_components/heap/heap_allocator-inl.h"
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 #include "ecmascript/base/config.h"
 #include "ecmascript/mem/heap.h"
 
@@ -41,7 +41,7 @@
 #include "ecmascript/mem/barriers-inl.h"
 #include "ecmascript/mem/mem_map_allocator.h"
 #include "ecmascript/runtime.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 #define CHECK_OBJ_AND_THROW_OOM_ERROR(object, size, space, message)                                         \
diff --git a/ecmascript/mem/idle_gc_trigger.h b/ecmascript/mem/idle_gc_trigger.h
index 1bb6c2540a3ab145999f8a32c490abb938fc154e..9be8e2d4e1976d4f21386dcfbdd9113572121e7a 100644
--- a/ecmascript/mem/idle_gc_trigger.h
+++ b/ecmascript/mem/idle_gc_trigger.h
@@ -19,7 +19,7 @@
 #include <ctime>
 #include <chrono>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 #include "ecmascript/common.h"
 #include "ecmascript/mem/mem_common.h"
 #include "ecmascript/base/gc_ring_buffer.h"
diff --git a/ecmascript/mem/machine_code.h b/ecmascript/mem/machine_code.h
index 43777264dc3f6d2fe6cc989f314c1eee886bf088..b9cd882b9615718001d02a17d35972efacf56bfb 100644
--- a/ecmascript/mem/machine_code.h
+++ b/ecmascript/mem/machine_code.h
@@ -26,7 +26,7 @@
 #include "ecmascript/mem/jit_fort_memdesc.h"
 #include "ecmascript/deoptimizer/calleeReg.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 enum class MachineCodeType : uint8_t {
diff --git a/ecmascript/mem/mark_word.h b/ecmascript/mem/mark_word.h
index 76dcf353bfca1e98e15ce1088ab1d0832d70d4f1..87ede41bbbfeee7249194f1687b90c37ab13d897 100644
--- a/ecmascript/mem/mark_word.h
+++ b/ecmascript/mem/mark_word.h
@@ -20,7 +20,7 @@
 #include <atomic>
 
 #include "ecmascript/mem/tagged_state_word.h"
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda {
 namespace ecmascript {
diff --git a/ecmascript/mem/object_xray.h b/ecmascript/mem/object_xray.h
index b318501bf04992080d9e395169cb2bee23984021..67265d5cc18634a8d31c92cb274a269f587c2338 100644
--- a/ecmascript/mem/object_xray.h
+++ b/ecmascript/mem/object_xray.h
@@ -18,7 +18,7 @@
 
 #include <cstdint>
 
-#include "common_interfaces/objects/composite_base_class.h"
+#include "objects/composite_base_class.h"
 #include "ecmascript/byte_array.h"
 #include "ecmascript/ecma_vm.h"
 #include "ecmascript/js_async_from_sync_iterator.h"
diff --git a/ecmascript/mem/tagged_object.h b/ecmascript/mem/tagged_object.h
index ca0701bc00b766974b4108b5b63f8b33d5a5e020..fea6cd1dc9c9e047ffc9ad59c7dcf3bebb276f18 100644
--- a/ecmascript/mem/tagged_object.h
+++ b/ecmascript/mem/tagged_object.h
@@ -16,8 +16,8 @@
 #ifndef ECMASCRIPT_TAGGED_OBJECT_HEADER_H
 #define ECMASCRIPT_TAGGED_OBJECT_HEADER_H
 
-#include "common_interfaces/base/mem.h"
-#include "common_interfaces/objects/base_object.h"
+#include "base/mem.h"
+#include "objects/base_object.h"
 #include "ecmascript/mem/mark_word.h"
 #include "ecmascript/mem/shared_heap/shared_value_helper.h"
 #include "ecmascript/mem/tagged_state_word.h"
diff --git a/ecmascript/mem/tagged_state_word.h b/ecmascript/mem/tagged_state_word.h
index 402a3158b8e3cffdb56cb0dc86c1cc56e9663403..f11c85f178a1fa95c56dc204d5825da80524755f 100644
--- a/ecmascript/mem/tagged_state_word.h
+++ b/ecmascript/mem/tagged_state_word.h
@@ -16,8 +16,8 @@
 #ifndef ECMASCRIPT_TAGGED_OBJECT_STATE_WORD_H
 #define ECMASCRIPT_TAGGED_OBJECT_STATE_WORD_H
 
-#include "common_interfaces/base/common.h"
-#include "common_interfaces/objects/base_state_word.h"
+#include "base/common.h"
+#include "objects/base_state_word.h"
 #include <atomic>
 
 using ClassWordType = uint64_t;
diff --git a/ecmascript/mem/visitor.h b/ecmascript/mem/visitor.h
index 3b69b1d0c1225b2379cd547d0326d831596daa38..034edc073d460b7372d1d089f814b0dffa0d550d 100644
--- a/ecmascript/mem/visitor.h
+++ b/ecmascript/mem/visitor.h
@@ -18,7 +18,7 @@
 
 #include <functional>
 
-#include "common_interfaces/heap/heap_visitor.h"
+#include "heap/heap_visitor.h"
 #include "ecmascript/mem/slots.h"
 #include "ecmascript/mem/tagged_object.h"
 
diff --git a/ecmascript/method.h b/ecmascript/method.h
index 01a0ddb7f7375dd8d0cc93d834b445791da24f83..37dc0de7d8c63e85c4d76b27449bebd77cad5db4 100644
--- a/ecmascript/method.h
+++ b/ecmascript/method.h
@@ -24,7 +24,7 @@
 #include "ecmascript/mem/c_string.h"
 #include "ecmascript/mem/visitor.h"
 
-#include "libpandafile/file.h"
+#include "file.h"
 
 namespace panda::ecmascript {
 class JSPandaFile;
diff --git a/ecmascript/module/accessor/module_data_accessor.h b/ecmascript/module/accessor/module_data_accessor.h
index f8222e89fb8ef2d9e8b910309ea9e98952404da6..fd4462a808b2cca1a2787cf4d21f0ba59536410f 100644
--- a/ecmascript/module/accessor/module_data_accessor.h
+++ b/ecmascript/module/accessor/module_data_accessor.h
@@ -23,8 +23,8 @@
 
 #include "ecmascript/module/js_module_source_text.h"
 
-#include "libpandabase/macros.h"
-#include "libpandabase/utils/span.h"
+#include "macros.h"
+#include "utils/span.h"
 
 namespace panda::ecmascript {
 class ModuleDataAccessor {
diff --git a/ecmascript/napi/include/dfx_jsnapi.h b/ecmascript/napi/include/dfx_jsnapi.h
index 9bb41d46886c17d1fb1e909283444ed0966b8c59..ca9c06e7a37417b7e7755bc651738898137d80d4 100644
--- a/ecmascript/napi/include/dfx_jsnapi.h
+++ b/ecmascript/napi/include/dfx_jsnapi.h
@@ -27,7 +27,7 @@
 #include "ecmascript/dfx/hprof/file_stream.h"
 #include "ecmascript/dfx/hprof/heap_profiler_interface.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda {
 namespace ecmascript {
diff --git a/ecmascript/napi/include/jsnapi.h b/ecmascript/napi/include/jsnapi.h
index 5da4acae8af4477de514b777052a34c195b51f64..d7203144a17db51286e9f512ed08807a23709a31 100644
--- a/ecmascript/napi/include/jsnapi.h
+++ b/ecmascript/napi/include/jsnapi.h
@@ -31,7 +31,7 @@
 #include "ecmascript/base/config.h"
 #include "ecmascript/napi/include/jsnapi_expo.h"
 #ifndef NDEBUG
-#include "libpandabase/utils/debug.h"
+#include "utils/debug.h"
 #endif
 
 #ifdef ERROR
diff --git a/ecmascript/napi/include/jsnapi_expo.h b/ecmascript/napi/include/jsnapi_expo.h
index e899866f31f77c3f18607a0d0970791622d9a916..28512994b46336820091e15a321d4ae316d75660 100644
--- a/ecmascript/napi/include/jsnapi_expo.h
+++ b/ecmascript/napi/include/jsnapi_expo.h
@@ -34,7 +34,7 @@
 #include "ecmascript/napi/include/jsnapi_internals.h"
 
 #ifndef NDEBUG
-#include "libpandabase/utils/debug.h"
+#include "utils/debug.h"
 #endif
 
 #ifdef ERROR
diff --git a/ecmascript/object_factory.h b/ecmascript/object_factory.h
index a764282ca6f2203e6b0061061b2e31b84cb1507b..bcfdec15dccdc01e395d4791fefa0d7c1b8fef6e 100644
--- a/ecmascript/object_factory.h
+++ b/ecmascript/object_factory.h
@@ -16,7 +16,7 @@
 #ifndef ECMASCRIPT_OBJECT_FACTORY_H
 #define ECMASCRIPT_OBJECT_FACTORY_H
 
-#include "common_interfaces/objects/base_class.h"
+#include "objects/base_class.h"
 #include "ecmascript/base/error_type.h"
 #include "ecmascript/base/number_helper.h"
 #include "ecmascript/cross_vm/object_factory_hybrid.h"
diff --git a/ecmascript/object_operator.h b/ecmascript/object_operator.h
index 57125792dbfb0b5a73976265ce82cc1330a0184b..1672262888473da11f313b27048eebe0ac40b06a 100644
--- a/ecmascript/object_operator.h
+++ b/ecmascript/object_operator.h
@@ -22,7 +22,7 @@
 #include "ecmascript/property_attributes.h"
 
 #include "ecmascript/ecma_string.h"
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 class PropertyDescriptor;
diff --git a/ecmascript/ohos/aot_runtime_info.h b/ecmascript/ohos/aot_runtime_info.h
index 7d133bace960db94d0cb223626e55e5b82c8e4d1..28cb289cd20b6723a7d5b2b3376d886b307ae62d 100644
--- a/ecmascript/ohos/aot_runtime_info.h
+++ b/ecmascript/ohos/aot_runtime_info.h
@@ -24,7 +24,7 @@
 #include "ecmascript/platform/directory.h"
 #include "ecmascript/platform/file.h"
 #include "ecmascript/platform/map.h"
-#include "libpandafile/file.h"
+#include "file.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "ohos_constants.h"
 #include "utils/json_parser.h"
diff --git a/ecmascript/ohos/enable_aot_list_helper.h b/ecmascript/ohos/enable_aot_list_helper.h
index fae3701ff6361c3d37c3bf71de1055c5bfff36ad..e4e2f20e42154cb30bdbaab64331a2f907afef44 100644
--- a/ecmascript/ohos/enable_aot_list_helper.h
+++ b/ecmascript/ohos/enable_aot_list_helper.h
@@ -27,7 +27,7 @@
 #include "ecmascript/log_wrapper.h"
 #include "ecmascript/platform/file.h"
 #include "ecmascript/ohos/aot_runtime_info.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #ifdef AOT_ESCAPE_ENABLE
 #include "parameters.h"
diff --git a/ecmascript/ohos/framework_helper.h b/ecmascript/ohos/framework_helper.h
index c6f501245b6f9c2980a4ff6ddc6abf4a9add1828..2c207bf557460e2091b89fa9cd46096b9b287aa2 100644
--- a/ecmascript/ohos/framework_helper.h
+++ b/ecmascript/ohos/framework_helper.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "ecmascript/platform/file.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class FrameworkHelper {
diff --git a/ecmascript/ohos/ohos_preload_app_info.h b/ecmascript/ohos/ohos_preload_app_info.h
index f6b63fc969e2170d858c6bf92961ee45a63b3836..c94e6d69e484c89350e816d687264250bf31f367 100644
--- a/ecmascript/ohos/ohos_preload_app_info.h
+++ b/ecmascript/ohos/ohos_preload_app_info.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "ecmascript/platform/file.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class OhosPreloadAppInfo {
diff --git a/ecmascript/pgo_profiler/ap_file/pgo_file_info.h b/ecmascript/pgo_profiler/ap_file/pgo_file_info.h
index 3ba84399071e0111949a7ea7c318405023b3fef3..10d96f0bd322616db5ad588040d2757974a00d24 100644
--- a/ecmascript/pgo_profiler/ap_file/pgo_file_info.h
+++ b/ecmascript/pgo_profiler/ap_file/pgo_file_info.h
@@ -19,8 +19,8 @@
 #include <cstdint>
 
 #include "ecmascript/common.h"
-#include "libpandafile/file.h"
-#include "libpandabase/macros.h"
+#include "file.h"
+#include "macros.h"
 
 #include "ecmascript/base/file_header.h"
 #include "ecmascript/compiler/aot_file/aot_version.h"
diff --git a/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h
index 25ae25483abdba58d45b3b6e2a7ec7111af51d0d..3f874cf9e473fa85c471cb779e24d5ff54f36655 100644
--- a/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h
+++ b/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h
@@ -33,7 +33,7 @@
 #include "ecmascript/pgo_profiler/pgo_utils.h"
 #include "ecmascript/pgo_profiler/types/pgo_profile_type.h"
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOProfileTypePool {
diff --git a/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h
index ddde0b1f882c2a7edc15b40cf83a54094a0f8389..7ae7ec70a883be9a6d8f2cb3a5ee58f382f91c14 100644
--- a/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h
+++ b/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h
@@ -30,7 +30,7 @@
 #include "ecmascript/pgo_profiler/pgo_utils.h"
 #include "ecmascript/pgo_profiler/types/pgo_profile_type.h"
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOProtoTransitionPool : public PGOFileSectionInterface {
diff --git a/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h
index 7b40cf612aace0aeb7b5d54940d2d8382c25e8bd..d66758c72061a4c315bedc2466690f9cb8037ee6 100644
--- a/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h
+++ b/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h
@@ -29,7 +29,7 @@
 #include "ecmascript/pgo_profiler/ap_file/pool_template.h"
 #include "ecmascript/pgo_profiler/pgo_utils.h"
 #include "ecmascript/pgo_profiler/types/pgo_profile_type.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOProfilerHeader;
diff --git a/ecmascript/pgo_profiler/pgo_context.h b/ecmascript/pgo_profiler/pgo_context.h
index 9af716e7d7cbb346617f3314e787a95afa098f94..46a48e96856bea1761037318631a73ca58b1e8b9 100644
--- a/ecmascript/pgo_profiler/pgo_context.h
+++ b/ecmascript/pgo_profiler/pgo_context.h
@@ -23,7 +23,7 @@
 #include <unordered_map>
 
 #include "ecmascript/pgo_profiler/pgo_utils.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOAbcFilePool;
diff --git a/ecmascript/pgo_profiler/pgo_info.h b/ecmascript/pgo_profiler/pgo_info.h
index 43da5639e74469d6bc68eaafe3d9d35408a57a60..7dbdee1d8a51a59be04b957f4d2f1935bcbd0713 100644
--- a/ecmascript/pgo_profiler/pgo_info.h
+++ b/ecmascript/pgo_profiler/pgo_info.h
@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include "ecmascript/mem/c_string.h"
 #include "ecmascript/pgo_profiler/pgo_utils.h"
diff --git a/ecmascript/pgo_profiler/pgo_profiler_encoder.h b/ecmascript/pgo_profiler/pgo_profiler_encoder.h
index da37a4481deac77c2faf2aeffd3ee8cc4c7b52a6..da290653bc8e537723d6123eeb4ca94655fd93b9 100644
--- a/ecmascript/pgo_profiler/pgo_profiler_encoder.h
+++ b/ecmascript/pgo_profiler/pgo_profiler_encoder.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <utility>
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include "ecmascript/pgo_profiler/pgo_info.h"
 #include "ecmascript/pgo_profiler/pgo_profiler_info.h"
diff --git a/ecmascript/pgo_profiler/pgo_profiler_info.h b/ecmascript/pgo_profiler/pgo_profiler_info.h
index 836549661042982d5280984a82d6cf8282d90363..e465471647c404235014ca753cd01fdc6feb03f8 100644
--- a/ecmascript/pgo_profiler/pgo_profiler_info.h
+++ b/ecmascript/pgo_profiler/pgo_profiler_info.h
@@ -44,7 +44,7 @@
 #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h"
 #include "ecmascript/property_attributes.h"
 #include "ecmascript/ts_types/global_type_info.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOContext;
diff --git a/ecmascript/pgo_profiler/pgo_utils.h b/ecmascript/pgo_profiler/pgo_utils.h
index cf709d8373f76ef06a7a4f48aaa55b3af26b9b7f..6deba1f86adceb4c26d8c2149f66c4851b9da5e7 100644
--- a/ecmascript/pgo_profiler/pgo_utils.h
+++ b/ecmascript/pgo_profiler/pgo_utils.h
@@ -21,7 +21,7 @@
 #include <mutex>
 #include <string>
 
-#include "libpandafile/file.h"
+#include "file.h"
 
 #include "ecmascript/common.h"
 #include "ecmascript/log_wrapper.h"
diff --git a/ecmascript/pgo_profiler/types/pgo_profile_type.h b/ecmascript/pgo_profiler/types/pgo_profile_type.h
index fa5c27cd973c6fe38272bb3c63dfe146ef3ad832..1ed16b4ccb3612bdc508526d35a6706f139bc9b7 100644
--- a/ecmascript/pgo_profiler/types/pgo_profile_type.h
+++ b/ecmascript/pgo_profiler/types/pgo_profile_type.h
@@ -30,8 +30,8 @@
 #include "ecmascript/pgo_profiler/pgo_context.h"
 #include "ecmascript/pgo_profiler/pgo_utils.h"
 #include "ecmascript/on_heap.h"
-#include "libpandabase/utils/bit_field.h"
-#include "libpandabase/macros.h"
+#include "utils/bit_field.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class ProfileTypeRef;
diff --git a/ecmascript/pgo_profiler/types/pgo_profiler_type.h b/ecmascript/pgo_profiler/types/pgo_profiler_type.h
index 0db8eeaa1bbfcbfd12249bb9bdb76fa547bfd385..28ef6f2b6088aa0ce23622113777afc3004478d4 100644
--- a/ecmascript/pgo_profiler/types/pgo_profiler_type.h
+++ b/ecmascript/pgo_profiler/types/pgo_profiler_type.h
@@ -29,8 +29,8 @@
 #include "ecmascript/log_wrapper.h"
 #include "ecmascript/pgo_profiler/pgo_utils.h"
 #include "ecmascript/pgo_profiler/types/pgo_profile_type.h"
-#include "libpandabase/utils/bit_field.h"
-#include "libpandabase/macros.h"
+#include "utils/bit_field.h"
+#include "macros.h"
 
 namespace panda::ecmascript::pgo {
 class PGOContext;
diff --git a/ecmascript/platform/mutex.h b/ecmascript/platform/mutex.h
index a1f0ca2e151f784b9015889edb2bbfc65abd35db..722685e6e59d14c8ed1905796563452a07404216 100644
--- a/ecmascript/platform/mutex.h
+++ b/ecmascript/platform/mutex.h
@@ -20,7 +20,7 @@
 #include <atomic>
 
 #include "ecmascript/common.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #if defined(PANDA_USE_FUTEX)
 #include "ecmascript/platform/unix/futex.h"
diff --git a/ecmascript/property_attributes.h b/ecmascript/property_attributes.h
index 8bea89d1b1dd35dad109948a5e473bfe11e42557..d233445ceb50f26baa5539ffefdbecf9c35d9c06 100644
--- a/ecmascript/property_attributes.h
+++ b/ecmascript/property_attributes.h
@@ -18,7 +18,7 @@
 
 #include "ecmascript/js_tagged_value.h"
 
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 class PropertyDescriptor;
diff --git a/ecmascript/runtime.h b/ecmascript/runtime.h
index 37f08682c8d3258b20242ab09058c4ec25415a59..9b48ac29a961b9fff34cc8928bbbf49462b15507 100644
--- a/ecmascript/runtime.h
+++ b/ecmascript/runtime.h
@@ -16,7 +16,7 @@
 #ifndef ECMASCRIPT_RUNTIME_H
 #define ECMASCRIPT_RUNTIME_H
 
-#include "common_interfaces/base_runtime.h"
+#include "base_runtime.h"
 #include "ecmascript/ecma_string_table.h"
 #include "ecmascript/global_env_constants.h"
 #include "ecmascript/js_runtime_options.h"
@@ -29,7 +29,7 @@
 #include "ecmascript/platform/mutex.h"
 #include "ecmascript/serializer/serialize_chunk.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 #include <list>
 #include <memory>
diff --git a/ecmascript/shared_objects/concurrent_api_scope.h b/ecmascript/shared_objects/concurrent_api_scope.h
index 6b29f41e5c908ac4e862dffd7819fc5b61e78351..c263293e84dc67d1a999633355ed324e3a6e96d4 100644
--- a/ecmascript/shared_objects/concurrent_api_scope.h
+++ b/ecmascript/shared_objects/concurrent_api_scope.h
@@ -21,7 +21,7 @@
 #include "ecmascript/shared_objects/js_shared_typed_array.h"
 
 #include "ecmascript/containers/containers_errors.h"
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 enum class ModType : uint8_t {
diff --git a/ecmascript/snapshot/mem/encode_bit.h b/ecmascript/snapshot/mem/encode_bit.h
index a05b0708fab48d9ff2887c99fc0f30591056e583..b7045ac3cea3687a148f6f59b6addedc1dd02559 100644
--- a/ecmascript/snapshot/mem/encode_bit.h
+++ b/ecmascript/snapshot/mem/encode_bit.h
@@ -20,7 +20,7 @@
 #include "ecmascript/mem/slots.h"
 #include "ecmascript/snapshot/mem/constants.h"
 
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 /*
  *                        EncodeBit: use uint64_t value to encode TaggedObject when serialize
diff --git a/ecmascript/snapshot/mem/snapshot.h b/ecmascript/snapshot/mem/snapshot.h
index bb650bef6464b4196f0cf546fa3e89a1e7aaa552..32c0c3c8b5bca0df92ece9dee80731710a40715c 100644
--- a/ecmascript/snapshot/mem/snapshot.h
+++ b/ecmascript/snapshot/mem/snapshot.h
@@ -22,7 +22,7 @@
 #include "ecmascript/snapshot/mem/encode_bit.h"
 #include "ecmascript/snapshot/mem/snapshot_processor.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class Program;
diff --git a/ecmascript/snapshot/mem/snapshot_processor.h b/ecmascript/snapshot/mem/snapshot_processor.h
index 517674c277c105217fc314b09a0492a3fdb739e0..2bf5987d238dda2e7cfd440a4f2ee92aa2509143 100644
--- a/ecmascript/snapshot/mem/snapshot_processor.h
+++ b/ecmascript/snapshot/mem/snapshot_processor.h
@@ -27,7 +27,7 @@
 #include "ecmascript/js_tagged_value.h"
 #include "ecmascript/mem/object_xray.h"
 
-#include "libpandabase/macros.h"
+#include "macros.h"
 
 namespace panda::ecmascript {
 class EcmaVM;
diff --git a/ecmascript/stackmap/ark_stackmap_builder.h b/ecmascript/stackmap/ark_stackmap_builder.h
index 64ee715bceffec52ded0a64e0f9443f896987ad7..5596b98cd6a342f2d49e7444a0f779fdfe19265b 100644
--- a/ecmascript/stackmap/ark_stackmap_builder.h
+++ b/ecmascript/stackmap/ark_stackmap_builder.h
@@ -27,7 +27,7 @@
 #include "ecmascript/stackmap/ark_stackmap.h"
 #include "ecmascript/stackmap/llvm/llvm_stackmap_type.h"
 
-#include "libpandabase/utils/leb128.h"
+#include "utils/leb128.h"
 namespace panda::ecmascript {
     class BinaryBufferParser;
 }
diff --git a/ecmascript/stackmap/llvm/llvm_stackmap_type.h b/ecmascript/stackmap/llvm/llvm_stackmap_type.h
index 4b56973f4a49696be8d6c2fdd9d4ab5c712df781..ba48cc9b987519caf5f47d8e8e008062a368dfb6 100644
--- a/ecmascript/stackmap/llvm/llvm_stackmap_type.h
+++ b/ecmascript/stackmap/llvm/llvm_stackmap_type.h
@@ -29,7 +29,7 @@
 #include "ecmascript/mem/mem.h"
 #include "ecmascript/stackmap/cg_stackmap.h"
 
-#include "libpandabase/utils/leb128.h"
+#include "utils/leb128.h"
 
 namespace panda::ecmascript::kungfu {
 struct LocationTy {
diff --git a/ecmascript/ts_types/global_ts_type_ref.h b/ecmascript/ts_types/global_ts_type_ref.h
index 8f250cb4c413dbaeb2a78dd783de01e732c7b9d0..970998ab43c01870b44407f55cfb2bcd9d43a7f7 100644
--- a/ecmascript/ts_types/global_ts_type_ref.h
+++ b/ecmascript/ts_types/global_ts_type_ref.h
@@ -17,7 +17,7 @@
 #define ECMASCRIPT_TS_TYPES_GLOBAL_TS_TYPE_REF_H
 
 #include "ecmascript/log_wrapper.h"
-#include "libpandabase/utils/bit_field.h"
+#include "utils/bit_field.h"
 
 namespace panda::ecmascript {
 enum class TSTypeKind : uint8_t {