diff --git a/frameworks/libs/distributeddb/interfaces/src/relational/knowledge_source_utils.h b/frameworks/libs/distributeddb/interfaces/src/relational/knowledge_source_utils.h
index 7e8beaf831ff87a4b803304e23509afc739c241f..44e6be6761cbe89ab74c062b3926f700d0734d07 100644
--- a/frameworks/libs/distributeddb/interfaces/src/relational/knowledge_source_utils.h
+++ b/frameworks/libs/distributeddb/interfaces/src/relational/knowledge_source_utils.h
@@ -16,6 +16,10 @@
 #ifndef KNOWLEDGE_SOURCE_UTILS_H
 #define KNOWLEDGE_SOURCE_UTILS_H
 
+#include <stdint.h>
+#include <string>
+#include <utility>
+
 #include "relational_schema_object.h"
 #include "relational_store_client.h"
 
diff --git a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp
index 2c43b9c3d369deac84cea81cf3db5078ccd257ce..c5cf5bbb114a42f05966110161aacdf23e9b1e17 100755
--- a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp
+++ b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp
@@ -465,6 +465,7 @@ int RdSingleVerNaturalStoreConnection::RegisterLifeCycleCallback(const DatabaseL
 // Called when Close and delete the connection.
 int RdSingleVerNaturalStoreConnection::PreClose(bool isCloseImmediately)
 {
+    (void)isCloseImmediately;
     // check if result set closed
     std::lock_guard<std::mutex> lock(kvDbResultSetsMutex_);
     if (kvDbResultSets_.size() > 0) {
diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/relational/device_tracker_log_table_manager.h b/frameworks/libs/distributeddb/storage/src/sqlite/relational/device_tracker_log_table_manager.h
index 7b237da9574e74fe3ab063a3c665666e6874a8ee..f0c1269c29b21cc2a0d21b17e2fd80192caa9246 100644
--- a/frameworks/libs/distributeddb/storage/src/sqlite/relational/device_tracker_log_table_manager.h
+++ b/frameworks/libs/distributeddb/storage/src/sqlite/relational/device_tracker_log_table_manager.h
@@ -16,6 +16,8 @@
 #ifndef DEVICE_TRACKER_LOG_TABLE_MANAGER_H
 #define DEVICE_TRACKER_LOG_TABLE_MANAGER_H
 
+ #include <string>
+
 #include "sqlite_log_table_manager.h"
 
 namespace DistributedDB {
diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.cpp b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.cpp
index b080e2b683d920869e0890b633ede9171e31109d..96df3ee92231800da3e8338dff52e7d0b93034ab 100644
--- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.cpp
@@ -32,25 +32,35 @@ namespace {
     constexpr int OUTPUT_STATE_INDEX = 2;
 
     const std::vector<std::vector<uint8_t>> STATE_SWITCH_TABLE = {
-        // In IDEL state
-        {State::IDLE, Event::START_SYNC_EVENT, State::DO_DOWNLOAD},
-        {State::IDLE, Event::ERROR_EVENT, State::DO_FINISHED},
+        // In IDLE state
+        {static_cast<uint8_t>(State::IDLE), static_cast<uint8_t>(Event::START_SYNC_EVENT),
+            static_cast<uint8_t>(State::DO_DOWNLOAD)},
+        {static_cast<uint8_t>(State::IDLE), static_cast<uint8_t>(Event::ERROR_EVENT),
+            static_cast<uint8_t>(State::DO_FINISHED)},
 
         // In DO_DOWNLOAD state
-        {State::DO_DOWNLOAD, Event::DOWNLOAD_FINISHED_EVENT, State::DO_UPLOAD},
-        {State::DO_DOWNLOAD, Event::ERROR_EVENT, State::DO_FINISHED},
+        {static_cast<uint8_t>(State::DO_DOWNLOAD), static_cast<uint8_t>(Event::DOWNLOAD_FINISHED_EVENT),
+            static_cast<uint8_t>(State::DO_UPLOAD)},
+        {static_cast<uint8_t>(State::DO_DOWNLOAD), static_cast<uint8_t>(Event::ERROR_EVENT),
+            static_cast<uint8_t>(State::DO_FINISHED)},
 
         // In DO_UPLOAD state
-        {State::DO_UPLOAD, Event::UPLOAD_FINISHED_EVENT, State::DO_FINISHED},
-        {State::DO_UPLOAD, Event::ERROR_EVENT, State::DO_FINISHED},
-        {State::DO_UPLOAD, Event::REPEAT_CHECK_EVENT, State::DO_REPEAT_CHECK},
+        {static_cast<uint8_t>(State::DO_UPLOAD), static_cast<uint8_t>(Event::UPLOAD_FINISHED_EVENT),
+            static_cast<uint8_t>(State::DO_FINISHED)},
+        {static_cast<uint8_t>(State::DO_UPLOAD), static_cast<uint8_t>(Event::ERROR_EVENT),
+            static_cast<uint8_t>(State::DO_FINISHED)},
+        {static_cast<uint8_t>(State::DO_UPLOAD), static_cast<uint8_t>(Event::REPEAT_CHECK_EVENT),
+            static_cast<uint8_t>(State::DO_REPEAT_CHECK)},
 
         // Repeat download check state
-        {State::DO_REPEAT_CHECK, Event::REPEAT_DOWNLOAD_EVENT, State::DO_DOWNLOAD},
-        {State::DO_REPEAT_CHECK, Event::ERROR_EVENT, State::DO_FINISHED},
+        {static_cast<uint8_t>(State::DO_REPEAT_CHECK), static_cast<uint8_t>(Event::REPEAT_DOWNLOAD_EVENT),
+            static_cast<uint8_t>(State::DO_DOWNLOAD)},
+        {static_cast<uint8_t>(State::DO_REPEAT_CHECK), static_cast<uint8_t>(Event::ERROR_EVENT),
+            static_cast<uint8_t>(State::DO_FINISHED)},
 
         // In DO_FINISHED state
-        {State::DO_FINISHED, Event::ALL_TASK_FINISHED_EVENT, State::IDLE},
+        {static_cast<uint8_t>(State::DO_FINISHED), static_cast<uint8_t>(Event::ALL_TASK_FINISHED_EVENT),
+            static_cast<uint8_t>(State::IDLE)},
     };
 }
 
@@ -68,14 +78,14 @@ void CloudSyncStateMachine::SyncStep()
 {
     Event event = Event::ERROR_EVENT;
     do {
-        auto iter = stateMapping_.find(currentState_);
+        auto iter = stateMapping_.find(static_cast<uint8_t>(currentState_));
         if (iter != stateMapping_.end()) {
             event = static_cast<Event>(iter->second());
         } else {
             LOGE("[CloudSyncStateMachine][SyncStep] can not find state=%d", currentState_);
             break;
         }
-    } while (SwitchMachineState(event) == E_OK && currentState_ != State::IDLE);
+    } while (SwitchMachineState(static_cast<uint8_t>(event)) == E_OK && currentState_ != State::IDLE);
 }
 
 void CloudSyncStateMachine::InitCloudStateSwitchTables()
@@ -116,7 +126,7 @@ void CloudSyncStateMachine::InitCloudStateSwitchTable(
 
 void CloudSyncStateMachine::RegisterFunc(State state, const std::function<uint8_t(void)> &function)
 {
-    stateMapping_[state] = function;
+    stateMapping_[static_cast<uint8_t>(state)] = function;
 };
 
 int CloudSyncStateMachine::SwitchMachineState(uint8_t event)
@@ -131,7 +141,7 @@ int CloudSyncStateMachine::SwitchMachineState(uint8_t event)
     }
 
     const std::map<uint8_t, EventToState> &table = (*tableIter).switchTable;
-    auto eventToStateIter = table.find(currentState_);
+    auto eventToStateIter = table.find(static_cast<uint8_t>(currentState_));
     if (eventToStateIter == table.end()) {
         LOGE("[CloudSyncStateMachine][SwitchState] Can't find EventToState with currentSate %u",
             currentState_);
diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.h b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.h
index 8134e512d0a99d0c3ac749cba4a398bf5d3bfe9a..81bc92860ab49d625479ccb0fb0c39e0e20e5805 100644
--- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.h
+++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_state_machine.h
@@ -32,7 +32,7 @@ struct CloudStateSwitchTable {
     std::map<uint8_t, EventToState> switchTable;
 };
 
-enum CloudSyncState {
+enum class CloudSyncState : uint8_t {
     IDLE = 0,
     DO_DOWNLOAD,
     DO_UPLOAD,
@@ -40,8 +40,8 @@ enum CloudSyncState {
     DO_FINISHED
 };
 
-enum CloudSyncEvent {
-    UPLOAD_FINISHED_EVENT,
+enum class CloudSyncEvent : uint8_t {
+    UPLOAD_FINISHED_EVENT = 0,
     DOWNLOAD_FINISHED_EVENT,
     ERROR_EVENT,
     REPEAT_CHECK_EVENT,
diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
index 7f1332465894471d177f52801b589a6820890281..789262c17fd1c7b512a2b95d33ed62fa8800e359 100644
--- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
@@ -447,7 +447,7 @@ CloudSyncEvent CloudSyncer::SyncMachineDoFinished()
 
 int CloudSyncer::DoSyncInner(const CloudTaskInfo &taskInfo)
 {
-    cloudSyncStateMachine_.SwitchStateAndStep(CloudSyncEvent::START_SYNC_EVENT);
+    cloudSyncStateMachine_.SwitchStateAndStep(static_cast<uint8_t>(CloudSyncEvent::START_SYNC_EVENT));
     DBDfxAdapter::ReportBehavior(
         {__func__, Scene::CLOUD_SYNC, State::BEGIN, Stage::CLOUD_SYNC, StageResult::SUCC, E_OK});
     return E_OK;
diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
index 19a7ad1158d8f1ce9ee9e70f309b6d27ae52106d..88205a703ad842fdbdcaf5f3fcb34e1100ce6604 100644
--- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
@@ -1248,16 +1248,16 @@ void CloudSyncer::InitCloudSyncStateMachine()
 {
     CloudSyncStateMachine::Initialize();
     cloudSyncStateMachine_.RegisterFunc(CloudSyncState::DO_DOWNLOAD, [this]() {
-        return SyncMachineDoDownload();
+        return static_cast<uint8_t>(SyncMachineDoDownload());
     });
     cloudSyncStateMachine_.RegisterFunc(CloudSyncState::DO_UPLOAD, [this]() {
-        return SyncMachineDoUpload();
+        return static_cast<uint8_t>(SyncMachineDoUpload());
     });
     cloudSyncStateMachine_.RegisterFunc(CloudSyncState::DO_FINISHED, [this]() {
-        return SyncMachineDoFinished();
+        return static_cast<uint8_t>(SyncMachineDoFinished());
     });
     cloudSyncStateMachine_.RegisterFunc(CloudSyncState::DO_REPEAT_CHECK, [this]() {
-        return SyncMachineDoRepeatCheck();
+        return static_cast<uint8_t>(SyncMachineDoRepeatCheck());
     });
 }
 
diff --git a/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h b/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
index 05df22e55ee97288d9dcbe4d0075fc8bb89a8bf1..5e045566ed6a3a33f730072bb7afed2b7ad2fbd7 100644
--- a/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
+++ b/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
@@ -16,6 +16,7 @@
 #ifndef SINGLE_VER_SYNC_TASK_CONTEXT_H
 #define SINGLE_VER_SYNC_TASK_CONTEXT_H
 
+#include <atomic>
 #include <list>
 #include <mutex>
 #include <string>