diff --git a/app_file_service.gni b/app_file_service.gni
index 8a49035045e68705ecf5eaa89a6d1a304a0184e9..642865d84d68446d628be3d8bc0226ef97dde555 100644
--- a/app_file_service.gni
+++ b/app_file_service.gni
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-third_party_path = "//third_party"
-utils_system_safwk_path = "//utils/system/safwk"
-path_base = "//commonlibrary/c_utils/base"
-path_napi = "//foundation/arkui/napi"
 app_file_service_path = "//foundation/filemanagement/app_file_service"
 declare_args() {
   sandbox_manarer = false
diff --git a/backup.gni b/backup.gni
index 348cfa2216f0fe63fb6e54bd486db25d1f5a18b2..972c4a00babaeb099d4891d0e9b2f0abede5f5c5 100644
--- a/backup.gni
+++ b/backup.gni
@@ -14,25 +14,8 @@
 path_backup = "//foundation/filemanagement/app_file_service"
 path_module_out_tests = "app_file_service/app_file_service/backup"
 
-path_ability_runtime = "//foundation/ability/ability_runtime"
-path_access_token = "//base/security/access_token"
-path_backup_js =
-    "//foundation/filemanagement/app_file_service/interfaces/kits/js"
-path_base = "//commonlibrary/c_utils/base"
-path_faultloggerd = "//base/hiviewdfx/faultloggerd"
-path_file_api = "//foundation/filemanagement/file_api"
-path_googletest = "//third_party/googletest"
-path_ipc = "//foundation/communication/ipc"
-path_jsoncpp = "//third_party/jsoncpp"
-path_rust = "//third_party/rust"
-path_napi = "//foundation/arkui/napi"
-path_samgr = "//foundation/systemabilitymgr/samgr"
-path_init = "//base/startup/init"
-path_filemgmt_libn = "//foundation/filemanagement/file_api/utils/filemgmt_libn"
 path_backup_mock = "//foundation/filemanagement/app_file_service/tests/mock"
 
-path_bas_hiviewdfx_hilog = "//base/hiviewdfx/hilog"
-
 backup_mock_parcel_include_dirs = [ "$path_backup_mock/parcel/include" ]
 backup_mock_parcel_src = [ "$path_backup_mock/parcel/src/parcel.cpp" ]
 backup_mock_parameter_include_dirs = [ "$path_backup_mock/parameter/include" ]
diff --git a/bundle.json b/bundle.json
index 8b177b5c575540b930c1d88d59588526ce961e3d..d60092acc552d3a62bddafa0d0eaa7264c199622 100644
--- a/bundle.json
+++ b/bundle.json
@@ -31,12 +31,16 @@
                 "device_manager",
                 "faultloggerd",
                 "file_api",
+                "hicollie",
                 "hitrace",
                 "hilog",
                 "hisysevent",
                 "ipc",
                 "init",
+                "json",
+                "jsoncpp",
                 "napi",
+                "openssl",
                 "safwk",
                 "samgr",
                 "storage_service",
@@ -44,9 +48,7 @@
                 "zlib"
             ],
             "third_party": [
-                "bounds_checking_function",
-                "jsoncpp",
-                "openssl"
+                "bounds_checking_function"
             ]
         },
         "adapted_system_type": [
diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn
index e1140901c08a9eeb271d29767b5b2b61b0488cdb..2fe333fc36bcdd6d2f2638151198837f1681dd86 100644
--- a/frameworks/native/backup_ext/BUILD.gn
+++ b/frameworks/native/backup_ext/BUILD.gn
@@ -44,20 +44,13 @@ ohos_shared_library("backup_extension_ability_native") {
     "LOG_TAG=\"BackupExt\"",
   ]
 
-  include_dirs = [
-    "include",
-    "${path_napi}/native_engine",
-    "${path_ability_runtime}/services/common/include",
-    "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common",
-    "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime",
-  ]
+  include_dirs = [ "include" ]
 
   deps = [
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
     "${path_backup}/interfaces/innerkits/native:sandbox_helper_native",
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/utils:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -76,6 +69,7 @@ ohos_shared_library("backup_extension_ability_native") {
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn
index 2085208753003dd53c303ea281a18a6210ec6c04..08a8d8cb39a01936346b560da3816dfcab3576f2 100644
--- a/interfaces/innerkits/native/BUILD.gn
+++ b/interfaces/innerkits/native/BUILD.gn
@@ -18,8 +18,7 @@ config("file_share_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "file_share/include",
-    "//third_party/json/include",
-    "../../common/include",
+    "${app_file_service_path}/interfaces/common/include",
   ]
 }
 
@@ -27,8 +26,7 @@ config("file_uri_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "file_uri/include",
-    "//third_party/json/include",
-    "../../common/include",
+    "${app_file_service_path}/interfaces/common/include",
   ]
 }
 
@@ -45,8 +43,8 @@ ohos_shared_library("fileshare_native") {
   }
 
   sources = [
-    "../../common/src/json_utils.cpp",
-    "../../common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/common/src/json_utils.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
     "file_share/src/file_permission.cpp",
     "file_share/src/file_share.cpp",
   ]
@@ -67,6 +65,7 @@ ohos_shared_library("fileshare_native") {
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "napi:ace_napi",
   ]
   defines = []
@@ -94,9 +93,9 @@ ohos_shared_library("fileuri_native") {
   }
 
   sources = [
-    "../../common/src/common_func.cpp",
-    "../../common/src/json_utils.cpp",
-    "../../common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/common/src/common_func.cpp",
+    "${app_file_service_path}/interfaces/common/src/json_utils.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
     "file_uri/src/file_uri.cpp",
   ]
 
@@ -110,6 +109,7 @@ ohos_shared_library("fileuri_native") {
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "samgr:samgr_proxy",
   ]
 
@@ -118,14 +118,14 @@ ohos_shared_library("fileuri_native") {
 }
 
 ohos_prebuilt_etc("file_share_sandbox.json") {
-  source = "../../common/file_share_sandbox.json"
+  source = "${app_file_service_path}/interfaces/common/file_share_sandbox.json"
   part_name = "app_file_service"
   subsystem_name = "filemanagement"
   module_install_dir = "etc/app_file_service"
 }
 
 ohos_prebuilt_etc("backup_sandbox.json") {
-  source = "../../common/backup_sandbox.json"
+  source = "${app_file_service_path}/interfaces/common/backup_sandbox.json"
   part_name = "app_file_service"
   subsystem_name = "filemanagement"
   module_install_dir = "etc/app_file_service"
@@ -135,12 +135,9 @@ config("remote_file_share_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include",
-    "${utils_system_safwk_path}/native/include",
     "remote_file_share/include",
-    "//third_party/json/include",
-    "${path_base}/include",
-    "../../common/include",
-    ".",
+    "${app_file_service_path}/interfaces/common/include",
+    "${app_file_service_path}/interfaces",
   ]
 }
 
@@ -154,8 +151,8 @@ ohos_shared_library("remote_file_share_native") {
   }
 
   sources = [
-    "../../common/src/json_utils.cpp",
-    "../../common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/common/src/json_utils.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
     "remote_file_share/src/remote_file_share.cpp",
   ]
 
@@ -165,6 +162,8 @@ ohos_shared_library("remote_file_share_native") {
     "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
+    "json:nlohmann_json_static",
+    "safwk:system_ability_fwk",
   ]
 
   if (defined(global_parts_info) &&
@@ -182,11 +181,8 @@ config("sandbox_helper_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include",
-    "${utils_system_safwk_path}/native/include",
-    "//third_party/json/include",
-    "${path_base}/include",
-    "../../common/include",
-    ".",
+    "${app_file_service_path}/interfaces/common/include",
+    "${app_file_service_path}/interfaces",
   ]
 }
 
@@ -200,8 +196,8 @@ ohos_shared_library("sandbox_helper_native") {
   }
 
   sources = [
-    "../../common/src/json_utils.cpp",
-    "../../common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/common/src/json_utils.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
   ]
 
   public_configs = [ ":sandbox_helper_config" ]
@@ -210,6 +206,8 @@ ohos_shared_library("sandbox_helper_native") {
     "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
+    "json:nlohmann_json_static",
+    "safwk:system_ability_fwk",
   ]
 
   innerapi_tags = [ "platformsdk_indirect" ]
diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index 8030493aafdb1403fc6c4c0102762e2f54338251..3a96c145cde353a7467aa2e139221e18a3697381 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -25,15 +25,15 @@ ohos_shared_library("fileshare") {
   }
 
   include_dirs = [
-    ".",
-    "../../common/include",
+    "${app_file_service_path}/interfaces",
+    "${app_file_service_path}/interfaces/common/include",
     "${app_file_service_path}/interfaces/innerkits/native/file_share/include",
   ]
 
   sources = [
-    "../../common/src/json_utils.cpp",
-    "../../common/src/sandbox_helper.cpp",
-    "../../innerkits/native/file_share/src/file_permission.cpp",
+    "${app_file_service_path}/interfaces/common/src/json_utils.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/innerkits/native/file_share/src/file_permission.cpp",
     "file_share/fileshare_n_exporter.cpp",
     "file_share/grant_permissions.cpp",
     "file_share/grant_uri_permission.cpp",
@@ -88,13 +88,13 @@ ohos_shared_library("fileuri") {
 
   include_dirs = [
     ".",
-    "../../common/include",
+    "${app_file_service_path}/interfaces/common/include",
     "${app_file_service_path}/interfaces/innerkits/native/file_uri/include",
   ]
 
   sources = [
-    "../../common/src/common_func.cpp",
-    "../../common/src/sandbox_helper.cpp",
+    "${app_file_service_path}/interfaces/common/src/common_func.cpp",
+    "${app_file_service_path}/interfaces/common/src/sandbox_helper.cpp",
     "file_uri/file_uri_n_exporter.cpp",
     "file_uri/get_uri_from_path.cpp",
     "file_uri/module.cpp",
@@ -139,29 +139,26 @@ ohos_shared_library("backup") {
   subsystem_name = "filemanagement"
   part_name = "app_file_service"
 
-  include_dirs = [ "${path_napi}/interfaces/kits" ]
-
   defines = [
     "LOG_DOMAIN=0xD004306",
     "LOG_TAG=\"BackupNAPI\"",
   ]
 
   sources = [
-    "${path_backup_js}/backup/general_callbacks.cpp",
-    "${path_backup_js}/backup/module.cpp",
-    "${path_backup_js}/backup/parse_inc_info_from_js.cpp",
-    "${path_backup_js}/backup/prop_n_exporter.cpp",
-    "${path_backup_js}/backup/prop_n_operation.cpp",
-    "${path_backup_js}/backup/session_backup_n_exporter.cpp",
-    "${path_backup_js}/backup/session_incremental_backup_n_exporter.cpp",
-    "${path_backup_js}/backup/session_restore_n_exporter.cpp",
+    "backup/general_callbacks.cpp",
+    "backup/module.cpp",
+    "backup/parse_inc_info_from_js.cpp",
+    "backup/prop_n_exporter.cpp",
+    "backup/prop_n_operation.cpp",
+    "backup/session_backup_n_exporter.cpp",
+    "backup/session_incremental_backup_n_exporter.cpp",
+    "backup/session_restore_n_exporter.cpp",
   ]
 
   deps = [
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
     "${path_backup}/services/backup_sa:backup_sa_ipc",
     "${path_backup}/utils:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags_cc = [
@@ -180,6 +177,7 @@ ohos_shared_library("backup") {
     "file_api:filemgmt_libn",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
diff --git a/interfaces/kits/ndk/fileshare/BUILD.gn b/interfaces/kits/ndk/fileshare/BUILD.gn
index eb0851c778bf357f29c668022a18f1368489a4e6..9ab75ccac922354f721732cea00c7f467e8398ce 100644
--- a/interfaces/kits/ndk/fileshare/BUILD.gn
+++ b/interfaces/kits/ndk/fileshare/BUILD.gn
@@ -13,9 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos/ndk/ndk.gni")
+import("//foundation/filemanagement/app_file_service/app_file_service.gni")
 
 ohos_ndk_library("libohfileshare") {
-  ndk_description_file = "./libfile_share.ndk.json"
+  ndk_description_file = "${app_file_service_path}/interfaces/kits/ndk/fileshare/libfile_share.ndk.json"
   min_compact_version = "12"
   output_name = "ohfileshare"
   output_extension = "so"
@@ -28,7 +29,7 @@ ohos_ndk_library("libohfileshare") {
 ohos_ndk_headers("oh_file_share_header") {
   dest_dir = "$ndk_headers_out_dir/filemanagement/fileshare/"
   sources = [
-    "../fileio/include/error_code.h",
-    "./include/oh_file_share.h",
+    "${app_file_service_path}/interfaces/kits/ndk/fileshare/include/error_code.h",
+    "${app_file_service_path}/interfaces/kits/ndk/fileshare/include/oh_file_share.h",
   ]
 }
diff --git a/interfaces/kits/ndk/fileshare/src/BUILD.gn b/interfaces/kits/ndk/fileshare/src/BUILD.gn
index e96737c51fb9ce12aace914f79998240e0e97fc0..e95da8d6292f3c3dc6e71cc57c9acfc86257d853 100644
--- a/interfaces/kits/ndk/fileshare/src/BUILD.gn
+++ b/interfaces/kits/ndk/fileshare/src/BUILD.gn
@@ -26,9 +26,9 @@ ohos_shared_library("ohfileshare") {
   }
 
   include_dirs = [
-    "../include",
-    "${app_file_service_path}/interfaces/innerkits/native/file_share/include/",
     "${app_file_service_path}/interfaces/common/include/",
+    "${app_file_service_path}/interfaces/innerkits/native/file_share/include/",
+    "${app_file_service_path}/interfaces/kits/ndk/fileshare/include",
   ]
 
   sources = [ "oh_file_share.cpp" ]
diff --git a/interfaces/kits/ndk/fileuri/BUILD.gn b/interfaces/kits/ndk/fileuri/BUILD.gn
index cc8c2abba3bb0fea0bf1a8260cf842106d3cf9b9..c55bda931f5432e8fba59bffcb1c60ef06331464 100644
--- a/interfaces/kits/ndk/fileuri/BUILD.gn
+++ b/interfaces/kits/ndk/fileuri/BUILD.gn
@@ -13,16 +13,18 @@
 
 import("//build/ohos.gni")
 import("//build/ohos/ndk/ndk.gni")
+import("//foundation/filemanagement/app_file_service/app_file_service.gni")
+
 ohos_ndk_headers("oh_file_uri_header") {
   dest_dir = "$ndk_headers_out_dir/filemanagement/file_uri/"
-  sources = [ "./include/oh_file_uri.h" ]
+  sources = [ "${app_file_service_path}/interfaces/kits/ndk/fileuri/include/oh_file_uri.h" ]
 }
 
 ohos_ndk_library("libohfileuri") {
   output_name = "ohfileuri"
   output_extension = "so"
   system_capability = "SystemCapability.FileManagement.AppFileService"
-  ndk_description_file = "./liboh_file_uri.ndk.json"
+  ndk_description_file = "${app_file_service_path}/interfaces/kits/ndk/fileuri/liboh_file_uri.ndk.json"
   min_compact_version = "12"
   system_capability_headers = [ "filemanagement/file_uri/oh_file_uri.h" ]
 }
diff --git a/interfaces/kits/ndk/fileuri/src/BUILD.gn b/interfaces/kits/ndk/fileuri/src/BUILD.gn
index c9688f289debc036c8f0984ec15f668716062d3e..17b3446422d07af0e34950be87ae9d62c03b9ca0 100644
--- a/interfaces/kits/ndk/fileuri/src/BUILD.gn
+++ b/interfaces/kits/ndk/fileuri/src/BUILD.gn
@@ -26,7 +26,7 @@ ohos_shared_library("ohfileuri") {
   }
 
   include_dirs = [
-    "../include",
+    "${app_file_service_path}/interfaces/kits/ndk/fileuri/include",
     "${app_file_service_path}/interfaces/innerkits/native/file_uri/include",
   ]
 
diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn
index d21cefe5432b94fc4b0278e262f200aeee85d262..48c023bafe28e1462984976f338e7ad188a8c779 100644
--- a/services/backup_sa/BUILD.gn
+++ b/services/backup_sa/BUILD.gn
@@ -188,7 +188,6 @@ ohos_shared_library("backup_sa") {
     ":backup_sa_ipc",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
     "${path_backup}/utils:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -206,6 +205,7 @@ ohos_shared_library("backup_sa") {
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn
index a27cba7544176e22f3733add6635f62f916ac068..a3772fd762dcb9622fe72f0f780f26c893d6c312 100644
--- a/test/fuzztest/backupext_fuzzer/BUILD.gn
+++ b/test/fuzztest/backupext_fuzzer/BUILD.gn
@@ -22,8 +22,6 @@ ohos_fuzztest("BackupExtFuzzTest") {
   module_out_path = "app_file_service/app_file_service"
   fuzz_config_file = "${app_file_service_path}/test/fuzztest/backupext_fuzzer"
   include_dirs = [
-    "${path_ability_runtime}/services/common/include",
-    "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime",
     "${path_backup}/frameworks/native/backup_ext/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/utils/include",
diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
index 4c99a5352315dcb23294b2beb9046d90f6f15dba..749cdcc0594821610180385b903cba280fef06ea 100644
--- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn
@@ -39,12 +39,12 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") {
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/utils:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "bounds_checking_function:libsec_shared",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   defines = [
diff --git a/test/unittest/file_permission_native/BUILD.gn b/test/unittest/file_permission_native/BUILD.gn
index bb78d1e47dfb92c9f700d170bdb4a397935dacbb..0d3bfbd06a8818c1976e0cf96e4eb1eb97515028 100644
--- a/test/unittest/file_permission_native/BUILD.gn
+++ b/test/unittest/file_permission_native/BUILD.gn
@@ -29,7 +29,6 @@ ohos_unittest("file_permission_test") {
     "include",
     "${app_file_service_path}/tests/mock/file_permission_native/include",
     "${app_file_service_path}/tests/mock/library_func_mock",
-    "//third_party/googletest/include",
   ]
   sources = [
     "${app_file_service_path}/tests/mock/file_permission_native/src/sandbox_mock.cpp",
@@ -47,6 +46,8 @@ ohos_unittest("file_permission_test") {
     "app_file_service:fileshare_native",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
@@ -63,8 +64,4 @@ ohos_unittest("file_permission_test") {
       "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER",
     ]
   }
-  deps = [
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
 }
diff --git a/test/unittest/file_share_native/BUILD.gn b/test/unittest/file_share_native/BUILD.gn
index 745736a50c9a557b7b8e5cbca8ca2ca91cbc9fd2..74c2f5f554e5368f2502c9df606234a5da693aa3 100644
--- a/test/unittest/file_share_native/BUILD.gn
+++ b/test/unittest/file_share_native/BUILD.gn
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
+import("//foundation/filemanagement/app_file_service/app_file_service.gni")
 
 ohos_unittest("file_share_test") {
   branch_protector_ret = "pac_ret"
@@ -23,7 +24,8 @@ ohos_unittest("file_share_test") {
   }
 
   module_out_path = "app_file_service/app_file_service/file_share"
-  resource_config_file = "../resource/ohos_test.xml"
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
   sources = [ "file_share_test.cpp" ]
 
   external_deps = [
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 662683f46911c7203684d0fafaa033a5d2ee6ea3..37435f6d3479624131d41f85bc5bf4d86f96f314 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
@@ -26,13 +26,12 @@ ohos_unittest("file_share_permission_ndk_sup_test") {
 
   module_out_path = "app_file_service/app_file_service/file_share"
   include_dirs = [
-    "include",
     "${app_file_service_path}/interfaces/kits/ndk/fileshare/include",
     "${app_file_service_path}/tests/mock/file_permission_native_mock/include",
     "${app_file_service_path}/tests/mock/parameter_mock/include",
-    "//third_party/googletest/include",
   ]
-  resource_config_file = "../../resource/ohos_test.xml"
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
   sources = [
     "${app_file_service_path}/interfaces/kits/ndk/fileshare/src/oh_file_share.cpp",
     "${app_file_service_path}/tests/mock/file_permission_native_mock/src/file_permission_mock.cpp",
@@ -47,6 +46,8 @@ ohos_unittest("file_share_permission_ndk_sup_test") {
     "access_token:libtoken_setproc",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
@@ -54,7 +55,5 @@ ohos_unittest("file_share_permission_ndk_sup_test") {
   ]
   deps = [
     "${app_file_service_path}/interfaces/innerkits/native:fileshare_native",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 }
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 ad79bbed76208daccb198fa1f690474b4711f002..7fe4c10fe0e064cc8e9f589d2688450d572c09dd 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
@@ -25,12 +25,11 @@ ohos_unittest("file_share_permission_ndk_test") {
 
   module_out_path = "app_file_service/app_file_service/file_share"
   include_dirs = [
-    "include",
     "${app_file_service_path}/interfaces/kits/ndk/fileshare/include",
     "${app_file_service_path}/interfaces/kits/ndk/fileshare/src",
-    "//third_party/googletest/include",
   ]
-  resource_config_file = "../../resource/ohos_test.xml"
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
   sources = [ "file_share_permission_test.cpp" ]
   external_deps = [
     "ability_base:base",
@@ -41,6 +40,8 @@ ohos_unittest("file_share_permission_ndk_test") {
     "access_token:libtoken_setproc",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
@@ -49,7 +50,5 @@ ohos_unittest("file_share_permission_ndk_test") {
   deps = [
     "${app_file_service_path}/interfaces/innerkits/native:fileshare_native",
     "${app_file_service_path}/interfaces/kits/ndk/fileshare/src:ohfileshare",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 }
diff --git a/test/unittest/file_uri_native/BUILD.gn b/test/unittest/file_uri_native/BUILD.gn
index 96ab25bbfb49f9f4031165a78884432dcb9ff709..2f76ec91cae904fc82aeb20c01fb63f986d1a7b4 100644
--- a/test/unittest/file_uri_native/BUILD.gn
+++ b/test/unittest/file_uri_native/BUILD.gn
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
+import("//foundation/filemanagement/app_file_service/app_file_service.gni")
 
 ohos_unittest("file_uri_test") {
   branch_protector_ret = "pac_ret"
@@ -23,7 +24,8 @@ ohos_unittest("file_uri_test") {
   }
 
   module_out_path = "app_file_service/app_file_service/file_share"
-  resource_config_file = "../resource/ohos_test.xml"
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
   sources = [ "file_uri_test.cpp" ]
 
   external_deps = [
@@ -34,13 +36,10 @@ ohos_unittest("file_uri_test") {
     "app_file_service:fileshare_native",
     "app_file_service:fileuri_native",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
   ]
-
-  deps = [
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
 }
diff --git a/test/unittest/file_uri_ndk_test/BUILD.gn b/test/unittest/file_uri_ndk_test/BUILD.gn
index 577727daf55526fab1ca479ec872615ba0359972..7de2a1c9857ce658ff7cef4e7746c4c7cbe5015c 100644
--- a/test/unittest/file_uri_ndk_test/BUILD.gn
+++ b/test/unittest/file_uri_ndk_test/BUILD.gn
@@ -24,12 +24,10 @@ ohos_unittest("file_uri_ndk_test") {
   }
 
   module_out_path = "app_file_service/app_file_service/file_share"
-  include_dirs = [
-    "include",
-    "${app_file_service_path}/interfaces/kits/ndk/fileuri/include",
-    "//third_party/googletest/include",
-  ]
-  resource_config_file = "../resource/ohos_test.xml"
+  include_dirs =
+      [ "${app_file_service_path}/interfaces/kits/ndk/fileuri/include" ]
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
   sources = [ "file_uri_ndk_test.cpp" ]
   external_deps = [
     "ability_base:zuri",
@@ -37,11 +35,9 @@ ohos_unittest("file_uri_ndk_test") {
     "app_file_service:ohfileuri",
     "c_utils:utils",
     "file_api:filemgmt_libn",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
   ]
-  deps = [
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
 }
diff --git a/test/unittest/js_file_permission_test/permission/BUILD.gn b/test/unittest/js_file_permission_test/permission/BUILD.gn
index b76e94fdbd87934f66db737f30b0c2ebcf59b555..e085657d6ab0e301e78d4a6352174500232f5ad5 100644
--- a/test/unittest/js_file_permission_test/permission/BUILD.gn
+++ b/test/unittest/js_file_permission_test/permission/BUILD.gn
@@ -15,7 +15,7 @@ import("//build/test.gni")
 ohos_js_unittest("FileShareTestPermission") {
   module_out_path = "app_file_service/app_file_service/file_share"
 
-  hap_profile = "./config.json"
+  hap_profile = "config.json"
 
-  certificate_profile = "./signature/openharmony_sx.p7b"
+  certificate_profile = "signature/openharmony_sx.p7b"
 }
diff --git a/test/unittest/js_file_uri_test/BUILD.gn b/test/unittest/js_file_uri_test/BUILD.gn
index 5242b2e5553ee93d9db942c0600a36a815c89a7b..8aa11b21f601f2195df41020fd57aa92f32e4e24 100644
--- a/test/unittest/js_file_uri_test/BUILD.gn
+++ b/test/unittest/js_file_uri_test/BUILD.gn
@@ -15,7 +15,7 @@ import("//build/test.gni")
 ohos_js_unittest("FileUriTest") {
   module_out_path = "app_file_service/app_file_service/file_share"
 
-  hap_profile = "./config.json"
+  hap_profile = "config.json"
 
-  certificate_profile = "./signature/openharmony_sx.p7b"
+  certificate_profile = "signature/openharmony_sx.p7b"
 }
diff --git a/test/unittest/remote_file_share/BUILD.gn b/test/unittest/remote_file_share/BUILD.gn
index 2c12469475e6c1f75e496a4863d95dcba242bfad..2f7d8578f34bbada48bd81254a95c119f17a41cd 100644
--- a/test/unittest/remote_file_share/BUILD.gn
+++ b/test/unittest/remote_file_share/BUILD.gn
@@ -26,28 +26,25 @@ ohos_unittest("remote_file_share_test") {
   module_out_path = "app_file_service/app_file_service/file_share"
   fuzz_config_file =
       "${app_file_service_path}/test/fuzztest/remotefileshare_fuzzer"
-  resource_config_file = "../resource/ohos_test.xml"
+  resource_config_file =
+      "${app_file_service_path}/test/unittest/resource/ohos_test.xml"
 
   sources = [ "remote_file_share_test.cpp" ]
 
   include_dirs = [
-    "include",
-    "../../../interfaces/innerkits/native/remote_file_share/include",
-    "../../../interfaces/innerkits/native/remote_file_share/src",
-    "${utils_system_safwk_path}/native/include",
-    "${path_base}/include",
+    "${app_file_service_path}/interfaces/innerkits/native/remote_file_share/include",
+    "${app_file_service_path}/interfaces/innerkits/native/remote_file_share/src",
   ]
 
-  deps = [
-    "../../../interfaces/innerkits/native:remote_file_share_native",
-    "//third_party/googletest:gtest_main",
-  ]
+  deps = [ "${app_file_service_path}/interfaces/innerkits/native:remote_file_share_native" ]
 
   external_deps = [
     "ability_base:zuri",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
diff --git a/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/module.json b/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/module.json
index 3babadd31960c4d3089edb5578a8e31b2c015f5a..13be64d830bf349ac8418d645113b017b57aab9e 100644
--- a/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/module.json
+++ b/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/module.json
@@ -15,7 +15,7 @@
     "abilities": [
       {
         "name": "EntryAbility",
-        "srcEntrance": "./ets/entryability/EntryAbility.ts",
+        "srcEntrance": "ets/entryability/EntryAbility.ts",
         "description": "$string:EntryAbility_desc",
         "icon": "$media:icon",
         "label": "$string:EntryAbility_label",
diff --git a/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/module.json b/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/module.json
index 3babadd31960c4d3089edb5578a8e31b2c015f5a..13be64d830bf349ac8418d645113b017b57aab9e 100644
--- a/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/module.json
+++ b/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/module.json
@@ -15,7 +15,7 @@
     "abilities": [
       {
         "name": "EntryAbility",
-        "srcEntrance": "./ets/entryability/EntryAbility.ts",
+        "srcEntrance": "ets/entryability/EntryAbility.ts",
         "description": "$string:EntryAbility_desc",
         "icon": "$media:icon",
         "label": "$string:EntryAbility_label",
diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn
index 224b4865282dc01de5c004897781b5ff12785655..a932d6b43160f9d3850ff9665f59ae3007078344 100644
--- a/tests/unittests/backup_api/backup_impl/BUILD.gn
+++ b/tests/unittests/backup_api/backup_impl/BUILD.gn
@@ -70,11 +70,12 @@ ohos_unittest("backup_sa_impl_test") {
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
   ]
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn
index b5bc0b2d5e4c3b991eb0d94739eb28086b0ff8a9..3257f81f003da9ce5bdfcf3256c5b00b9729a685 100644
--- a/tests/unittests/backup_ext/BUILD.gn
+++ b/tests/unittests/backup_ext/BUILD.gn
@@ -39,8 +39,6 @@ ohos_unittest("ext_extension_test") {
   deps = [
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/utils:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -53,10 +51,13 @@ ohos_unittest("ext_extension_test") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
@@ -92,14 +93,12 @@ ohos_unittest("ext_extension_stub_test") {
     "${path_backup}/utils/include",
   ]
 
-  deps = [
-    "${path_backup}/utils:backup_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
+  deps = [ "${path_backup}/utils:backup_utils" ]
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
@@ -145,15 +144,11 @@ ohos_unittest("tar_file_test") {
   sources += backup_mock_proxy_src
 
   include_dirs = [
-    "${path_ability_runtime}/services/common/include",
-    "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common",
-    "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime",
     "${path_backup}/frameworks/native/backup_ext/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/frameworks/native/backup_kit_inner/include",
     "${path_backup}/utils/include",
-    "${path_napi}/native_engine",
   ]
   include_dirs += backup_mock_utils_include
 
@@ -163,8 +158,6 @@ ohos_unittest("tar_file_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags = [ "--coverage" ]
@@ -181,9 +174,12 @@ ohos_unittest("tar_file_test") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
@@ -221,9 +217,6 @@ ohos_unittest("untar_file_sup_test") {
   sources += backup_mock_proxy_src
 
   include_dirs = [
-    "${path_ability_runtime}/services/common/include",
-    "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common",
-    "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime",
     "${path_backup}/frameworks/native/backup_ext/include",
     "${path_backup}/frameworks/native/backup_ext/src",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/",
@@ -231,7 +224,6 @@ ohos_unittest("untar_file_sup_test") {
     "${path_backup}/frameworks/native/backup_kit_inner/include",
     "${path_backup}/tests/mock/library_func_mock",
     "${path_backup}/utils/include",
-    "${path_napi}/native_engine",
   ]
   include_dirs += backup_mock_utils_include
 
@@ -241,8 +233,6 @@ ohos_unittest("untar_file_sup_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags = [ "--coverage" ]
@@ -259,9 +249,12 @@ ohos_unittest("untar_file_sup_test") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
@@ -298,15 +291,11 @@ ohos_unittest("untar_file_test") {
   sources += backup_mock_proxy_src
 
   include_dirs = [
-    "${path_ability_runtime}/services/common/include",
-    "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common",
-    "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime",
     "${path_backup}/frameworks/native/backup_ext/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/frameworks/native/backup_kit_inner/include",
     "${path_backup}/utils/include",
-    "${path_napi}/native_engine",
   ]
   include_dirs += backup_mock_utils_include
 
@@ -316,8 +305,6 @@ ohos_unittest("untar_file_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags = [ "--coverage" ]
@@ -334,9 +321,12 @@ ohos_unittest("untar_file_test") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
@@ -369,9 +359,6 @@ ohos_unittest("ext_backup_js_test") {
   deps = [
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_googletest}:gtest_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -385,10 +372,13 @@ ohos_unittest("ext_backup_js_test") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn
index 7c1fd75907b0e1aee155619ef7f249e959bef009..8ada8a2a262d26842ba16c80e9cbde6672702bb9 100644
--- a/tests/unittests/backup_sa/module_external/BUILD.gn
+++ b/tests/unittests/backup_sa/module_external/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("../../../../backup.gni")
+import("//foundation/filemanagement/app_file_service/backup.gni")
 
 ohos_unittest("bms_adapter_test") {
   module_out_path = path_module_out_tests
diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn
index a659d42e244a4b280b677a49799e401498e579e3..997f3c46c42f3a98d4033d13d71345645f597ffd 100644
--- a/tests/unittests/backup_sa/module_ipc/BUILD.gn
+++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn
@@ -43,8 +43,6 @@ ohos_unittest("module_ipc_test") {
     "${path_backup}/services/backup_sa/include",
     "${path_backup}/tests/unittests/backup_api/backup_impl/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
-    "${path_base}/include",
-    "${path_ipc}/interfaces/innerkits/ipc_core/include",
   ]
 
   deps = [
@@ -52,7 +50,6 @@ ohos_unittest("module_ipc_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "//third_party/googletest:gmock_main",
   ]
 
   external_deps = [
@@ -60,6 +57,8 @@ ohos_unittest("module_ipc_test") {
     "ability_runtime:ability_manager",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
@@ -118,8 +117,6 @@ ohos_unittest("backup_service_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -129,11 +126,14 @@ ohos_unittest("backup_service_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
@@ -200,8 +200,6 @@ ohos_unittest("backup_service_throw_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -211,11 +209,14 @@ ohos_unittest("backup_service_throw_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
@@ -260,7 +261,6 @@ ohos_unittest("backup_service_session_test") {
     "${path_backup}/services/backup_sa/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/tests/unittests/backup_api/backup_impl/include",
-    "${path_base}/include",
     "${path_backup_mock}/bundle_manager/include",
   ]
 
@@ -270,8 +270,6 @@ ohos_unittest("backup_service_session_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -280,10 +278,13 @@ ohos_unittest("backup_service_session_test") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
@@ -324,7 +325,6 @@ ohos_unittest("backup_service_scheduler_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
   ]
 
   external_deps = [
@@ -333,6 +333,8 @@ ohos_unittest("backup_service_scheduler_test") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
@@ -389,8 +391,6 @@ ohos_unittest("backup_restore_deps_manager_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -400,11 +400,14 @@ ohos_unittest("backup_restore_deps_manager_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
@@ -451,8 +454,6 @@ ohos_unittest("backup_service_incremental_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -462,11 +463,14 @@ ohos_unittest("backup_service_incremental_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
@@ -523,8 +527,6 @@ ohos_unittest("backup_service_other_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
@@ -534,11 +536,14 @@ ohos_unittest("backup_service_other_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "storage_service:storage_manager_sa_proxy",
diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn
index c7a2500c02d74f272868c9ceb7cf5d582060cdeb..9bcf5940e828dc6e6a08f525efbc63323e3ed9dc 100644
--- a/tests/unittests/backup_sa/session/BUILD.gn
+++ b/tests/unittests/backup_sa/session/BUILD.gn
@@ -47,8 +47,6 @@ ohos_unittest("b_incremental_session_test") {
   deps = [
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/utils:backup_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   sanitize = {
@@ -67,6 +65,8 @@ ohos_unittest("b_incremental_session_test") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn
index 2fa914802f52806063133060c3a470664534c871..18f59eb1f8679e56d88bf7999f3f1b8e7ada8102 100644
--- a/tests/unittests/backup_tools/BUILD.gn
+++ b/tests/unittests/backup_tools/BUILD.gn
@@ -41,7 +41,6 @@ ohos_unittest("backup_tool_test") {
   sources += backup_mock_proxy_src
 
   include_dirs = [
-    "${path_base}/include",
     "${path_backup}/frameworks/native/backup_kit_inner/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner",
@@ -55,8 +54,6 @@ ohos_unittest("backup_tool_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags = [ "--coverage" ]
@@ -67,9 +64,12 @@ ohos_unittest("backup_tool_test") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "samgr:samgr_proxy",
   ]
 
@@ -105,7 +105,6 @@ ohos_unittest("backup_tool_restore_test") {
   sources += backup_mock_proxy_src
 
   include_dirs = [
-    "${path_base}/include",
     "${path_backup}/frameworks/native/backup_kit_inner/include",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner",
@@ -119,8 +118,6 @@ ohos_unittest("backup_tool_restore_test") {
     "${path_backup}/services/backup_sa:backup_sa_ipc_stub",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   cflags = [ "--coverage" ]
@@ -131,9 +128,12 @@ ohos_unittest("backup_tool_restore_test") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "samgr:samgr_proxy",
   ]
 
diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn
index 9825597bac20c27453a48ff98e8b45b7a1ed177a..f982532bc8286ec5fa7c1708107f3ef21baa43fe 100644
--- a/tests/unittests/backup_utils/BUILD.gn
+++ b/tests/unittests/backup_utils/BUILD.gn
@@ -86,12 +86,12 @@ ohos_unittest("b_file_test") {
   deps = [
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   use_exceptions = true
@@ -113,13 +113,13 @@ ohos_unittest("b_jsonutil_test") {
   deps = [
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "cJSON:cjson",
     "c_utils:utils",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   use_exceptions = true
@@ -141,24 +141,22 @@ ohos_unittest("b_json_test") {
   ]
   sources += backup_mock_parameter_src
 
-  include_dirs = [
-    "${path_backup}/utils",
-    "${path_base}/include",
-  ]
+  include_dirs = [ "${path_backup}/utils" ]
   include_dirs += backup_mock_parameter_include_dirs
 
   deps = [
     "${path_backup}/interfaces/innerkits/native:sandbox_helper_native",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   defines = [
@@ -194,19 +192,17 @@ ohos_unittest("b_tarball_cmdline_test") {
     "b_tarball/b_tarball_cmdline_test.cpp",
   ]
 
-  include_dirs = [
-    "${path_base}/include",
-    "${path_backup}/utils/include",
-  ]
+  include_dirs = [ "${path_backup}/utils/include" ]
 
   deps = [
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_googletest}:gmock_main",
   ]
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
   ]
 
@@ -229,16 +225,14 @@ ohos_unittest("b_tarball_factory_test") {
     "b_tarball/b_tarball_factory_test.cpp",
   ]
 
-  include_dirs = [
-    "${path_base}/include",
-    "${path_backup}/utils/include",
-  ]
+  include_dirs = [ "${path_backup}/utils/include" ]
 
-  deps = [
-    "${path_backup}/tests/utils:backup_test_utils",
-    "${path_googletest}:gmock_main",
+  deps = [ "${path_backup}/tests/utils:backup_test_utils" ]
+  external_deps = [
+    "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
   ]
-  external_deps = [ "c_utils:utils" ]
   use_exceptions = true
 }
 
@@ -255,19 +249,16 @@ ohos_unittest("b_process_test") {
 
   sources = [ "b_process/b_process_test.cpp" ]
 
-  include_dirs = [
-    "${path_base}/include",
-    "${path_backup}/utils/include",
-  ]
+  include_dirs = [ "${path_backup}/utils/include" ]
 
   deps = [
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_jsoncpp}:jsoncpp",
   ]
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   use_exceptions = true
@@ -285,7 +276,6 @@ ohos_unittest("b_json_other_test") {
 
   include_dirs = [
     "${path_backup}/utils",
-    "${path_base}/include",
     "${path_backup}/tests/mock/cJson/include",
   ]
   include_dirs += backup_mock_parameter_include_dirs
@@ -294,14 +284,15 @@ ohos_unittest("b_json_other_test") {
     "${path_backup}/interfaces/innerkits/native:sandbox_helper_native",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   defines = [
@@ -326,7 +317,6 @@ ohos_unittest("b_jsonutil_other_test") {
 
   include_dirs = [
     "${path_backup}/utils",
-    "${path_base}/include",
     "${path_backup}/tests/mock/cJson/include",
   ]
   include_dirs += backup_mock_parameter_include_dirs
@@ -334,14 +324,15 @@ ohos_unittest("b_jsonutil_other_test") {
   deps = [
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   defines = [
@@ -366,7 +357,6 @@ ohos_unittest("b_json_clear_data_test") {
 
   include_dirs = [
     "${path_backup}/utils",
-    "${path_base}/include",
     "${path_backup}/tests/mock/cJson/include",
   ]
   include_dirs += backup_mock_parameter_include_dirs
@@ -375,14 +365,15 @@ ohos_unittest("b_json_clear_data_test") {
     "${path_backup}/interfaces/innerkits/native:sandbox_helper_native",
     "${path_backup}/tests/utils:backup_test_utils",
     "${path_backup}/utils/:backup_utils",
-    "${path_googletest}:gmock_main",
-    "${path_jsoncpp}:jsoncpp",
   ]
 
   external_deps = [
     "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "jsoncpp:jsoncpp",
   ]
 
   defines = [
diff --git a/tests/unittests/backup_utils/b_error/b_error_test.cpp b/tests/unittests/backup_utils/b_error/b_error_test.cpp
index 2466b8b49bc5106a98d0af1bd4e660689cb7bd3e..f4925b4afde0a384fbbb0c62ce047547c83e5cfa 100644
--- a/tests/unittests/backup_utils/b_error/b_error_test.cpp
+++ b/tests/unittests/backup_utils/b_error/b_error_test.cpp
@@ -36,7 +36,7 @@ public:
  * @tc.level Level 0
  * @tc.require: I6F3GV
  */
-HWTEST_F(BErrorTest, b_error_construction_0100, testing::ext::TestSize.Level1)
+HWTEST_F(BErrorTest, b_error_construction_0100, testing::ext::TestSize.Level0)
 {
     GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0100";
     try {
diff --git a/tests/utils/BUILD.gn b/tests/utils/BUILD.gn
index 6c2f3819294a36e1f898fec39120407d29d338c5..ca63cd1ca5f9593e56662ceb73012e70b2355eaa 100644
--- a/tests/utils/BUILD.gn
+++ b/tests/utils/BUILD.gn
@@ -36,11 +36,12 @@ ohos_static_library("backup_test_utils") {
 
   public_configs = [ ":test_util_public_config" ]
 
-  deps = [
-    "${path_backup}/utils:backup_utils",
-    "${path_googletest}:gmock_main",
+  deps = [ "${path_backup}/utils:backup_utils" ]
+  external_deps = [
+    "googletest:gmock_main",
+    "googletest:gtest_main",
+    "hilog:libhilog",
   ]
-  external_deps = [ "hilog:libhilog" ]
   use_exceptions = true
   part_name = "app_file_service"
   subsystem_name = "filemanagement"
diff --git a/tools/backup_tool/BUILD.gn b/tools/backup_tool/BUILD.gn
index a9e232cb3e7501268d80e340673648dc7fb8bc5f..5368c9de7b34f25c9b951954f58afef1aabd4788 100644
--- a/tools/backup_tool/BUILD.gn
+++ b/tools/backup_tool/BUILD.gn
@@ -39,7 +39,6 @@ ohos_executable("backup_tool") {
     deps += [
       "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner",
       "${path_backup}/utils/:backup_utils",
-      "${path_jsoncpp}:jsoncpp",
     ]
 
     sources += [
@@ -59,6 +58,7 @@ ohos_executable("backup_tool") {
       "hilog:libhilog",
       "hitrace:hitrace_meter",
       "ipc:ipc_core",
+      "jsoncpp:jsoncpp",
     ]
 
     defines += [ "BACKUP_TOOL_ENABLE=1" ]
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 6a6928383647e0021eb8b27fc5666f78669acacd..7dae8821dbd8a8bb95c4bbcc55e9e85ede99cd1c 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -25,7 +25,6 @@ config("utils_public_config") {
   include_dirs = [
     "include",
     "include/b_hilog",
-    "${path_base}/include",
   ]
 }
 
@@ -101,11 +100,12 @@ ohos_shared_library("backup_utils") {
     "hitrace:hitrace_meter",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
+    "openssl:libcrypto_shared",
     "zlib:shared_libz",
   ]
 
   include_dirs = [
-    "${path_init}/interfaces/innerkits/include/syspara",
     "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl",
     "${path_backup}/utils/include",
   ]
@@ -114,8 +114,6 @@ ohos_shared_library("backup_utils") {
     ":backup_cxx_cppdeps",
     "${path_backup}/interfaces/innerkits/native:sandbox_helper_native",
     "${path_backup}/services/backup_sa:backup_sa_ipc_type",
-    "${path_jsoncpp}:jsoncpp",
-    "//third_party/openssl:libcrypto_shared",
   ]
 
   cflags_cc = [