diff --git a/bundle.json b/bundle.json
index 22df2ad0637e0cd6e0c4099a1c638fef2a597f7b..9d65cca9ebbab45c0d2ed4f6f09c92c7ef7ce52b 100644
--- a/bundle.json
+++ b/bundle.json
@@ -45,6 +45,7 @@
                 "samgr",
                 "storage_service",
                 "sandbox_manager",
+                "selinux_adapter",
                 "zlib"
             ],
             "third_party": [
diff --git a/interfaces/api/js/napi/backup_ext/BUILD.gn b/interfaces/api/js/napi/backup_ext/BUILD.gn
index 04ca0cb3767ad7241b801797419b547c9be1a438..f3ab4f82e5315703c4d6434c9892def8df8f35e0 100644
--- a/interfaces/api/js/napi/backup_ext/BUILD.gn
+++ b/interfaces/api/js/napi/backup_ext/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
diff --git a/interfaces/api/js/napi/backup_ext_context/BUILD.gn b/interfaces/api/js/napi/backup_ext_context/BUILD.gn
index fbcecb500f13f9abb2c36e32dd50060a0a6f4d91..1d6fff54097f600aa8dfccc553e3f420076dbf6c 100644
--- a/interfaces/api/js/napi/backup_ext_context/BUILD.gn
+++ b/interfaces/api/js/napi/backup_ext_context/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
diff --git a/test/fuzztest/fileshare_fuzzer/BUILD.gn b/test/fuzztest/fileshare_fuzzer/BUILD.gn
index d9f20cbec624f1cb86f0d3463106880ec3e26c33..f2a854d5b07e922c9b6ad45d6489d330233079ec 100644
--- a/test/fuzztest/fileshare_fuzzer/BUILD.gn
+++ b/test/fuzztest/fileshare_fuzzer/BUILD.gn
@@ -44,6 +44,7 @@ ohos_fuzztest("FileShareFuzzTest") {
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
+    "access_token:libnativetoken_shared",
     "access_token:libtoken_setproc",
   ]
 }
diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
index 749cdcc0594821610180385b903cba280fef06ea..15294692a2a2b2dc7af02d05c1fc4cd2ac376035 100644
--- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
@@ -43,7 +43,9 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") {
 
   external_deps = [
     "bounds_checking_function:libsec_shared",
+    "c_utils:utils",
     "hilog:libhilog",
+    "ipc:ipc_core",
     "jsoncpp:jsoncpp",
   ]
 
diff --git a/test/unittest/file_permission_native/BUILD.gn b/test/unittest/file_permission_native/BUILD.gn
index 0d3bfbd06a8818c1976e0cf96e4eb1eb97515028..d04e27e984f111e63082e8ba430613d640ad89b3 100644
--- a/test/unittest/file_permission_native/BUILD.gn
+++ b/test/unittest/file_permission_native/BUILD.gn
@@ -44,6 +44,7 @@ ohos_unittest("file_permission_test") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "app_file_service:fileshare_native",
+    "cJSON:cjson_static",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "googletest:gmock_main",
@@ -52,6 +53,7 @@ ohos_unittest("file_permission_test") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
+    "selinux_adapter:librestorecon",
   ]
   defines = [ "private = public" ]
   if (sandbox_manarer) {
diff --git a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn
index 145bd9f4f63178fee748bc9c17eabcef005356ac..21bb76932d14ee1a0c89a6cb1185e3845eb69104 100644
--- a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn
+++ b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn
@@ -45,6 +45,7 @@ ohos_unittest("file_share_permission_ndk_sup_test") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
+    "cJSON:cjson_static",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "googletest:gmock_main",
@@ -53,6 +54,7 @@ ohos_unittest("file_share_permission_ndk_sup_test") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
+    "selinux_adapter:librestorecon",
   ]
   deps = [
     "${app_file_service_path}/interfaces/innerkits/native:fileshare_native",
diff --git a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn
index 4ca8b25f11201ab9c53540b8d69c33bae2dc32c1..5ac24ac6af65463139b20d77d4dc38785e729a3a 100644
--- a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn
+++ b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn
@@ -39,6 +39,7 @@ ohos_unittest("file_share_permission_ndk_test") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
+    "cJSON:cjson_static",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "googletest:gmock_main",
@@ -47,6 +48,7 @@ ohos_unittest("file_share_permission_ndk_test") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
+    "selinux_adapter:librestorecon",
   ]
   deps = [
     "${app_file_service_path}/interfaces/innerkits/native:fileshare_native",
diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn
index f0ca34c4ecae0005340f19f392fed6b5143534c2..4e786fa2172887797af1d4d740e6bbda48bdbbd7 100644
--- a/tests/unittests/backup_api/backup_impl/BUILD.gn
+++ b/tests/unittests/backup_api/backup_impl/BUILD.gn
@@ -80,6 +80,7 @@ ohos_unittest("backup_sa_impl_test") {
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "samgr:dynamic_cache",
     "samgr:samgr_proxy",
   ]
 
diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn
index 8ada8a2a262d26842ba16c80e9cbde6672702bb9..a161cb53634b29ab841663d03231c403e9703cbe 100644
--- a/tests/unittests/backup_sa/module_external/BUILD.gn
+++ b/tests/unittests/backup_sa/module_external/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("bms_adapter_test") {
     "ipc:ipc_core",
     "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
+    "samgr:dynamic_cache",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
   ]
diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn
index 9fec3e0118b11666578da9882a6913635f74e363..c5d4137917d80ea0575fcdb405af5a0b078fd447 100644
--- a/tests/unittests/backup_sa/module_ipc/BUILD.gn
+++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn
@@ -281,6 +281,7 @@ ohos_unittest("backup_service_session_test") {
     "ipc:ipc_core",
     "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
+    "samgr:dynamic_cache",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
   ]
diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn
index 79370309e30a1fe4f56e7857879abe0087ee21bf..9a1d706712a71784e2854eec6f81ed50c535521c 100644
--- a/tests/unittests/backup_utils/BUILD.gn
+++ b/tests/unittests/backup_utils/BUILD.gn
@@ -57,7 +57,10 @@ ohos_unittest("b_error_test") {
     "${path_backup}/utils/:backup_utils",
   ]
 
-  external_deps = [ "hilog:libhilog" ]
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+  ]
 
   defines = [ "private = public" ]
 
diff --git a/tests/utils/BUILD.gn b/tests/utils/BUILD.gn
index ca63cd1ca5f9593e56662ceb73012e70b2355eaa..999fea459b9c4ce0f5cbc4aa5dc7fec7f40484da 100644
--- a/tests/utils/BUILD.gn
+++ b/tests/utils/BUILD.gn
@@ -38,6 +38,7 @@ ohos_static_library("backup_test_utils") {
 
   deps = [ "${path_backup}/utils:backup_utils" ]
   external_deps = [
+    "c_utils:utils",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
diff --git a/tools/backup_tool/src/tools_op_backup.cpp b/tools/backup_tool/src/tools_op_backup.cpp
index f11c1c08b698c52287b5b3d5129d318c12a66ca4..439760fd4a059063a30a603c2fcb405fb9b182b5 100644
--- a/tools/backup_tool/src/tools_op_backup.cpp
+++ b/tools/backup_tool/src/tools_op_backup.cpp
@@ -38,7 +38,7 @@
 #include "b_json/b_json_entity_ext_manage.h"
 #include "b_resources/b_constants.h"
 #include "backup_kit_inner.h"
-#include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h"
+#include "hitrace_meter.h"
 #include "service_client.h"
 #include "tools_op.h"
 #include "tools_op_backup.h"
diff --git a/tools/backup_tool/src/tools_op_incremental_backup.cpp b/tools/backup_tool/src/tools_op_incremental_backup.cpp
index b62616d02d398703f6f5c7c5b73cfb6fd9ad611d..2c8a95d36ad6c7e3c15443ac4360af17627239e5 100644
--- a/tools/backup_tool/src/tools_op_incremental_backup.cpp
+++ b/tools/backup_tool/src/tools_op_incremental_backup.cpp
@@ -41,7 +41,7 @@
 #include "b_json/b_json_entity_ext_manage.h"
 #include "b_resources/b_constants.h"
 #include "backup_kit_inner.h"
-#include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h"
+#include "hitrace_meter.h"
 #include "service_client.h"
 #include "tools_op.h"
 
diff --git a/tools/backup_tool/src/tools_op_incremental_restore.cpp b/tools/backup_tool/src/tools_op_incremental_restore.cpp
index 64619efc9d26fd8ffd7e154a0257ec6e916d6a6b..3fe36888193b5d772d67ed5181b9d246d6f58e9f 100644
--- a/tools/backup_tool/src/tools_op_incremental_restore.cpp
+++ b/tools/backup_tool/src/tools_op_incremental_restore.cpp
@@ -40,7 +40,7 @@
 #include "b_json/b_json_entity_ext_manage.h"
 #include "b_resources/b_constants.h"
 #include "backup_kit_inner.h"
-#include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h"
+#include "hitrace_meter.h"
 #include "errors.h"
 #include "service_proxy.h"
 #include "tools_op.h"
diff --git a/tools/backup_tool/src/tools_op_restore.cpp b/tools/backup_tool/src/tools_op_restore.cpp
index bcf4075e88a7e7272cb22a2c1cb5a7cda860bb4e..7649de29a1217304d23e0f0015862124c08210e4 100644
--- a/tools/backup_tool/src/tools_op_restore.cpp
+++ b/tools/backup_tool/src/tools_op_restore.cpp
@@ -37,7 +37,7 @@
 #include "b_json/b_json_entity_ext_manage.h"
 #include "b_resources/b_constants.h"
 #include "backup_kit_inner.h"
-#include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h"
+#include "hitrace_meter.h"
 #include "errors.h"
 #include "service_proxy.h"
 #include "tools_op.h"