diff --git a/interfaces/inner_kits/native_cpp/include/device_manager.h b/interfaces/inner_kits/native_cpp/include/device_manager.h
index 96f507d8175d874c31111ee4fea2749b992cddd5..060fe2df84dc9751ed456cd4e37333945d48b4fd 100644
--- a/interfaces/inner_kits/native_cpp/include/device_manager.h
+++ b/interfaces/inner_kits/native_cpp/include/device_manager.h
@@ -18,6 +18,7 @@
 
 #include <vector>
 #include <string>
+#include <memory>
 
 #include "device_manager_callback.h"
 #include "dm_subscribe_info.h"
diff --git a/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h b/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h
index 9e4b244994c18f0b9896b629ab74df9367ee8baf..2101c59e5318192449c7ac89315f7e78ae2d8428 100644
--- a/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h
+++ b/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h
@@ -58,8 +58,6 @@ typedef enum DmExchangeFreq {
     DM_FREQ_BUTT
 } DmExchangeFreq;
 
-const static char *DM_CAPABILITY_OSD = "osdCapability";
-
 typedef struct DmSubscribeInfo {
     /** Service ID */
     uint16_t subscribeId;
diff --git a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h
index a22cae427d621f13594cc9a550f82716ce326a90..a654b55368accbcb12cd06eb30409c32d9f5d701 100644
--- a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h
+++ b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h
@@ -20,6 +20,7 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <memory>
 
 #include "dm_device_info.h"
 #include "dm_subscribe_info.h"
diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp
index 3629332c0f9e205e4eb3a8f2e6a61da486a761a4..bb38a37fde7c93839bd5998f327b0aeaea662cf0 100644
--- a/interfaces/kits/js/src/native_devicemanager_js.cpp
+++ b/interfaces/kits/js/src/native_devicemanager_js.cpp
@@ -37,7 +37,7 @@ const std::string DM_NAPI_EVENT_DEVICE_FOUND = "deviceFound";
 const std::string DM_NAPI_EVENT_DEVICE_DISCOVER_FAIL = "discoverFail";
 const std::string DM_NAPI_EVENT_DMFA_CALLBACK = "dmFaCallback";
 const std::string DM_NAPI_EVENT_DEVICE_SERVICE_DIE = "serviceDie";
-
+const char *DM_CAPABILITY_OSD = "osdCapability";
 const std::string DEVICE_MANAGER_NAPI_CLASS_NAME = "DeviceManager";
 
 const int32_t DM_NAPI_ARGS_ONE = 1;
diff --git a/services/devicemanagerservice/include/auth/hichain_connector.h b/services/devicemanagerservice/include/auth/hichain_connector.h
index 0bb50c2d3e581c3f24f0b496ad8c000208a89e6b..e49700c97a279be2b31d7376b24074e5986561f3 100644
--- a/services/devicemanagerservice/include/auth/hichain_connector.h
+++ b/services/devicemanagerservice/include/auth/hichain_connector.h
@@ -87,15 +87,9 @@ private:
     bool IsGroupInfoInvalid(GroupInfo &group);
 
 private:
-    std::atomic<int32_t> requestIdIndex_ {0};
     std::shared_ptr<HichainConnectorCallback> hichainConnectorCallback_ = nullptr;
     const DeviceGroupManager *deviceGroupManager_ = nullptr;
-    DeviceAuthCallback deviceAuthCallback_ = {
-        .onTransmit = nullptr,
-        .onFinish = HichainAuthenCallBack::onFinish,
-        .onError = HichainAuthenCallBack::onError,
-        .onRequest = HichainAuthenCallBack::onRequest,
-    };
+    DeviceAuthCallback deviceAuthCallback_ ;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/devicemanagerservice/include/softbus/softbus_adapter.h b/services/devicemanagerservice/include/softbus/softbus_adapter.h
index 63fc95b3da50a9297849dc966a73973a5b7256ed..25f472ff356295460b79b74b996ad2063941c0aa 100644
--- a/services/devicemanagerservice/include/softbus/softbus_adapter.h
+++ b/services/devicemanagerservice/include/softbus/softbus_adapter.h
@@ -20,6 +20,7 @@
 #include <mutex>
 #include <map>
 #include <memory>
+#include <vector>
 #include "softbus_bus_center.h"
 #include "discovery_service.h"
 #include "dm_device_info.h"
diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp
index ca36a5db8bd92f5133e21e56990e5a5c6c715cd1..fdc68e179200c567a98755996cd8a7cf3cf70d5e 100644
--- a/services/devicemanagerservice/src/auth/hichain_connector.cpp
+++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp
@@ -89,6 +89,12 @@ int HichainConnector::Init()
         DMLOG(DM_LOG_INFO, "HichainConnector::init, failed to init group manager!");
         return -1;
     }
+
+    deviceAuthCallback_.onTransmit = nullptr;
+    deviceAuthCallback_.onFinish = HichainAuthenCallBack::onFinish;
+    deviceAuthCallback_.onError = HichainAuthenCallBack::onError;
+    deviceAuthCallback_.onRequest = HichainAuthenCallBack::onRequest;
+
     deviceGroupManager_->regCallback(DEVICE_MANAGER_APP.c_str(), &deviceAuthCallback_);
     DMLOG(DM_LOG_INFO, "HichainConnector::init, init hichain adapter success.");
     return 0;
diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp
index 88ed64aab5cc5b5890e5362945fd0315de1952e6..f58a361fce4208200a230d02ba6fac285e1e0eee 100644
--- a/services/devicemanagerservice/src/message/msg_request_auth.cpp
+++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp
@@ -106,7 +106,7 @@ void MsgRequestAuth::GetDecodeAppInfo(const std::string appString, uint8_t **out
     size_t outLen = 0;
     int32_t ret = EncryptUtils::MbedtlsBase64Decode(buffer, tempBufLen, &outLen,
         (const uint8_t*)appString.c_str(), appString.length());
-    if (ret != 0 || outLen > tempBufLen) {
+    if (ret != 0 || static_cast<int32_t>(outLen) > tempBufLen) {
         DMLOG(DM_LOG_ERROR, "MbedtlsBase64Decode failed, ret %d, outLen %d, tempBufLen %d",
             ret, outLen, tempBufLen);
         outBufferLen = 0;
diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
index dd3959eacd3a3560fe75bc58c079ed20a9cb73bb..4db2ad2091fabbc8e27dce627afd0e54cdf21137 100644
--- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
+++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
@@ -18,9 +18,6 @@
 #include <cstdlib>
 #include <string>
 #include <unistd.h>
-#include <map>
-#include <vector>
-#include <memory>
 
 #include <securec.h>
 
@@ -41,6 +38,7 @@ namespace OHOS {
 namespace DistributedHardware {
 namespace {
 const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.huawei.devicemanager";
+const char *DM_CAPABILITY_OSD = "osdCapability";
 const int32_t CHECK_INTERVAL = 100000; // 100ms
 const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16;
 const int32_t SUBSCRIBE_ID_MASK = 0x0000FFFF;
diff --git a/utils/include/ipc/lite/ipc_cmd_register.h b/utils/include/ipc/lite/ipc_cmd_register.h
index 36c20961f2fa659fdcc9c6e403d199484f853803..0144df0d69811a46de57970afcb556928ee9d717 100644
--- a/utils/include/ipc/lite/ipc_cmd_register.h
+++ b/utils/include/ipc/lite/ipc_cmd_register.h
@@ -18,6 +18,7 @@
 
 #include <cstdint>
 #include <unordered_map>
+#include <memory>
 
 #include "liteipc_adapter.h"
 #include "single_instance.h"
diff --git a/utils/include/ipc/standard/ipc_cmd_register.h b/utils/include/ipc/standard/ipc_cmd_register.h
index dc852f57ed3ccada2095610cc06bfb000aa9d46e..c2c5d585d375918c35152369d2a8974aa5e5654a 100644
--- a/utils/include/ipc/standard/ipc_cmd_register.h
+++ b/utils/include/ipc/standard/ipc_cmd_register.h
@@ -18,6 +18,7 @@
 
 #include <cstdint>
 #include <unordered_map>
+#include <memory>
 
 #include "iremote_broker.h"
 #include "single_instance.h"