diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn
index 83b8bc2107da801b8a9bc6e846b404661b7e27eb..7ef3c07d60c2b516346430cdf66445aec7b10a40 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/",
   ]
 }
 
@@ -34,7 +30,6 @@ config("module_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include",
-    "${kv_store_common_path}",
   ]
 }
 
@@ -141,6 +136,8 @@ ohos_shared_library("distributeddatasvcfwk") {
     "hilog:libhilog",
     "cJSON:cjson",
     "openssl:libcrypto_shared",
+    "kv_store:datamgr_common",
+    "kv_store:distributeddb",
   ]
   subsystem_name = "distributeddatamgr"
 
diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn
index bbac87d0eb39d6ad2930ff30a4a4ccaadd8b532e..28c5ded0f1ded020d602ebd13d139d50d2f4f953 100644
--- a/services/distributeddataservice/framework/test/BUILD.gn
+++ b/services/distributeddataservice/framework/test/BUILD.gn
@@ -122,6 +122,7 @@ ohos_unittest("ServiceUtilsTest") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "cJSON:cjson",
+    "kv_store:datamgr_common",
   ]
 
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
@@ -176,6 +177,10 @@ ohos_unittest("AssetLoaderTest") {
   sources = [ "asset_loader_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("BackupRuleManagerTest") {
@@ -183,6 +188,10 @@ ohos_unittest("BackupRuleManagerTest") {
   sources = [ "backup_rule_manager_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("BindEventTest") {
@@ -190,6 +199,10 @@ ohos_unittest("BindEventTest") {
   sources = [ "bind_event_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("CloudInfoTest") {
@@ -209,6 +222,10 @@ ohos_unittest("EventTest") {
   sources = [ "event_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("GeneralStoreTest") {
@@ -251,6 +268,7 @@ ohos_unittest("MetaDataManagerTest") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "cJSON:cjson",
+    "kv_store:datamgr_common",
   ]
 
   deps = [
@@ -264,7 +282,11 @@ ohos_unittest("StoreMetaDataLocalTest") {
   sources = [ "store_meta_data_local_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
-  external_deps = [ "cJSON:cjson" ]
+  
+  external_deps = [
+    "cJSON:cjson",
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("ConstantTest") {
@@ -272,6 +294,10 @@ ohos_unittest("ConstantTest") {
   sources = [ "constant_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("CryptoTest") {
@@ -279,6 +305,10 @@ ohos_unittest("CryptoTest") {
   sources = [ "crypto_test.cpp" ]
   configs = [ ":module_private_config" ]
   deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+
+  external_deps = [
+    "kv_store:datamgr_common",
+  ]
 }
 
 ohos_unittest("ServiceMetaDataTest") {
diff --git a/services/distributeddataservice/framework/utils/constant.cpp b/services/distributeddataservice/framework/utils/constant.cpp
index 6fedf3f619ba5780cdf8efc664fd0909a11082a9..f0b40f544ef88b25e23c66a4db758a5dbe1930a3 100644
--- a/services/distributeddataservice/framework/utils/constant.cpp
+++ b/services/distributeddataservice/framework/utils/constant.cpp
@@ -15,7 +15,6 @@
 #define LOG_TAG "Constant"
 #include "utils/constant.h"
 #include <fstream>
-#include "log_print.h"
 #include "securec.h"
 
 namespace OHOS {
diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn
index 3a8e1990d8c5f57740832f1fafd0079c03aff348..0370605055015cf8a6b3137daff10a0564a009e3 100644
--- a/services/distributeddataservice/service/common/BUILD.gn
+++ b/services/distributeddataservice/service/common/BUILD.gn
@@ -48,6 +48,7 @@ ohos_source_set("distributeddata_common") {
     "hilog:libhilog",
     "kv_store:distributeddb",
     "relational_store:native_rdb",
+    "kv_store:datamgr_common",
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
diff --git a/services/distributeddataservice/service/config/BUILD.gn b/services/distributeddataservice/service/config/BUILD.gn
index aaf607e58090d03f5a6e280ba5cc5c2e8902a53e..ac8f98861caede8f04c9f984b8f04313e77ff7c7 100644
--- a/services/distributeddataservice/service/config/BUILD.gn
+++ b/services/distributeddataservice/service/config/BUILD.gn
@@ -61,6 +61,7 @@ ohos_source_set("distributeddata_config") {
   external_deps = [
     "hilog:libhilog",
     "cJSON:cjson",
+    "kv_store:datamgr_common",
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn
index 0a0d5e65122af98d230645f97d92abe74d636752..bbd37ad4b6e705dd4300d25cbc4a12154b57e300 100644
--- a/services/distributeddataservice/service/crypto/BUILD.gn
+++ b/services/distributeddataservice/service/crypto/BUILD.gn
@@ -50,6 +50,7 @@ ohos_source_set("distributeddata_crypto") {
     "dmsfwk:distributed_sdk",
     "hilog:libhilog",
     "huks:libhukssdk",
+    "kv_store:datamgr_common",
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn
index c20ecdbfe686594cf1b33c505f7be5275052c2db..c5fb03e7cbb0e011d3b0cd6777f338416c6b3812 100644
--- a/services/distributeddataservice/service/test/BUILD.gn
+++ b/services/distributeddataservice/service/test/BUILD.gn
@@ -475,6 +475,7 @@ ohos_unittest("RdbResultSetImplTest") {
     "ipc:ipc_core",
     "kv_store:distributeddb",
     "relational_store:native_rdb",
+    "kv_store:datamgr_common",
   ]
 
   deps = [