diff --git a/bundle.json b/bundle.json
index 4a4acc01f2e650e7f6bc95084a4e2cada2bf1a46..db4193a41ce6a386a5086743d9e80105941d0dd5 100644
--- a/bundle.json
+++ b/bundle.json
@@ -304,6 +304,9 @@
                 {
                     "name": "//arkcompiler/runtime_core/static_core/libpandabase:libpandabase_headers"
                 },
+                {
+                    "name": "//arkcompiler/runtime_core/common_interfaces:runtime_core_header"
+                },
                 {
                     "name": "//arkcompiler/runtime_core/static_core/libpandafile:libpandafile_headers"
                 },
diff --git a/common_interfaces/BUILD.gn b/common_interfaces/BUILD.gn
index 4ec0b9cff25775f940803837f7668c2ff8c2ab0e..50e26ce9d67c076b8b1287af371c90856ffdb6a8 100644
--- a/common_interfaces/BUILD.gn
+++ b/common_interfaces/BUILD.gn
@@ -28,3 +28,13 @@ ohos_static_library("common_interfaces_header") {
   part_name = "runtime_core"
   subsystem_name = "arkcompiler"
 }
+
+ohos_static_library("runtime_core_header") {
+  public_configs = [
+      "$ark_root/libpandabase:libpandabase_public_config",
+      "$ark_root/libpandafile:arkfile_public_config",
+  ]
+
+  part_name = "runtime_core"
+  subsystem_name = "arkcompiler"
+}
\ No newline at end of file
diff --git a/common_interfaces/objects/base_string.h b/common_interfaces/objects/base_string.h
index 67c2893c69580a6f19654bd8dc448b3cf6f4dbc5..13dd8b81c98cff49b2d81ce5afa3f552065e160e 100644
--- a/common_interfaces/objects/base_string.h
+++ b/common_interfaces/objects/base_string.h
@@ -15,8 +15,8 @@
 
 #ifndef COMMON_INTERFACES_OBJECTS_BASE_STRING_H
 #define COMMON_INTERFACES_OBJECTS_BASE_STRING_H
-#include "common_interfaces/objects/string/base_string_declare.h"
-#include "common_interfaces/objects/string/base_string-inl1.h"
-#include "common_interfaces/objects/string/base_string-inl2.h"
-#include "common_interfaces/objects/string/base_string_impl.h"
+#include "objects/string/base_string_declare.h"
+#include "objects/string/base_string-inl1.h"
+#include "objects/string/base_string-inl2.h"
+#include "objects/string/base_string_impl.h"
 #endif // COMMON_INTERFACES_OBJECTS_BASE_STRING_H
\ No newline at end of file
diff --git a/common_interfaces/objects/readonly_handle.h b/common_interfaces/objects/readonly_handle.h
index e08de8e0bc083fd952225591f94886a66628829f..a2dccf3d953aac5370c6e6e008a714462f10373e 100644
--- a/common_interfaces/objects/readonly_handle.h
+++ b/common_interfaces/objects/readonly_handle.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_INTERFACES_OBJECTS_READONLY_HANDLE_H
 #define COMMON_INTERFACES_OBJECTS_READONLY_HANDLE_H
 
-#include "common_interfaces/objects/base_object.h"
+#include "objects/base_object.h"
 
 namespace common {
 template <typename T>
diff --git a/common_interfaces/objects/string/base_string-inl1.h b/common_interfaces/objects/string/base_string-inl1.h
index 2b2cb18df0a6029fd004d4de923dcd36f84d613f..30c2df95e5982d17bee1add4ce7edfa592bea54c 100644
--- a/common_interfaces/objects/string/base_string-inl1.h
+++ b/common_interfaces/objects/string/base_string-inl1.h
@@ -18,12 +18,12 @@
 
 #include <cstring>
 
-#include "common_interfaces/objects/string/base_string_declare.h"
+#include "objects/string/base_string_declare.h"
 
-#include "common_interfaces/objects/string/line_string-inl.h"
-#include "common_interfaces/objects/string/sliced_string-inl.h"
-#include "common_interfaces/objects/string/tree_string-inl.h"
-#include "common_interfaces/objects/utils/utf_utils.h"
+#include "objects/string/line_string-inl.h"
+#include "objects/string/sliced_string-inl.h"
+#include "objects/string/tree_string-inl.h"
+#include "objects/utils/utf_utils.h"
 
 namespace common {
 inline bool BaseString::IsUtf8() const
diff --git a/common_interfaces/objects/string/base_string-inl2.h b/common_interfaces/objects/string/base_string-inl2.h
index cb731e27931f7f55f82492a44f1d5cff98a075e2..1cdbf2ebf8c438ba0a8dce318f22eb97d664c387 100644
--- a/common_interfaces/objects/string/base_string-inl2.h
+++ b/common_interfaces/objects/string/base_string-inl2.h
@@ -19,12 +19,12 @@
 #include "securec.h"
 
 #include "common_components/base/config.h"
-#include "common_interfaces/base/mem.h"
-#include "common_interfaces/objects/string/base_string_declare.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/utils/utf_utils.h"
+#include "base/mem.h"
+#include "objects/string/base_string_declare.h"
+#include "objects/string/line_string.h"
+#include "objects/string/sliced_string.h"
+#include "objects/string/tree_string.h"
+#include "objects/utils/utf_utils.h"
 
 namespace common {
 template <typename Allocator, objects_traits::enable_if_is_allocate<Allocator, BaseObject *>>
diff --git a/common_interfaces/objects/string/base_string_declare.h b/common_interfaces/objects/string/base_string_declare.h
index df53e5d59f31fe1c7cee5b2afde88921f1109bbd..c6c28d2fb0e170d87434f00c9e18137de585e824 100644
--- a/common_interfaces/objects/string/base_string_declare.h
+++ b/common_interfaces/objects/string/base_string_declare.h
@@ -16,13 +16,13 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_DECLARE_H
 #define COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_DECLARE_H
 
-#include "common_interfaces/base/bit_field.h"
-#include "common_interfaces/base/mem.h"
-#include "common_interfaces/objects/base_object.h"
-#include "common_interfaces/objects/utils/field_macro.h"
-#include "common_interfaces/objects/utils/objects_traits.h"
-#include "common_interfaces/objects/readonly_handle.h"
-#include "libpandabase/utils/span.h"
+#include "base/bit_field.h"
+#include "base/mem.h"
+#include "objects/base_object.h"
+#include "objects/utils/field_macro.h"
+#include "objects/utils/objects_traits.h"
+#include "objects/readonly_handle.h"
+#include "utils/span.h"
 
 #include <type_traits>
 
diff --git a/common_interfaces/objects/string/base_string_impl.h b/common_interfaces/objects/string/base_string_impl.h
index 215534e010fde58535e3bf908ff63be6f328bc83..4e0cfd6a10d2cbadf3033d16b6dff25dd714a7af 100644
--- a/common_interfaces/objects/string/base_string_impl.h
+++ b/common_interfaces/objects/string/base_string_impl.h
@@ -16,10 +16,10 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_IMPL_H
 #define COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_IMPL_H
 
-#include "common_interfaces/objects/string/base_string_declare.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 "objects/string/base_string_declare.h"
+#include "objects/string/line_string.h"
+#include "objects/string/sliced_string.h"
+#include "objects/string/tree_string.h"
 
 namespace common {
 std::u16string Utf16ToU16String(const uint16_t *utf16Data, uint32_t dataLen);
diff --git a/common_interfaces/objects/string/line_string-inl.h b/common_interfaces/objects/string/line_string-inl.h
index 617e5ddc7c5629e2fda2529c0d450b446ebe8c1e..1668099832ee55fe661bb351b1c031f88602c7c5 100644
--- a/common_interfaces/objects/string/line_string-inl.h
+++ b/common_interfaces/objects/string/line_string-inl.h
@@ -18,8 +18,8 @@
 
 #include "common_components/base/globals.h"
 #include "common_components/common_runtime/hooks.h"
-#include "common_interfaces/objects/string/base_string_declare.h"
-#include "common_interfaces/objects/string/line_string.h"
+#include "objects/string/base_string_declare.h"
+#include "objects/string/line_string.h"
 
 namespace common {
 inline size_t LineString::ComputeSizeUtf8(uint32_t utf8Len)
diff --git a/common_interfaces/objects/string/line_string.h b/common_interfaces/objects/string/line_string.h
index 837c5e39fc4a34ea55edfa8060906162f7732660..9f6aaa9bfecd0a6d154544a133f634911b99c1dc 100644
--- a/common_interfaces/objects/string/line_string.h
+++ b/common_interfaces/objects/string/line_string.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_LINE_STRING_H
 #define COMMON_INTERFACES_OBJECTS_STRING_LINE_STRING_H
 
-#include "common_interfaces/objects/string/base_string_declare.h"
+#include "objects/string/base_string_declare.h"
 
 namespace common {
 /*
diff --git a/common_interfaces/objects/string/sliced_string-inl.h b/common_interfaces/objects/string/sliced_string-inl.h
index 9f8039c136c387c5f34394df44a265f8f6eb89c5..8c49b3f21c92d2d72607c5ba264eb8d6c2c844b8 100644
--- a/common_interfaces/objects/string/sliced_string-inl.h
+++ b/common_interfaces/objects/string/sliced_string-inl.h
@@ -16,8 +16,8 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_INL_H
 #define COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_INL_H
 
-#include "common_interfaces/objects/string/base_string_declare.h"
-#include "common_interfaces/objects/string/sliced_string.h"
+#include "objects/string/base_string_declare.h"
+#include "objects/string/sliced_string.h"
 
 namespace common {
 inline uint32_t SlicedString::GetStartIndex() const
diff --git a/common_interfaces/objects/string/sliced_string.h b/common_interfaces/objects/string/sliced_string.h
index f0f5a7902ae49bebdba5fda80f8a5b430c7b20db..30ca249441c67c56d979b10b725b932d72991746 100644
--- a/common_interfaces/objects/string/sliced_string.h
+++ b/common_interfaces/objects/string/sliced_string.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_H
 #define COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_H
 
-#include "common_interfaces/objects/string/base_string_declare.h"
+#include "objects/string/base_string_declare.h"
 
 namespace common {
 /*
diff --git a/common_interfaces/objects/string/tree_string-inl.h b/common_interfaces/objects/string/tree_string-inl.h
index 7adcffac6e7a8080d664938b9fc741d49091ba47..07ec8a17a1f0a41ca47cd8de794783facd1a1220 100644
--- a/common_interfaces/objects/string/tree_string-inl.h
+++ b/common_interfaces/objects/string/tree_string-inl.h
@@ -16,8 +16,8 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_INL_H
 #define COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_INL_H
 
-#include "common_interfaces/objects/string/base_string_declare.h"
-#include "common_interfaces/objects/string/tree_string.h"
+#include "objects/string/base_string_declare.h"
+#include "objects/string/tree_string.h"
 
 namespace common {
 template <typename ReadBarrier>
diff --git a/common_interfaces/objects/string/tree_string.h b/common_interfaces/objects/string/tree_string.h
index 583491dde14ddfd064e1f82a0916651c1ec3c37d..67f5221ca0050653cfdf84df65faa012c20713c0 100644
--- a/common_interfaces/objects/string/tree_string.h
+++ b/common_interfaces/objects/string/tree_string.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_H
 #define COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_H
 
-#include "common_interfaces/objects/string/base_string_declare.h"
+#include "objects/string/base_string_declare.h"
 
 namespace common {
 /*
diff --git a/common_interfaces/objects/utils/field_macro.h b/common_interfaces/objects/utils/field_macro.h
index 6d0a6c53debd549ec402e6bcc3bde16830ecbd6e..2ccd5bdf76bd4280baf51ad60afb036118c0e29c 100644
--- a/common_interfaces/objects/utils/field_macro.h
+++ b/common_interfaces/objects/utils/field_macro.h
@@ -19,8 +19,8 @@
 #include <type_traits>
 #include <utility>
 
-#include "common_interfaces/objects/utils/objects_traits.h"
-#include "common_interfaces/base_runtime.h"
+#include "objects/utils/objects_traits.h"
+#include "base_runtime.h"
 
 // CC-OFFNXT(C_RULE_ID_DEFINE_LENGTH_LIMIT) solid logic
 // CC-OFFNXT(G.PRE.02) code readability
diff --git a/common_interfaces/objects/utils/objects_traits.h b/common_interfaces/objects/utils/objects_traits.h
index 8c5e02badd3ff4049924dcf8a0fc18b96944e877..6d279cbf93d4e1e4972be6bea1037b15fb4aa613 100644
--- a/common_interfaces/objects/utils/objects_traits.h
+++ b/common_interfaces/objects/utils/objects_traits.h
@@ -16,7 +16,7 @@
 #ifndef COMMON_INTERFACES_OBJECTS_TRAITS_H
 #define COMMON_INTERFACES_OBJECTS_TRAITS_H
 
-#include "common_interfaces/objects/base_object.h"
+#include "objects/base_object.h"
 #include <type_traits>
 
 namespace common::objects_traits {
diff --git a/libpandabase/BUILD.gn b/libpandabase/BUILD.gn
index db1e4a25baccfc0652466ce36caa3f1b0f1360c6..3266f6e27d5a13762e43793924d444c6d8335380 100644
--- a/libpandabase/BUILD.gn
+++ b/libpandabase/BUILD.gn
@@ -28,6 +28,15 @@ config("arkbase_public_config") {
   }
 }
 
+config("libpandabase_public_config") {
+  include_dirs = [
+    "$ark_root/libpandabase",
+    "$ark_root/platforms",
+    "$target_gen_dir/include",
+    "$target_gen_dir",
+  ]
+}
+
 if (!ark_standalone_build && !is_arkui_x) {
   ohos_shared_headers("arkbase_public_headers") {
     include_dirs = [
diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn
index 527d602ee033bef170db4e78df0dcc9d1ecb11bd..115bcfaebaa913f8fbd037237c8b7fed0440a613 100644
--- a/libpandafile/BUILD.gn
+++ b/libpandafile/BUILD.gn
@@ -129,6 +129,14 @@ ohos_static_library("arkfile_header_deps") {
   subsystem_name = "arkcompiler"
 }
 
+config("libpandafile_public_config") {
+  include_dirs = [
+    "$ark_root/libpandafile",
+    "$target_gen_dir/include",
+    "$target_gen_dir",
+  ]
+}
+
 ohos_static_library("libarkfile_static") {
   sources = libarkfile_sources