diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn
index 24bb4f567fd821a7af13259f05fcfa322bb902f5..3c78bfa807ba572ff540a152aa933d3647fa9a85 100644
--- a/interfaces/inner_kits/BUILD.gn
+++ b/interfaces/inner_kits/BUILD.gn
@@ -50,9 +50,7 @@ ohos_shared_library("libdhfwk_sdk") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
 
diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn
index 19966eef00c87f1598048660e04a00234a77ae48..815c6b4fbd180f211ba3a61b5fbb767bcbbb974e 100644
--- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn
@@ -43,12 +43,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") {
   ]
   sources = [ "distributedhardwarefwkkit_fuzzer.cpp" ]
 
-  deps = [
-    "${innerkits_path}:libdhfwk_sdk",
-    "${utils_path}:distributedhardwareutils",
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-  ]
+  deps = [ "${innerkits_path}:libdhfwk_sdk" ]
 
   defines = [
     "HI_LOG_ENABLE",
@@ -57,14 +52,8 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") {
   ]
 
   external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "hisysevent_native:libhisysevent",
-    "init:libbegetutil",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn
index 332e4afa7271757f0845b454924b4e0103057581..88a2f53a71de27102d6b7c971cc0bb39fb0f7cdf 100644
--- a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn
+++ b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn
@@ -42,7 +42,6 @@ ohos_unittest("DistributedHardwareFwkKitTest") {
 
   deps = [
     "${innerkits_path}:libdhfwk_sdk",
-    "${utils_path}:distributedhardwareutils",
     "//third_party/googletest:gtest_main",
   ]
 
@@ -54,10 +53,7 @@ ohos_unittest("DistributedHardwareFwkKitTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index eb4226e5d69712947d282478e96084d5b0f43346..d3bc93dc47b45ccf01da5d641299c0ebb4cc099b 100644
--- a/services/distributedhardwarefwkservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/BUILD.gn
@@ -18,7 +18,10 @@ import(
 
 ohos_shared_library("distributedhardwarefwksvr") {
   include_dirs = [
+    "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
+    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
     "//commonlibrary/c_utils/base/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "//utils/system/safwk/native/include",
     "include",
     "include/accessmanager",
@@ -80,8 +83,6 @@ ohos_shared_library("distributedhardwarefwksvr") {
 
   deps = [
     "${utils_path}:distributedhardwareutils",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager",
-    "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
   ]
@@ -93,13 +94,8 @@ ohos_shared_library("distributedhardwarefwksvr") {
   ]
 
   external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
index eca8778d37d77ff0605c05df5c8ddd6ba3d8ca40..03686484f5658128ead8692093adef132a55b509 100644
--- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
+++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "dm_device_info.h"
-#include "hisysevent.h"
 
 #include "anonymous_string.h"
 #include "constants.h"
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
index 06ac5f649618e60e91bf4737dad8699dd37f707b..abe2abd4e52446cd46a0efb825ecc59d9b0a9788 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
@@ -42,12 +42,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") {
   ]
   sources = [ "accessmanager_fuzzer.cpp" ]
 
-  deps = [
-    "${utils_path}:distributedhardwareutils",
-    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
@@ -55,15 +50,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "hisysevent_native:libhisysevent",
-    "init:libbegetutil",
-    "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
-  ]
+  external_deps = [ "init:libbegetutil" ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn
index b257a425c10a8582a0e77fc64c25af1fd8484480..7eb1b468da89f491c4a4676e40ad10ab6b615c88 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn
@@ -44,22 +44,13 @@ ohos_fuzztest("ComponentloaderFuzzTest") {
   ]
   sources = [ "componentloader_fuzzer.cpp" ]
 
-  deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"ComponentloaderFuzzTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
-
-  external_deps = [
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "kv_store:distributeddata_inner",
-  ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
index da1d72f0d3f815a1005e764f6e215578778278f1..c7981ec701e837345433368b9caa933df90a0a5c 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
@@ -33,6 +33,7 @@ ohos_fuzztest("ComponentmanagerFuzzTest") {
     "${common_path}/log/include",
     "//third_party/json/include",
     "//commonlibrary/c_utils/base/include",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
   ]
   cflags = [
     "-g",
@@ -42,21 +43,13 @@ ohos_fuzztest("ComponentmanagerFuzzTest") {
   ]
   sources = [ "componentmanager_fuzzer.cpp" ]
 
-  deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"ComponentmanagerFuzzTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
-
-  external_deps = [
-    "hisysevent_native:libhisysevent",
-    "ipc:ipc_core",
-  ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
index 74e6ad0eba59f4ddc44fbd56dee5e16f0a0a0fdd..cd2bba4110632edf5349a5c2fd6d1d24bd677685 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
@@ -31,9 +31,11 @@ ohos_fuzztest("ResourcemanagerFuzzTest") {
     "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
+    "//base/notification/eventhandler/interfaces/inner_api",
     "//commonlibrary/c_utils/base/include",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "//third_party/json/include",
-    "//commonlibrary/c_utils/base/include",
     "//utils/system/safwk/native/include",
   ]
   cflags = [
@@ -44,10 +46,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") {
   ]
   sources = [ "resourcemanager_fuzzer.cpp" ]
 
-  deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
@@ -55,15 +54,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hiviewdfx_hilog_native:libhilog",
-    "kv_store:distributeddata_inner",
-  ]
+  external_deps = [ "c_utils:utils" ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn
index ffae50ef8d0ef910e120be327060a02faa12728a..30dd02cb398b98fba39fda40089e185b0026303b 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn
@@ -42,21 +42,13 @@ ohos_fuzztest("TaskFuzzTest") {
   ]
   sources = [ "task_fuzzer.cpp" ]
 
-  deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"TaskFuzzTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
-
-  external_deps = [
-    "hisysevent_native:libhisysevent",
-    "ipc:ipc_core",
-  ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn
index 7a1c5a306293bd6e5e49ae7ab471558e0fdfadff..9b71d23db24a9c6a17ce06c391e0fa59df5ddb86 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn
@@ -23,6 +23,8 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") {
   fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer"
 
   include_dirs = [
+    "//base/notification/eventhandler/interfaces/inner_api",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "${utils_path}/include",
     "${utils_path}/include/log",
     "${utils_path}/include/eventbus",
@@ -43,11 +45,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") {
   ]
   sources = [ "versioninfomanager_fuzzer.cpp" ]
 
-  deps = [
-    "${utils_path}:distributedhardwareutils",
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-  ]
+  deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ]
 
   defines = [
     "HI_LOG_ENABLE",
@@ -55,15 +53,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hiviewdfx_hilog_native:libhilog",
-    "kv_store:distributeddata_inner",
-  ]
+  external_deps = [ "c_utils:utils" ]
 }
 
 ###############################################################################
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
index 750786899a8749e5650e9f9d667b9e6254d72085..212af2c63f5f234b3972e867f354bab2e92e300e 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
@@ -19,6 +19,9 @@ module_out_path = "distributed_hardware_fwk/access_manager_test"
 
 config("module_private_config") {
   include_dirs = [
+    "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
+    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
+    "//base/notification/eventhandler/interfaces/inner_api",
     "//commonlibrary/c_utils/base/include",
     "//utils/system/safwk/native/include",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
@@ -50,7 +53,6 @@ ohos_unittest("AccessManagerTest") {
     "${utils_path}:distributedhardwareutils",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//third_party/googletest:gtest_main",
   ]
   defines = [
@@ -59,17 +61,7 @@ ohos_unittest("AccessManagerTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "init:libbegetutil",
-    "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
-  ]
+  external_deps = [ "init:libbegetutil" ]
 }
 
 group("unittest") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
index ff7e1f0024fa901a43eeac11029487f05503b2d8..55056e875c9ec4d555568ce47e33f0beb93a6b9e 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
@@ -47,12 +47,6 @@ ohos_unittest("ComponentLoaderTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  external_deps = [
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "kv_store:distributeddata_inner",
-  ]
-
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"ComponentLoaderTest\"",
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
index 0fe794d654933c65cde9cc829eb5081b07da113c..ac41e4393966126cbeb8feeea26f980b24e27fcd 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
@@ -20,6 +20,9 @@ module_out_path = "distributed_hardware_fwk/component_manager_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
+    "//base/notification/eventhandler/interfaces/inner_api",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
@@ -56,13 +59,6 @@ ohos_unittest("ComponentManagerTest") {
     "DH_LOG_TAG=\"ComponentManagerTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
-
-  external_deps = [
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "ipc:ipc_core",
-    "kv_store:distributeddata_inner",
-  ]
 }
 
 group("component_manager_test") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
index 1027b08582d3aed33837eb4900f43da1f21dc16f..ecf7d4aa0414c2733a07baa62227bbc8ee87c389 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
@@ -20,6 +20,7 @@ module_out_path = "distributed_hardware_fwk/dh_manager_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
+    "//base/notification/eventhandler/interfaces/inner_api",
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
@@ -43,7 +44,6 @@ ohos_unittest("DistributedHardwareManagerTest") {
 
   deps = [
     "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -53,14 +53,6 @@ ohos_unittest("DistributedHardwareManagerTest") {
     "DH_LOG_TAG=\"DistributedHardwareManagerTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
-
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "dsoftbus:softbus_client",
-    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
-  ]
 }
 
 group("distributed_hardware_manager_test") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn
index 543fd5cc9b0573a288383eb831774a6f7ca67f0a..66965cdaa9ed73c427d7b368f369d914e89e3edb 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn
@@ -31,6 +31,7 @@ config("module_private_config") {
     "${services_path}/distributedhardwarefwkservice/include/utils",
     "//third_party/json/include",
     "//commonlibrary/c_utils/base/include",
+    "//base/notification/eventhandler/interfaces/inner_api",
   ]
 }
 
@@ -43,7 +44,6 @@ ohos_unittest("DistributedHardwareServiceTest") {
 
   deps = [
     "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -55,18 +55,9 @@ ohos_unittest("DistributedHardwareServiceTest") {
   ]
 
   external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
-    "init:libbegetutil",
     "ipc:ipc_core",
-    "kv_store:distributeddata_inner",
     "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
index 6fd96114724c3a704d386bb92b88f0257c41e21f..ecc7de1ae1e017aeb27ff8d82eb4f19093ff50a3 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
@@ -20,6 +20,8 @@ module_out_path = "distributed_hardware_fwk/resource_manager_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
+    "//base/notification/eventhandler/interfaces/inner_api",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
@@ -50,15 +52,7 @@ ohos_unittest("ResourceManagerTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hiviewdfx_hilog_native:libhilog",
-    "kv_store:distributeddata_inner",
-  ]
+  external_deps = [ "c_utils:utils" ]
 }
 
 group("resource_manager_test") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn
index 4abe5dec5d0101892c9e7c4016fd4cd5e3829916..c2562bac7cb81cacdabbfd82e9779d018a61ed35 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn
@@ -30,8 +30,10 @@ config("module_private_config") {
     "${services_path}/distributedhardwarefwkservice/include/versionmanager",
     "${common_path}/utils/include",
     "${common_path}/log/include",
-    "//third_party/json/include",
+    "//base/notification/eventhandler/interfaces/inner_api",
     "//commonlibrary/c_utils/base/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
+    "//third_party/json/include",
     "//utils/system/safwk/native/include",
   ]
 }
@@ -53,15 +55,7 @@ ohos_unittest("VersioninfoManagerTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hiviewdfx_hilog_native:libhilog",
-    "kv_store:distributeddata_inner",
-  ]
+  external_deps = [ "c_utils:utils" ]
 }
 
 group("versioninfo_manager_test") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
index 9435ce6ad356231d40e5dc59d35fbab396424a2d..d55ea1270fdb4bcc8afbd14b6b17b56c0b05f38d 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
@@ -20,6 +20,8 @@ module_out_path = "distributed_hardware_fwk/version_manager_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
+    "//base/notification/eventhandler/interfaces/inner_api",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
     "include",
     "${utils_path}/include",
     "${utils_path}/include/eventbus",
@@ -48,11 +50,6 @@ ohos_unittest("VersionManagerTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  external_deps = [
-    "eventhandler:libeventhandler",
-    "kv_store:distributeddata_inner",
-  ]
-
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"VersionManagerTest\"",
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 0ebf69589cc883f3095ce0fff207f384b4e35950..789d4a8047e5a6e1d64544c62fbd2e74fe0b462a 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -17,6 +17,8 @@ import(
 
 ohos_shared_library("distributedhardwareutils") {
   include_dirs = [
+    "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
+    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
     "//third_party/openssl:libcrypto_static",
     "//commonlibrary/c_utils/base/include",
     "//utils/system/safwk/native/include",
@@ -44,11 +46,8 @@ ohos_shared_library("distributedhardwareutils") {
   ]
 
   external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "dsoftbus:softbus_client",
-    "eventhandler:libeventhandler",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",