diff --git a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
index a04a1d620a19c27b38bf96374ceebea23cd0ea63..94d220992a5f20d4bb72642aae398a2a6073e554 100644
--- a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
@@ -20,9 +20,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
   module_out_path = "datamgr_service/datamgr_service"
 
   include_dirs = [
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
     "${data_service_path}/service/bootstrap/include",
     "${data_service_path}/service/config/include",
     "${data_service_path}/service/crypto/include",
@@ -46,8 +43,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
     "${data_service_path}/adapter/include/installer",
     "${data_service_path}/adapter/include/utils",
     "${data_service_path}/adapter/include",
-    "${device_manager_path}/interfaces/inner_kits/native_cpp/include",
-    "//third_party/json/single_include",
     "${data_service_path}/adapter/include/communicator",
   ]
 
@@ -89,7 +84,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
     "${data_service_path}/app/src/installer:distributeddata_installer",
     "${data_service_path}/framework:distributeddatasvcfwk",
     "${data_service_path}/service:distributeddatasvc",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -100,6 +94,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "dataclassification:data_transit_mgr",
+    "device_manager:devicemanagersdk",
     "file_api:securitylabel",
     "hicollie:libhicollie",
     "hilog:libhilog",
@@ -109,6 +104,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "memmgr:memmgrclient",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn
index 53b402127441eb41b1d812b7e95b8a5586ad9466..54c93f086fcdf7d53318c162c0fb04e959e35ff6 100644
--- a/services/distributeddataservice/framework/BUILD.gn
+++ b/services/distributeddataservice/framework/BUILD.gn
@@ -23,10 +23,6 @@ config("module_config") {
     "include",
     "include/utils",
     "${data_service_path}/adapter/include",
-    "${kv_store_path}/interfaces/innerkits/distributeddata/include",
-    "${kv_store_common_path}",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/include/",
   ]
 }
 
@@ -140,9 +136,11 @@ ohos_shared_library("distributeddatasvcfwk") {
     "hilog:libhilog",
     "json:nlohmann_json_static",
     "openssl:libcrypto_shared",
+    "kv_store:distributeddata_inner",
+    "kv_store:distributeddb",
   ]
   subsystem_name = "distributeddatamgr"
 
   part_name = "datamgr_service"
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
-}
+}
\ No newline at end of file
diff --git a/services/distributeddataservice/rust/extension/BUILD.gn b/services/distributeddataservice/rust/extension/BUILD.gn
index d1c0fdc1d9dcba25c6c8102985f7961a48a950df..6cbd292433603811b2a941bc68eb444b2c1d7d26 100644
--- a/services/distributeddataservice/rust/extension/BUILD.gn
+++ b/services/distributeddataservice/rust/extension/BUILD.gn
@@ -23,7 +23,6 @@ config("module_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "../../framework/include",
-    "${kv_store_common_path}",
   ]
 }
 
@@ -66,4 +65,4 @@ ohos_shared_library("opencloudextension") {
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
-}
+}
\ No newline at end of file
diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn
index 2b8003be8137c4bd19b0cd10f74b2c36137b1033..0a0d5e65122af98d230645f97d92abe74d636752 100644
--- a/services/distributeddataservice/service/crypto/BUILD.gn
+++ b/services/distributeddataservice/service/crypto/BUILD.gn
@@ -53,4 +53,4 @@ ohos_source_set("distributeddata_crypto") {
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
-}
+}
\ No newline at end of file
diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn
index 8bc36903c6e47bf6aadf24dfe0103e78c479b115..ef7b7be1ff09e85442d5374bba8b8ce10dfc8aba 100644
--- a/services/distributeddataservice/service/data_share/BUILD.gn
+++ b/services/distributeddataservice/service/data_share/BUILD.gn
@@ -142,4 +142,4 @@ ohos_source_set("data_share_service") {
   subsystem_name = "distributeddatamgr"
 
   part_name = "datamgr_service"
-}
+}
\ No newline at end of file
diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn
index e9d0d0a84bfb23523fe8678f0c72907a5725c0f8..9f9aebfe4ff6b20c02f89ce21e8d5492f9233ff5 100644
--- a/services/distributeddataservice/service/test/BUILD.gn
+++ b/services/distributeddataservice/service/test/BUILD.gn
@@ -21,7 +21,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
     "${data_service_path}/adapter/include",
     "${data_service_path}/app/src",
     "${data_service_path}/framework/include",
@@ -44,12 +43,6 @@ config("module_private_config") {
     "${data_service_path}/service/permission/include",
     "${data_service_path}/service/rdb/",
     "${data_service_path}/service/test/mock",
-    "${dataobject_path}/interfaces/innerkits",
-    "${dataobject_path}/frameworks/innerkitsimpl/include",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/include/",
-    "${relational_store_path}/interfaces/inner_api/cloud_data/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
     "${data_service_path}/adapter/include/communicator",
   ]
   cflags = [ "-Werror" ]
@@ -193,11 +186,6 @@ ohos_unittest("ValueProxyServiceTest") {
     "value_proxy_test.cpp",
   ]
 
-  include_dirs = [
-    "../../../../../relational_store/interfaces/inner_api/rdb/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-  ]
-
   configs = [ ":module_private_config" ]
 
   cflags = [
@@ -215,11 +203,11 @@ ohos_unittest("ValueProxyServiceTest") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddb",
+    "relational_store:native_rdb",
   ]
 
   deps = [
-    "${kv_store_distributeddb_path}:distributeddb",
-    "${relational_store_inner_api_path}:native_rdb_static",
     "../../framework:distributeddatasvcfwk",
     "../../service:distributeddatasvc",
   ]
@@ -318,6 +306,7 @@ ohos_unittest("DeviceMatrixTest") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "c_utils:utils",
+    "device_manager:devicemanagersdk",
     "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -368,6 +357,7 @@ ohos_unittest("KVDBGeneralStoreTest") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "c_utils:utils",
+    "device_manager:devicemanagersdk",
     "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -489,12 +479,12 @@ ohos_unittest("RdbResultSetImplTest") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "kv_store:distributeddb",
+    "relational_store:native_rdb",
   ]
 
   deps = [
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${relational_store_inner_api_path}:native_rdb_static",
   ]
 }
 
@@ -523,12 +513,6 @@ ohos_unittest("RdbServiceTest") {
     "rdb_result_set_stub_test.cpp",
   ]
 
-  include_dirs = [
-    "${relational_store_path}/interfaces/inner_api/cloud_data/include",
-    "${relational_store_path}/interfaces/inner_api/rdb/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-  ]
-
   configs = [ ":module_private_config" ]
 
   cflags = [
@@ -543,17 +527,19 @@ ohos_unittest("RdbServiceTest") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "c_utils:utils",
+    "device_manager:devicemanagersdk",
     "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddb",
+    "relational_store:native_rdb",
   ]
 
   deps = [
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
     "${data_service_path}/service:distributeddatasvc",
-    "${relational_store_inner_api_path}:native_rdb_static",
   ]
 }
 
@@ -715,6 +701,7 @@ ohos_unittest("ObjectDmsHandlerTest") {
 
   external_deps = [
     "c_utils:utils",
+    "device_manager:devicemanagersdk",
     "dmsfwk:distributed_sdk",
     "googletest:gtest_main",
     "hilog:libhilog",
@@ -854,9 +841,6 @@ ohos_unittest("MetaDataTest") {
     "${data_service_path}/app/src",
     "${data_service_path}/service/kvdb",
     "${data_service_path}/adapter/include/account",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
     "${data_service_path}/adapter/include/communicator",
   ]
 
@@ -868,13 +852,16 @@ ohos_unittest("MetaDataTest") {
     "access_token:libtoken_setproc",
     "c_utils:utils",
     "dataclassification:data_transit_mgr",
+    "device_manager:devicemanagersdk",
     "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
     "kv_store:distributeddb",
+    "kv_store:kvdb_inner_lite",
   ]
 
   deps = [
@@ -914,6 +901,7 @@ ohos_unittest("UdmfRunTimeStoreTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "dataclassification:data_transit_mgr",
+    "device_manager:devicemanagersdk",
     "dsoftbus:softbus_client",
     "googletest:gtest_main",
     "hilog:libhilog",
@@ -1096,9 +1084,6 @@ ohos_unittest("KvdbServiceImplTest") {
     "${data_service_path}/framework/include/cloud",
     "${data_service_path}/framework/include/eventcenter",
     "${data_service_path}/service/test/mock",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
     "${data_service_path}/adapter/include/communicator",
   ]
 
@@ -1116,13 +1101,16 @@ ohos_unittest("KvdbServiceImplTest") {
     "c_utils:utils",
     "dataclassification:data_transit_mgr",
     "device_auth:deviceauth_sdk",
+    "device_manager:devicemanagersdk",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
     "kv_store:distributeddb",
+    "kv_store:kvdb_inner_lite",
     "relational_store:native_rdb",
   ]
 
diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
index 55b263a748d9bfab4810b52d5338fed2cb4fb987..3f059f61afd2b6263217c11011ac9a4358ad91d2 100644
--- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
@@ -30,6 +30,7 @@ ohos_fuzztest("CloudServiceStubFuzzTest") {
     "${data_service_path}/service/object",
     "${data_service_path}/service/permission/include",
     "${data_service_path}/service/rdb",
+    "${data_service_path}/adapter/include/communicator",
   ]
 
   fuzz_config_file = "${data_service_path}/service/test/fuzztest/cloudservicestub_fuzzer"
@@ -54,11 +55,11 @@ ohos_fuzztest("CloudServiceStubFuzzTest") {
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
+    "${data_service_path}/service:distributeddatasvc",
     "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
     "${data_service_path}/service/cloud:distributeddata_cloud",
     "${data_service_path}/service/common:distributeddata_common",
     "${data_service_path}/service/rdb:distributeddata_rdb",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -77,6 +78,7 @@ ohos_fuzztest("CloudServiceStubFuzzTest") {
     "kv_store:datamgr_common",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "relational_store:native_rdb",
     "resource_management:global_resmgr",
     "safwk:system_ability_fwk",
diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn
index dfb20f04e232c9d0a260fd140a2be847a4a0d2e0..d365536bdd22ba3d297fb48fb3d1f1ea95ef2948 100644
--- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn
@@ -34,10 +34,6 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") {
     "${data_service_path}/service/data_share",
     "${data_service_path}/service/kvdb",
     "${data_service_path}/service/permission/include",
-    "${datashare_path}/frameworks/native/common/include",
-    "${datashare_path}/interfaces/inner_api/common/include",
-    "${datashare_path}/interfaces/inner_api/consumer/include",
-    "//third_party/json/single_include",
     "${data_service_path}/adapter/include/communicator",
   ]
 
@@ -123,6 +119,7 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
+    "data_share:datashare_consumer",
     "device_manager:devicemanagersdk",
     "hicollie:libhicollie",
     "hilog:libhilog",
diff --git a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn
index 2fd165553fc82a02c25e2bec66fe165409078770..d354f4604b6bd73b82c274e49bf3b1baf6ba3b16 100644
--- a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn
@@ -19,22 +19,7 @@ import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni")
 ohos_fuzztest("DumpHelperFuzzTest") {
   module_out_path = "datamgr_service/datamgr_service"
 
-  include_dirs = [
-    "${data_service_path}/service/dumper/include",
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_distributeddb_path}",
-    "${kv_store_distributeddb_path}/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/relational",
-    "${dataobject_path}/frameworks/innerkitsimpl/include",
-    "${relational_store_path}/interfaces/inner_api/cloud_data/include",
-    "${relational_store_path}/interfaces/inner_api/rdb/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-    "//third_party/json/single_include",
-  ]
+  include_dirs = [ "${data_service_path}/service/dumper/include" ]
 
   fuzz_config_file =
       "${data_service_path}/service/test/fuzztest/dumphelper_fuzzer"
@@ -55,7 +40,6 @@ ohos_fuzztest("DumpHelperFuzzTest") {
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -75,6 +59,7 @@ ohos_fuzztest("DumpHelperFuzzTest") {
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "relational_store:native_rdb",
   ]
 }
diff --git a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn
index 87efa4b39748655714529db3064e91d4c3811773..c16e2a5d7122e628593074afd36e1946d705d621 100644
--- a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn
@@ -33,16 +33,6 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") {
     "${data_service_path}/service/matrix/include",
     "${data_service_path}/service/permission/include",
     "${data_service_path}/service/rdb",
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_distributeddb_path}",
-    "${kv_store_distributeddb_path}/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/relational",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-    "//third_party/json/single_include",
     "${data_service_path}/adapter/include/communicator",
     "${data_service_path}/adapter/include/utils",
   ]
@@ -102,7 +92,6 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") {
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
     "${data_service_path}/service:distributeddatasvc",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -121,6 +110,7 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") {
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
diff --git a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn
index e3d93e45b12bc78a313eddf3fe9dc341d70375f3..eb91837f6d267fa1321da465d52f742a0677ccce 100755
--- a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn
@@ -30,19 +30,6 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") {
     "${data_service_path}/service/crypto/include",
     "${data_service_path}/service/object/include",
     "${data_service_path}/service/matrix/include",
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_distributeddb_path}",
-    "${kv_store_distributeddb_path}/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/relational",
-    "${dataobject_path}/frameworks/innerkitsimpl/include",
-    "${dataobject_path}/frameworks/innerkitsimpl/include/common",
-    "${dataobject_path}/interfaces/innerkits",
-    "//third_party/json/single_include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
     "${data_service_path}/adapter/include/communicator",
     "${data_service_path}/adapter/include/utils",
   ]
@@ -94,7 +81,6 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") {
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
     "${data_service_path}/service:distributeddatasvc",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -105,6 +91,7 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") {
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
+    "data_object:data_object_inner",
     "data_object:distributeddataobject_impl",
     "device_auth:deviceauth_sdk",
     "device_manager:devicemanagersdk",
@@ -118,6 +105,7 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") {
     "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
   ]
 }
 
diff --git a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn
index 984eddf37dd2aad45543a029a8ed40df530a584d..90e0d2f23426e8779d06577a872acbb8365c4773 100644
--- a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn
@@ -25,18 +25,6 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") {
     "${data_service_path}/framework/include",
     "${data_service_path}/service/rdb",
     "${data_service_path}/service/common",
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_distributeddb_path}",
-    "${kv_store_distributeddb_path}/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/relational",
-    "${relational_store_path}/interfaces/inner_api/cloud_data/include",
-    "${relational_store_path}/interfaces/inner_api/rdb/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-    "//third_party/json/single_include",
   ]
 
   fuzz_config_file =
@@ -60,8 +48,6 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") {
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${kv_store_distributeddb_path}:distributeddb",
-    "${relational_store_inner_api_path}:native_rdb_static",
   ]
 
   external_deps = [
@@ -80,6 +66,7 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") {
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "relational_store:native_rdb",
   ]
 }
diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
index d8f90d8320d4f05b161aad8fa1cee0e0af049493..23fe264db5717c5da8cd8248cfbc63e2eb131c03 100644
--- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
@@ -35,19 +35,6 @@ ohos_fuzztest("RdbServiceStubFuzzTest") {
     "${data_service_path}/service/object",
     "${data_service_path}/service/permission/include",
     "${data_service_path}/service/rdb",
-    "${kv_store_common_path}",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
-    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
-    "${kv_store_distributeddb_path}",
-    "${kv_store_distributeddb_path}/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/",
-    "${kv_store_distributeddb_path}/interfaces/include/relational",
-    "${dataobject_path}/frameworks/innerkitsimpl/include",
-    "${relational_store_path}/interfaces/inner_api/cloud_data/include",
-    "${relational_store_path}/interfaces/inner_api/rdb/include",
-    "${relational_store_path}/interfaces/inner_api/common_type/include",
-    "//third_party/json/single_include",
     "${data_service_path}/adapter/include/communicator",
   ]
 
@@ -72,11 +59,11 @@ ohos_fuzztest("RdbServiceStubFuzzTest") {
     "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
+    "${data_service_path}/service:distributeddatasvc",
     "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
     "${data_service_path}/service/cloud:distributeddata_cloud",
     "${data_service_path}/service/common:distributeddata_common",
     "${data_service_path}/service/rdb:distributeddata_rdb",
-    "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
@@ -97,6 +84,7 @@ ohos_fuzztest("RdbServiceStubFuzzTest") {
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
     "relational_store:native_rdb",
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
diff --git a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn
index 27778e7e3510bfea62c572d1da3c0866496de80b..bd9b426a68ccccb27357bccd0cc6e32991c88c83 100644
--- a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn
@@ -20,16 +20,12 @@ ohos_fuzztest("UdmfServiceFuzzTest") {
   module_out_path = "datamgr_service/datamgr_service"
 
   include_dirs = [
-    "${udmf_path}/framework/common",
-    "${udmf_path}/interfaces/innerkits/common",
-    "${udmf_path}/interfaces/innerkits/data",
     "${data_service_path}/framework/include",
     "${data_service_path}/service/udmf/lifecycle",
     "${data_service_path}/service/udmf/permission",
     "${data_service_path}/service/udmf/preprocess",
     "${data_service_path}/service/udmf/store",
     "${data_service_path}/service/udmf",
-    "${kv_store_path}/frameworks/common",
   ]
 
   fuzz_config_file =
@@ -77,4 +73,4 @@ group("fuzztest") {
 
   deps = [ ":UdmfServiceFuzzTest" ]
 }
-###############################################################################
+###############################################################################
\ No newline at end of file