diff --git a/filemanagement_aafwk.gni b/filemanagement_aafwk.gni
index 80abb43a242cdb3ec5cbcadf0a0c30a2fac86a6a..e37371747c18493c742e4a0d4ff8ac6c955aad0a 100644
--- a/filemanagement_aafwk.gni
+++ b/filemanagement_aafwk.gni
@@ -12,12 +12,6 @@
 # limitations under the License.
 
 ability_runtime_path = "//foundation/ability/ability_runtime"
-ability_runtime_innerkits_path = "${ability_runtime_path}/interfaces/inner_api"
-ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
-ability_runtime_services_path = "${ability_runtime_path}/services"
-ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi"
-access_token_path = "//base/security/access_token"
 file_api_path = "//foundation/filemanagement/file_api"
 user_file_service_path = "//foundation/filemanagement/user_file_service"
-distributed_file_path = "//foundation/distributeddatamgr/distributedfile"
 commonlibrary_path = "//commonlibrary"
diff --git a/frameworks/js/napi/file_access_ext_ability/BUILD.gn b/frameworks/js/napi/file_access_ext_ability/BUILD.gn
index 9e825e2bf2121336cbdbf34059b45c9309586b0a..2efb3546db20e4726b7980cb072cdf118e850100 100644
--- a/frameworks/js/napi/file_access_ext_ability/BUILD.gn
+++ b/frameworks/js/napi/file_access_ext_ability/BUILD.gn
@@ -10,7 +10,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
 import("//build/ohos.gni")
 
diff --git a/frameworks/js/napi/file_access_module/BUILD.gn b/frameworks/js/napi/file_access_module/BUILD.gn
index 45421e36af8a7421cb7824da1db47e8b3fdfeac1..d50bc8bb8ab96bf251a61e4786fe2a482b699d8e 100644
--- a/frameworks/js/napi/file_access_module/BUILD.gn
+++ b/frameworks/js/napi/file_access_module/BUILD.gn
@@ -31,8 +31,8 @@ ohos_shared_library("fileaccess") {
   relative_install_dir = "module/file"
 
   include_dirs = [
-    "./",
     "${user_file_service_path}/frameworks/js/napi/common",
+    "${user_file_service_path}/frameworks/js/napi/file_access_module",
     "${user_file_service_path}/frameworks/js/napi/file_access_module/file_info",
     "${user_file_service_path}/frameworks/js/napi/file_access_module/root_info",
     "${user_file_service_path}/utils",
diff --git a/frameworks/js/napi/file_extension_info_module/BUILD.gn b/frameworks/js/napi/file_extension_info_module/BUILD.gn
index bffee06a6152a0eae2561bf39e58f139ecec5cff..d4f2c0e11194236b754ac63b99d5ecf2c82f60d0 100644
--- a/frameworks/js/napi/file_extension_info_module/BUILD.gn
+++ b/frameworks/js/napi/file_extension_info_module/BUILD.gn
@@ -30,7 +30,6 @@ ohos_shared_library("fileextensioninfo") {
   relative_install_dir = "module/file"
 
   include_dirs = [
-    ".",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/frameworks/js/napi/common",
     "${user_file_service_path}/utils",
diff --git a/interfaces/kits/native/recent/BUILD.gn b/interfaces/kits/native/recent/BUILD.gn
index b296c510e29726228953ef6af531e8a092f4eec3..78407b5634e664da4e292f6be1335edcda325145 100644
--- a/interfaces/kits/native/recent/BUILD.gn
+++ b/interfaces/kits/native/recent/BUILD.gn
@@ -25,10 +25,7 @@ ohos_shared_library("recent") {
     debug = false
   }
 
-  include_dirs = [
-    ".",
-    "${user_file_service_path}/utils",
-  ]
+  include_dirs = [ "${user_file_service_path}/utils" ]
 
   sources = [
     "module.cpp",
diff --git a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn
index 66c93d97b84037e9d14934899d524286aa6e0b90..999941de499aabd2a866c5ed19a408be725df7e1 100644
--- a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn
@@ -23,7 +23,6 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccess_fuzzer"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/utils",
   ]
@@ -32,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") {
   configs = [ "//build/config/compiler:exceptions" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
     "${user_file_service_path}/services:file_access_service_base_include",
diff --git a/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn
index 8082e43486039c6466f53390a470d27a6b42405a..b5ff597af41df12f5f61bcc20fdb9017421549a5 100644
--- a/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn
@@ -21,9 +21,6 @@ ohos_fuzztest("ExternalFileAccessAccessFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccessaccess_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -35,8 +32,6 @@ ohos_fuzztest("ExternalFileAccessAccessFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessaccess_fuzzer/externalfileaccessaccess_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn
index 62e9f6087e0b185344aa9c67280b7709df5e3b46..08b055d5e0dbf2fb1c692070fbfc7a8272ac848c 100644
--- a/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessCreateFileFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccesscreatefile_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessCreateFileFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccesscreatefile_fuzzer/externalfileaccesscreatefile_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn
index df88e34d53259d5585e45dd07f6d617b5f64f13c..5d7bdcb813066747511befb9ff14db5eed77bf0d 100644
--- a/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn
@@ -21,9 +21,6 @@ ohos_fuzztest("ExternalFileAccessDeleteFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccessdelete_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -35,8 +32,6 @@ ohos_fuzztest("ExternalFileAccessDeleteFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessdelete_fuzzer/externalfileaccessdelete_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn
index b523021debfffb2925c137d0132d734c815dbc52..bba16afa88b11c86f44ff47f614d0510a6c3695c 100644
--- a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromRelativePathFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromRelativePathFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/externalfileaccessgetfileinfofromrelativepath_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn
index 3c1f23344b3c7d049670921530a6f47165943825..9e09df228e88808b8955808c48e042295d6c5c1b 100644
--- a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromUriFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromUriFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/externalfileaccessgetfileinfofromuri_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn
index 57cdc829f4acbcbcac726cf3e39e346bb886529e..29428da94d301c080bb6905bc7b88baec589bfd3 100644
--- a/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessGetRootsFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccessgetroots_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessGetRootsFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessgetroots_fuzzer/externalfileaccessgetroots_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn
index e2e39d1c308170fc67e1055a5ce5a8db0ed141c6..a935c0b4bad5f96488dba868e3347767c387e3ec 100644
--- a/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessListFileFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccesslistfile_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessListFileFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccesslistfile_fuzzer/externalfileaccesslistfile_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn
index bc85b62a3382eec2155686d61ece9bdf3598ad32..40d302d3136e38277dfaa3e4a8401a4d4a299975 100644
--- a/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn
@@ -21,9 +21,6 @@ ohos_fuzztest("ExternalFileAccessMkdirFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccessmkdir_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -35,8 +32,6 @@ ohos_fuzztest("ExternalFileAccessMkdirFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessmkdir_fuzzer/externalfileaccessmkdir_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn
index f98b0df0c132a265fe938f3a40a96bd5405366c9..c04b0e071fb909d1b4cc22679325ee069205ed93 100644
--- a/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn
@@ -21,9 +21,6 @@ ohos_fuzztest("ExternalFileAccessMoveFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccessmove_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -35,8 +32,6 @@ ohos_fuzztest("ExternalFileAccessMoveFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessmove_fuzzer/externalfileaccessmove_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn
index 248f4d3879f8f497a51ac37027c058c369fd728d..ce879f44e6e4640e2d2a40e50425570d227e5b7b 100644
--- a/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessOpenFileFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccessopenfile_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessOpenFileFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessopenfile_fuzzer/externalfileaccessopenfile_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn
index e2208bd05fd132ca580a09b5bacb1e7d8bc73ac5..26796a8533c9eb49af2fa3888250f2b227fc9d58 100644
--- a/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn
@@ -21,9 +21,6 @@ ohos_fuzztest("ExternalFileAccessRenameFuzzTest") {
       "${user_file_service_path}/test/fuzztest/externalfileaccessrename_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -35,8 +32,6 @@ ohos_fuzztest("ExternalFileAccessRenameFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessrename_fuzzer/externalfileaccessrename_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn
index e58226a6a0d0e6b8136c3ae6e45138aa8ee4abb4..7452eeb0b44e5c201acc3a782bb34e66a5d72fb3 100644
--- a/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn
+++ b/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("ExternalFileAccessScanFileFuzzTest") {
   fuzz_config_file = "${user_file_service_path}/test/fuzztest/externalfileaccessscanfile_fuzzer"
   include_dirs = [
     "${user_file_service_path}/utils",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/app",
-    "${ability_runtime_kits_path}/appkit/native/app/include",
-    "${ability_runtime_kits_path}/appkit/native/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
   ]
   cflags = [
@@ -34,8 +31,6 @@ ohos_fuzztest("ExternalFileAccessScanFileFuzzTest") {
   sources = [ "${user_file_service_path}/test/fuzztest/externalfileaccessscanfile_fuzzer/externalfileaccessscanfile_fuzzer.cpp" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
   ]
diff --git a/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn b/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn
index cde30d089cc58132e0cba002c45259ecd2e6b68b..1e28168ff05834200794779a742edd06ea0e75f3 100644
--- a/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn
+++ b/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn
@@ -20,8 +20,6 @@ ohos_fuzztest("FileAccessExtConnectionFuzzTest") {
   fuzz_config_file =
       "${user_file_service_path}/test/fuzztest/fileaccessextconnection_fuzzer"
   include_dirs = [
-    "${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/services/native/file_access_service/include",
     "${user_file_service_path}/interfaces/kits/js/src/common",
diff --git a/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn b/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn
index 14cb9d168a3151a1280f6c8db46d80d2c316f640..9caf3d9bee48c6281893b732e02046094a9b01cf 100644
--- a/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn
+++ b/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn
@@ -23,7 +23,6 @@ ohos_fuzztest("MedialibraryFileAccessFuzzTest") {
       "${user_file_service_path}/test/fuzztest/medialibraryfileaccess_fuzzer"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/utils",
   ]
@@ -31,11 +30,7 @@ ohos_fuzztest("MedialibraryFileAccessFuzzTest") {
   sources = [ "medialibrary_file_access_fuzzer.cpp" ]
   configs = [ "//build/config/compiler:exceptions" ]
 
-  deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
-    "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
-  ]
+  deps = [ "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit" ]
 
   external_deps = [
     "ability_base:want",
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index f577fd7544162feb8a559d71ed0dec947984c47e..0dc95ffe73ed3c3b3edf3ffcdcd9471cc911d56d 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -29,25 +29,20 @@ ohos_unittest("medialibrary_file_access_test") {
     "medialibrary_file_access_test_info.cpp",
   ]
 
-  include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
-    "${user_file_service_path}/interfaces/inner_api/file_access/include",
-    "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx/",
-  ]
+  include_dirs =
+      [ "${user_file_service_path}/interfaces/inner_api/file_access/include" ]
 
   configs = [ "//build/config/compiler:exceptions" ]
 
-  deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
-    "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
-  ]
+  deps = [ "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit" ]
 
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:abilitykit_native",
+    "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
     "ability_runtime:wantagent_innerkits",
@@ -83,7 +78,6 @@ ohos_unittest("external_file_access_basic_test") {
   ]
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/services/native/file_access_service/include",
   ]
@@ -91,8 +85,6 @@ ohos_unittest("external_file_access_basic_test") {
   configs = [ "//build/config/compiler:exceptions" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
     "${user_file_service_path}/services:file_access_service",
@@ -104,6 +96,8 @@ ohos_unittest("external_file_access_basic_test") {
     "ability_base:zuri",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:abilitykit_native",
+    "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
     "ability_runtime:wantagent_innerkits",
@@ -140,7 +134,6 @@ ohos_unittest("external_file_access_management_test") {
   ]
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/services/native/file_access_service/include",
   ]
@@ -148,8 +141,6 @@ ohos_unittest("external_file_access_management_test") {
   configs = [ "//build/config/compiler:exceptions" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
     "${user_file_service_path}/services:file_access_service",
@@ -161,6 +152,8 @@ ohos_unittest("external_file_access_management_test") {
     "ability_base:zuri",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:abilitykit_native",
+    "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
     "ability_runtime:wantagent_innerkits",
@@ -193,7 +186,6 @@ ohos_unittest("external_file_access_notify_test") {
   sources = [ "external_notify_test.cpp" ]
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/services/native/file_access_service/include",
   ]
@@ -201,8 +193,6 @@ ohos_unittest("external_file_access_notify_test") {
   configs = [ "//build/config/compiler:exceptions" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
     "${user_file_service_path}/services:file_access_service",
@@ -214,6 +204,8 @@ ohos_unittest("external_file_access_notify_test") {
     "ability_base:zuri",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:abilitykit_native",
+    "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
     "ability_runtime:wantagent_innerkits",
@@ -246,16 +238,12 @@ ohos_unittest("abnormal_file_access_test") {
     "abnormal_file_access_test.cpp",
   ]
 
-  include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
-    "${user_file_service_path}/interfaces/inner_api/file_access/include",
-  ]
+  include_dirs =
+      [ "${user_file_service_path}/interfaces/inner_api/file_access/include" ]
 
   configs = [ "//build/config/compiler:exceptions" ]
 
   deps = [
-    "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_ext_base_include",
     "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit",
     "${user_file_service_path}/services:file_access_service_base_source",
@@ -266,6 +254,8 @@ ohos_unittest("abnormal_file_access_test") {
     "ability_base:zuri",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:abilitykit_native",
+    "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:runtime",
     "ability_runtime:wantagent_innerkits",
@@ -294,9 +284,6 @@ ohos_unittest("file_access_ext_stub_impl_test") {
   module_out_path = "user_file_service/user_file_service"
 
   include_dirs = [
-    "${ability_runtime_napi_path}/inner/napi_common",
-    "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime",
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/interfaces/kits/js/src/common",
     "${user_file_service_path}/utils",
@@ -344,9 +331,6 @@ ohos_unittest("js_file_access_ext_ability_test") {
   module_out_path = "user_file_service/user_file_service"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
-    "${commonlibrary_path}/c_utils/base/include",
-    "${file_api_path}/utils/filemgmt_libn/include",
     "${user_file_service_path}/interfaces/inner_api/file_access/include",
     "${user_file_service_path}/interfaces/inner_api/file_access/src",
     "${user_file_service_path}/interfaces/kits/js/src/common",
@@ -379,6 +363,7 @@ ohos_unittest("js_file_access_ext_ability_test") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "file_api:filemgmt_libn",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
diff --git a/test/unittest/external_file_access_test_info.cpp b/test/unittest/external_file_access_test_info.cpp
index c526a705a7de57d855a8255dd649c383cde57c3a..afe609151b8a9b9dc13932cef97028e706c07a30 100644
--- a/test/unittest/external_file_access_test_info.cpp
+++ b/test/unittest/external_file_access_test_info.cpp
@@ -43,7 +43,7 @@ static int g_num = 0;
  * @tc.level Level 1
  * @tc.require: SR000H0387
  */
-HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::ext::TestSize.Level1)
+HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::ext::TestSize.Level0)
 {
     shared_ptr<FileAccessHelper> fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper();
     EXPECT_NE(fileAccessHelper, nullptr);