diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn
index 8e328fa169555772e7791012961c2936805d383c..19bb0573d572b9ebebfba91db0593157f7d89021 100644
--- a/common/dfx_utils/test/unittest/BUILD.gn
+++ b/common/dfx_utils/test/unittest/BUILD.gn
@@ -52,7 +52,6 @@ config("module_private_config") {
     "${services_path}/common/audioeventcallback",
     "${services_path}/audiomanager/managersource/include",
     "${softbusadapter_path}/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -82,6 +81,7 @@ ohos_unittest("DAudioDfxTest") {
   external_deps = [
     "audio_framework:audio_capturer",
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "ipc:ipc_core",
diff --git a/hdf_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json
index 0b2891a41bd527730bba4fe65ad61d956cb68e04..3d0799d4ac02bddc2606220a99d6be900cce8728 100644
--- a/hdf_interfaces/distributed_audio/bundle.json
+++ b/hdf_interfaces/distributed_audio/bundle.json
@@ -3,10 +3,12 @@
     "description": "distributed audio device driver interface",
     "version": "4.0",
     "license": "Apache License 2.0",
+    "segment":{
+        "destPath":"foundation/distributedhardware/distributed_audio/hdf_interfaces/"
+    },
     "component": {
         "name": "drivers_interface_distributed_audio",
         "subsystem": "distributedhardware",
-        "syscap": [""],
         "adapted_system_type":[
             "standard"
         ],
diff --git a/hdf_service/distributed_audio/bundle.json b/hdf_service/distributed_audio/bundle.json
index 605514fa696ca6fc6970fc02f1dd8e32acac0caf..c01de7d019ab5debef4b97a9981fc29d1101fc79 100644
--- a/hdf_service/distributed_audio/bundle.json
+++ b/hdf_service/distributed_audio/bundle.json
@@ -3,10 +3,12 @@
     "description": "distributed audo device driver",
     "version": "4.0",
     "license": "Apache License 2.0",
+    "segment":{
+      "destPath":"foundation/distributedhardware/distributed_audio/hdf_service/"
+    },
     "component": {
       "name": "drivers_peripheral_distributed_audio",
       "subsystem": "distributedhardware",
-      "syscap": [ "" ],
       "adapted_system_type":[
         "standard"
       ],
diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn
index c758d7052908010036b30c4bb60079be958e54d9..db812ce56e7384876b01aa7eea2f0568a750f608 100644
--- a/services/audioclient/test/unittest/spkclient/BUILD.gn
+++ b/services/audioclient/test/unittest/spkclient/BUILD.gn
@@ -22,7 +22,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
     "${mediastandardfwk_path}/audiocommon/include",
     "${mediastandardfwk_path}/audiomanager/include",
     "${mediastandardfwk_path}/audiorenderer/include",
diff --git a/services/audiomanager/managersink/include/daudio_sink_dev.h b/services/audiomanager/managersink/include/daudio_sink_dev.h
index 8e5d07efa396afb8fcfd7ce822cae8dfa34b6db0..1a87a97a42ad10b5edd1d51192e5153b70b53bc7 100644
--- a/services/audiomanager/managersink/include/daudio_sink_dev.h
+++ b/services/audiomanager/managersink/include/daudio_sink_dev.h
@@ -29,7 +29,7 @@
 #include "imic_client.h"
 #include "ispk_client.h"
 #include "iaudio_event_callback.h"
-#ifdef DDAUDIO_SUPPORT_DIRECT
+#ifdef DAUDIO_SUPPORT_DIRECT
 #include "direct_dmic_client.h"
 #include "direct_dspeaker_client.h"
 #endif
diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp
index 566e508b079a87f5a782c29cc02bc9ce1a8b12d3..945c7e949ae3a885b5930359b2e9a6988b6a45d8 100644
--- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp
+++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp
@@ -394,10 +394,10 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args)
     if (speakerClient_ == nullptr) {
         speakerClient_ = std::make_shared<DSpeakerClient>(devId_, shared_from_this());
     }
-#ifdef DDAUDIO_SUPPORT_DIRECT
+#ifdef DAUDIO_SUPPORT_DIRECT
     if (audioParam.renderOpts.renderFlags == MMAP_MODE) {
         DHLOGI("Try to mmap mode.");
-        speakerClient_ = std::shared_ptr<DirectDSpeakerClient>();
+        speakerClient_ = std::make_shared<DirectDSpeakerClient>();
         speakerClient_->SetAttrs(devId_, shared_from_this());
     }
 #endif
@@ -464,7 +464,7 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args)
         if (micClient_ == nullptr) {
             micClient_ = std::make_shared<DMicClient>(devId_, shared_from_this());
         }
-#ifdef DDAUDIO_SUPPORT_DIRECT
+#ifdef DAUDIO_SUPPORT_DIRECT
         if (audioParam.captureOpts.capturerFlags == MMAP_MODE) {
             DHLOGI("Try to mmap mode.");
             micClient_ = std::make_shared<DirectDMicClient>();
diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn
index 912a3cd23bf848cee485c6a4f1df04a5fa479670..aa5a46f4387c43fefcf15eaa485796a8efa3b91a 100755
--- a/services/audiomanager/servicesink/BUILD.gn
+++ b/services/audiomanager/servicesink/BUILD.gn
@@ -17,7 +17,6 @@ import("../../../distributedaudio.gni")
 
 ohos_shared_library("distributed_audio_sink") {
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
   ]
@@ -92,6 +91,7 @@ ohos_shared_library("distributed_audio_sink") {
     "audio_framework:audio_client",
     "audio_framework:audio_renderer",
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "drivers_interface_audio:libaudio_proxy_1.0",
     "hdf_core:libhdf_ipc_adapter",
     "hdf_core:libhdi",
diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn
index ae7f7f08f6d4fcd8a28e5404428f96582e1dc573..90bdfebc52fa6af75f89ceb3f49846da65469bee 100755
--- a/services/audiomanager/servicesource/BUILD.gn
+++ b/services/audiomanager/servicesource/BUILD.gn
@@ -18,7 +18,6 @@ import("../../../distributedaudio.gni")
 ohos_shared_library("distributed_audio_source") {
   include_dirs = [
     "//drivers/peripheral/audio/interfaces/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -89,6 +88,7 @@ ohos_shared_library("distributed_audio_source") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hdf_core:libhdi",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
diff --git a/services/audiomanager/test/unittest/servicesink/BUILD.gn b/services/audiomanager/test/unittest/servicesink/BUILD.gn
index 13771b467c88890ed7238f07ebe41117d9f6ceff..3adbfa4c7f6574675f3cc1118a06df646669f439 100644
--- a/services/audiomanager/test/unittest/servicesink/BUILD.gn
+++ b/services/audiomanager/test/unittest/servicesink/BUILD.gn
@@ -23,7 +23,6 @@ config("module_private_config") {
 
   include_dirs = [
     "${audio_framework_path}/audiopolicy/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -83,6 +82,7 @@ ohos_unittest("DaudioSinkServiceTest") {
     "audio_framework:audio_client",
     "audio_framework:audio_renderer",
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "ipc:ipc_core",
diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn
index f5b42b866966e327bdc3e598407120208b4402d8..034f8ffd4e9735ba36df3066c09adc8639c6dda0 100644
--- a/services/audiomanager/test/unittest/servicesource/BUILD.gn
+++ b/services/audiomanager/test/unittest/servicesource/BUILD.gn
@@ -24,7 +24,6 @@ config("module_private_config") {
   include_dirs = [
     "${audio_framework_path}/audiopolicy/include",
     "//drivers/peripheral/audio/interfaces/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -93,6 +92,7 @@ ohos_unittest("DaudioSourceServiceTest") {
     "audio_framework:audio_client",
     "audio_framework:audio_renderer",
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "ipc:ipc_core",
diff --git a/services/audiomanager/test/unittest/source_device/BUILD.gn b/services/audiomanager/test/unittest/source_device/BUILD.gn
index 10de2f67510354dc04294179aa29e6b12184550a..a68ba390d32df8967d0399ffeca183daf23cfcbd 100644
--- a/services/audiomanager/test/unittest/source_device/BUILD.gn
+++ b/services/audiomanager/test/unittest/source_device/BUILD.gn
@@ -21,8 +21,6 @@ config("module_private_config") {
 
   include_dirs = [
     "//drivers/peripheral/audio/interfaces/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
-    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -78,6 +76,7 @@ ohos_unittest("DaudioSourceDevTest") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
diff --git a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn
index 2c9eed3a581210f2b1d3af60fc38970a06689f2b..e732f1dcc5594c2c54110894069115ca7a15d65e 100644
--- a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn
+++ b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn
@@ -21,7 +21,6 @@ config("module_private_config") {
 
   include_dirs = [
     "//drivers/peripheral/audio/interfaces/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${mediastandardfwk_path}/audiocapturer/include",
@@ -76,6 +75,7 @@ ohos_unittest("DaudioSourceMgrTest") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hdf_core:libhdi",
     "ipc:ipc_core",
     "ipc:ipc_single",
diff --git a/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn b/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn
index d755aa3567fb2a0ac8c684e4a004cad63d16118f..983a7910c99bb6e614a9418fd6a7e78989bf3067 100644
--- a/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn
+++ b/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn
@@ -17,7 +17,6 @@ import("../../../../distributedaudio.gni")
 
 ohos_shared_library("distributed_audio_data_channel") {
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "${fwk_common_path}/utils/include",
     "//third_party/json/include",
   ]
@@ -41,6 +40,7 @@ ohos_shared_library("distributed_audio_data_channel") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hitrace_native:hitrace_meter",
   ]
 
diff --git a/services/audiotransport/audioctrltransport/BUILD.gn b/services/audiotransport/audioctrltransport/BUILD.gn
index acd8629c77c9a9e12d6caae2106f522aa5fef63b..a039593bcbd9c1b7dc538efaddb680065e0fd6c3 100644
--- a/services/audiotransport/audioctrltransport/BUILD.gn
+++ b/services/audiotransport/audioctrltransport/BUILD.gn
@@ -18,7 +18,6 @@ import("../../../distributedaudio.gni")
 ohos_shared_library("distributed_audio_control") {
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -46,6 +45,7 @@ ohos_shared_library("distributed_audio_control") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
   ]
diff --git a/services/audiotransport/decodetransport/BUILD.gn b/services/audiotransport/decodetransport/BUILD.gn
index 4125bcec0f90fe08f53ddfc31e87e05587be1cfc..85329edeaa410096ab68f778fca47333c6abc670 100644
--- a/services/audiotransport/decodetransport/BUILD.gn
+++ b/services/audiotransport/decodetransport/BUILD.gn
@@ -29,7 +29,6 @@ config("decode_transport_pub_config") {
 
 ohos_shared_library("distributed_audio_decode_transport") {
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "${fwk_common_path}/utils/include",
     "${mediastandard_path}/interfaces/innerkits/native/media/include",
     "${mediastandardfwk_path}/audiocommon/include",
@@ -73,6 +72,7 @@ ohos_shared_library("distributed_audio_decode_transport") {
 
   external_deps = [
     "c_utils:utils",
+    "dsoftbus:softbus_client",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "multimedia_player_framework:media_client",
diff --git a/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn b/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn
index 5f2a8b4148705c086c3ca77cde34b326ce9f8de7..998230c2ea46af5488e646fc00c084048abe320a 100644
--- a/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn
+++ b/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn
@@ -22,7 +22,6 @@ config("module_private_config") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
diff --git a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn
index 64ccb329e7413a5603cade653c4bee8b49e92e89..7696159c1cba62eb0120544f7eff49b1df96721b 100644
--- a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn
+++ b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn
@@ -53,8 +53,6 @@ ohos_unittest("AudioCtrlTransportTest") {
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
-
-  external_deps = [ "graphic_standard:surface" ]
 }
 
 group("audio_ctrl_transport_test") {
diff --git a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn
index 2a7b086608e9e693c2fd0ba901f14f95aca93754..f4b60682a5f491e51a840a23ab4b270f50f68530 100644
--- a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn
+++ b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn
@@ -53,8 +53,6 @@ ohos_unittest("AudioDataChannelTest") {
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
-
-  external_deps = [ "graphic_standard:surface" ]
 }
 
 group("audio_data_channel_test") {
diff --git a/services/audiotransport/test/unittest/decodetransport/BUILD.gn b/services/audiotransport/test/unittest/decodetransport/BUILD.gn
index 3d9b8588b7482fec561b8ec09a54d82185ce7035..ad47021ca3128fa5faf81c8fcd810eef55d218c2 100644
--- a/services/audiotransport/test/unittest/decodetransport/BUILD.gn
+++ b/services/audiotransport/test/unittest/decodetransport/BUILD.gn
@@ -23,7 +23,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "${fwk_common_path}/utils/include",
     "//third_party/json/include",
   ]
@@ -59,6 +58,8 @@ ohos_unittest("DecodeTransportTest") {
     "//third_party/googletest:gtest_main",
   ]
 
+  external_deps = [ "dsoftbus:softbus_client" ]
+
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"daudio_trans_test\"",
diff --git a/services/audiotransport/test/unittest/encodetransport/BUILD.gn b/services/audiotransport/test/unittest/encodetransport/BUILD.gn
index 0303a744b28b73f5e3a8183a077f616800d28950..c6a38a518f09e9f538fbeae4830009783815b907 100644
--- a/services/audiotransport/test/unittest/encodetransport/BUILD.gn
+++ b/services/audiotransport/test/unittest/encodetransport/BUILD.gn
@@ -23,7 +23,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/transport",
     "${fwk_common_path}/utils/include",
     "//third_party/json/include",
   ]
@@ -60,6 +59,8 @@ ohos_unittest("EncodeTransportTest") {
     "//third_party/googletest:gtest_main",
   ]
 
+  external_deps = [ "dsoftbus:softbus_client" ]
+
   defines = [
     "HI_LOG_ENABLE",
     "DH_LOG_TAG=\"daudio_trans_test\"",
diff --git a/services/softbusadapter/BUILD.gn b/services/softbusadapter/BUILD.gn
index eb042afac99bbeaacb584bc8f00a884ec0fa7ac8..d460346c44434687dd42733bdf3333e473fe9c10 100644
--- a/services/softbusadapter/BUILD.gn
+++ b/services/softbusadapter/BUILD.gn
@@ -17,7 +17,6 @@ import("../../distributedaudio.gni")
 
 ohos_shared_library("distributed_audio_softbus_adapter") {
   include_dirs = [
-    "//foundation/communication/dsoftbus/interfaces/kits/common",
     "${fwk_common_path}/utils/include",
     "//third_party/json/include",
   ]
diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn
index 12eefecb55152daed0b4476c12e4fec5eaca3879..189137bd947939a816b4a1ba5a9a8ecd9ac0003e 100644
--- a/services/softbusadapter/test/unittest/BUILD.gn
+++ b/services/softbusadapter/test/unittest/BUILD.gn
@@ -47,8 +47,6 @@ ohos_unittest("SoftBusAdapterTest") {
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
-
-  external_deps = [ "graphic_standard:surface" ]
 }
 
 group("audio_soft_bus_adapter_test") {