diff --git a/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h b/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h
index f8efb84890e54b50024f94ae308d9dd873b1a14d..dbc45fa312161b6f8abaf52325ed1ee41a19bdde 100644
--- a/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h
+++ b/services/accesstokenmanager/main/cpp/include/device/atm_device_state_callback.h
@@ -21,24 +21,20 @@
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
-using OHOS::DistributedHardware::DeviceStateCallback;
-using OHOS::DistributedHardware::DmDeviceInfo;
-using OHOS::DistributedHardware::DmInitCallback;
-
-class AtmDmInitCallback final : public DmInitCallback {
+class AtmDmInitCallback final : public DistributedHardware::DmInitCallback {
     void OnRemoteDied() override
     {}
 };
 
-class AtmDeviceStateCallback final : public DeviceStateCallback {
+class AtmDeviceStateCallback final : public DistributedHardware::DeviceStateCallback {
 public:
     AtmDeviceStateCallback();
     ~AtmDeviceStateCallback();
 
-    void OnDeviceOnline(const DmDeviceInfo &deviceInfo) override;
-    void OnDeviceOffline(const DmDeviceInfo &deviceInfo) override;
-    void OnDeviceReady(const DmDeviceInfo &deviceInfo) override;
-    void OnDeviceChanged(const DmDeviceInfo &deviceInfo) override;
+    void OnDeviceOnline(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
+    void OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
+    void OnDeviceReady(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
+    void OnDeviceChanged(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
 };
 }  // namespace AccessToken
 }  // namespace Security
diff --git a/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp b/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp
index 33667b60fd80e86bf8c9923d699f3b701e92f5ad..0feac7b32033a10f0ec4ce8aacc2968ffee7d547 100644
--- a/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp
+++ b/services/accesstokenmanager/main/cpp/src/device/atm_device_state_callback.cpp
@@ -28,6 +28,10 @@
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
+using OHOS::DistributedHardware::DeviceStateCallback;
+using OHOS::DistributedHardware::DmDeviceInfo;
+using OHOS::DistributedHardware::DmInitCallback;
+
 namespace {
 static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {
     LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AtmDeviceStateCallback"};
diff --git a/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h b/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h
index 2a207dbafee9e4f9441a2d68ec1e7acb29b8b779..7d0086efbb6f6bde656e59d58858e05602d2ac90 100644
--- a/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h
+++ b/services/tokensyncmanager/include/remote/soft_bus_device_connection_listener.h
@@ -27,16 +27,12 @@
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
-using OHOS::DistributedHardware::DeviceStateCallback;
-using OHOS::DistributedHardware::DmDeviceInfo;
-using OHOS::DistributedHardware::DmInitCallback;
-
-class MyDmInitCallback final : public DmInitCallback {
+class MyDmInitCallback final : public DistributedHardware::DmInitCallback {
     void OnRemoteDied() override
     {}
 };
 
-class SoftBusDeviceConnectionListener final : public DeviceStateCallback {
+class SoftBusDeviceConnectionListener final : public DistributedHardware::DeviceStateCallback {
 public:
     SoftBusDeviceConnectionListener();
     ~SoftBusDeviceConnectionListener();
@@ -46,28 +42,28 @@ public:
      *
      * @param deviceInfo node info
      */
-    void OnDeviceOnline(const DmDeviceInfo &deviceInfo) override;
+    void OnDeviceOnline(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
 
     /**
      * @brief node offline callback
      *
      * @param deviceInfo node info
      */
-    void OnDeviceOffline(const DmDeviceInfo &deviceInfo) override;
+    void OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
 
     /**
      * @brief node ready callback
      *
      * @param deviceInfo node info
      */
-    void OnDeviceReady(const DmDeviceInfo &deviceInfo) override;
+    void OnDeviceReady(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
 
     /**
      * @brief node changed callback
      *
      * @param deviceInfo node info
      */
-    void OnDeviceChanged(const DmDeviceInfo &deviceInfo) override;
+    void OnDeviceChanged(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
 };
 }  // namespace AccessToken
 }  // namespace Security
diff --git a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
index 0835b06d62ee3c259a757bc2b0a5979fcfaf4927..62982e3642aac47fce8b0f3f3e1f7002dea6108e 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
@@ -24,6 +24,10 @@
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
+using OHOS::DistributedHardware::DeviceStateCallback;
+using OHOS::DistributedHardware::DmDeviceInfo;
+using OHOS::DistributedHardware::DmInitCallback;
+
 namespace {
 static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {
     LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "SoftBusDeviceConnectionListener"};
diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
index d1a6e4be4a5f320b5a2b29f33c78bb2130f8e7a7..61c5be28b3f0a3c124ebbf3d2b0f6ec63fb3121d 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
@@ -61,7 +61,7 @@ int SoftBusManager::AddTrustedDeviceInfo()
 {
     std::string packageName = TOKEN_SYNC_PACKAGE_NAME;
     std::string extra = "";
-    std::vector<DmDeviceInfo> deviceList;
+    std::vector<DistributedHardware::DmDeviceInfo> deviceList;
 
     int32_t ret = DistributedHardware::DeviceManager::GetInstance().GetTrustedDeviceList(packageName,
         extra, deviceList);
@@ -70,7 +70,7 @@ int SoftBusManager::AddTrustedDeviceInfo()
         return Constant::FAILURE;
     }
 
-    for (DmDeviceInfo device : deviceList) {
+    for (DistributedHardware::DmDeviceInfo device : deviceList) {
         std::string uuid = GetUuidByNodeId(device.networkId);
         std::string udid = GetUdidByNodeId(device.networkId);
         if (uuid.empty() || udid.empty()) {