diff --git a/build.sh b/build.sh
index 897b1bb8470955af755e7de9ef6f7dd2d0e39a1f..ec4b45074a99efcadd7fdf6227c2ab2f4598a35b 100755
--- a/build.sh
+++ b/build.sh
@@ -112,9 +112,15 @@ function build
       xrelease)
         do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo
         ;;
+      xrelease_no_unity)
+        do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_ENABLE_UNITY=OFF -DOB_ENABLE_PCH=OFF
+        ;;
       xdebug)
         do_build "$@" -DCMAKE_BUILD_TYPE=Debug
         ;;
+      xdebug_no_unity)
+        do_build "$@" -DCMAKE_BUILD_TYPE=Debug -DOB_ENABLE_UNITY=OFF -DOB_ENABLE_PCH=OFF
+        ;;
       xrpm)
         do_build "$@" -DOB_BUILD_RPM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_CCACHE=OFF -DOB_COMPRESS_DEBUG_SECTIONS=ON -DOB_STATIC_LINK_LGPL_DEPS=OFF
         ;;
diff --git a/deps/oblib/src/lib/json_type/ob_json_bin.cpp b/deps/oblib/src/lib/json_type/ob_json_bin.cpp
index ecc360c1ceebe620c2d8e9f78294a005629ea6f2..b66acad5a6cf0e2b70e34ce88841b7e84b5170c7 100644
--- a/deps/oblib/src/lib/json_type/ob_json_bin.cpp
+++ b/deps/oblib/src/lib/json_type/ob_json_bin.cpp
@@ -4325,7 +4325,7 @@ int ObJsonVar::read_var(const char *data, uint8_t type, int64_t *var)
 uint64_t ObJsonVar::var_int2uint(int64_t var)
 {
   ObJsonBinLenSize size = static_cast<ObJsonBinLenSize>(ObJsonVar::get_var_type(var));
-  uint64 val = 0;
+  uint64_t val = 0;
   switch (size) {
     case JBLS_UINT8: {
       val = static_cast<uint64_t>(static_cast<int8_t>(var));
diff --git a/deps/oblib/src/lib/oblog/ob_async_log_struct.cpp b/deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
index 31cf9e4349621c3713192352df1b17c526982244..2e5562ad5665a6f95f0756ae168c8aca302c6123 100644
--- a/deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
+++ b/deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
@@ -13,7 +13,6 @@
 #include "ob_async_log_struct.h"
 #include "lib/objectpool/ob_concurrency_objpool.h"
 
-using namespace obutil;
 namespace oceanbase {
 namespace common {
 ObPLogItem::ObPLogItem()
diff --git a/src/observer/mysql/obsm_utils.cpp b/src/observer/mysql/obsm_utils.cpp
index 62a8e32d59f99ba3a53691c33a7b078944fb13e1..1fb418ce29b564759710461a020e0ad215f9e6cb 100644
--- a/src/observer/mysql/obsm_utils.cpp
+++ b/src/observer/mysql/obsm_utils.cpp
@@ -16,6 +16,7 @@
 #include "lib/charset/ob_dtoa.h"
 #include "common/ob_field.h"
 #include "share/schema/ob_schema_getter_guard.h"
+#include <mariadb/mysql.h>
 
 using namespace oceanbase::common;
 using namespace oceanbase::obmysql;
diff --git a/src/share/backup/ob_backup_archive_log_round_stat.cpp b/src/share/backup/ob_backup_archive_log_round_stat.cpp
index e8319952514368bdefb5a72bf9e48782802fef34..4fd08928dcaa8fb697fdea1c4c948718ee3f04c9 100644
--- a/src/share/backup/ob_backup_archive_log_round_stat.cpp
+++ b/src/share/backup/ob_backup_archive_log_round_stat.cpp
@@ -15,6 +15,9 @@
 #include "share/backup/ob_backup_path.h"
 #include "lib/lock/ob_lock_guard.h"
 #include <algorithm>
+#include "lib/container/ob_array.h"
+#include "lib/container/ob_array_iterator.h"
+
 
 using namespace oceanbase::common;
 using namespace oceanbase::lib;
diff --git a/src/share/backup/ob_backup_backuppiece_operator.cpp b/src/share/backup/ob_backup_backuppiece_operator.cpp
index 992e6325d2cf2cf3ecae0433fd1ad219e4d248f5..4fdd75b42cbb242b28dd1bf6676aa336b30990fb 100644
--- a/src/share/backup/ob_backup_backuppiece_operator.cpp
+++ b/src/share/backup/ob_backup_backuppiece_operator.cpp
@@ -13,6 +13,7 @@
 #define USING_LOG_PREFIX SHARE
 #include "share/backup/ob_backup_backuppiece_operator.h"
 #include "share/inner_table/ob_inner_table_schema_constants.h"
+#include "lib/mysqlclient/ob_mysql_proxy.h"
 
 using namespace oceanbase::share;
 
diff --git a/src/share/backup/ob_backup_backuppiece_operator.h b/src/share/backup/ob_backup_backuppiece_operator.h
index 7c9e12aed350b0d6fb6bffa5ea405e6ae68e1ddb..ffa846c94ccab7542d622a741df520570b547a79 100644
--- a/src/share/backup/ob_backup_backuppiece_operator.h
+++ b/src/share/backup/ob_backup_backuppiece_operator.h
@@ -16,6 +16,7 @@
 #include "share/backup/ob_backup_struct.h"
 #include "share/ob_dml_sql_splicer.h"
 #include "lib/string/ob_sql_string.h"
+#include "lib/mysqlclient/ob_mysql_result.h"
 
 namespace oceanbase {
 namespace share {
diff --git a/src/share/backup/ob_backup_backupset_operator.h b/src/share/backup/ob_backup_backupset_operator.h
index 42f2fbc220b69721b7e60719326e6465e5854ef6..8d568b0bfc1e2b5c20837132c0607dbbccefc0a5 100644
--- a/src/share/backup/ob_backup_backupset_operator.h
+++ b/src/share/backup/ob_backup_backupset_operator.h
@@ -1,8 +1,4 @@
 // Copyright 2020 Alibaba Inc. All Rights Reserved
-// Author:
-//     yanfeng <yangyi.yyy@alibaba-inc.com>
-// Normalizer:
-//     yanfeng <yangyi.yyy@alibaba-inc.com>
 
 #ifndef OCEANBASE_SHARE_BACKUP_OB_BACKUP_BACKUPSET_OPERATOR_H_
 #define OCEANBASE_SHARE_BACKUP_OB_BACKUP_BACKUPSET_OPERATOR_H_
@@ -10,6 +6,7 @@
 #include "share/ob_dml_sql_splicer.h"
 #include "share/backup/ob_backup_struct.h"
 #include "lib/string/ob_sql_string.h"
+#include "lib/mysqlclient/ob_mysql_result.h"
 
 namespace oceanbase {
 namespace share {
@@ -114,7 +111,7 @@ public:
   static int delete_task_item(const ObTenantBackupBackupsetTaskItem& task_item, common::ObISQLClient& client);
   static int get_max_succeed_task(const uint64_t tenant_id, const int64_t copy_id,
       ObTenantBackupBackupsetTaskItem& item, common::ObISQLClient& client);
-  // 支持换backup backup dest
+  // support to replace backup backup dest
   static int get_same_backup_set_id_tasks(const bool is_tenant_level, const uint64_t tenant_id,
       const int64_t backup_set_id, common::ObIArray<ObTenantBackupBackupsetTaskItem>& items,
       common::ObISQLClient& client);
diff --git a/src/share/backup/ob_physical_restore_table_operator.cpp b/src/share/backup/ob_physical_restore_table_operator.cpp
index 6fa2f86bc111aae61585dfce300c46fdbd458942..a9d6e4bd995b151bc03cb17c9d63b5c2f0b1ca82 100644
--- a/src/share/backup/ob_physical_restore_table_operator.cpp
+++ b/src/share/backup/ob_physical_restore_table_operator.cpp
@@ -22,6 +22,8 @@
 #include "rootserver/ob_rs_job_table_operator.h"
 #include "share/backup/ob_backup_path.h"
 #include <algorithm>
+#include "lib/container/ob_array.h"
+#include "lib/container/ob_array_iterator.h"
 
 using namespace oceanbase::common;
 using namespace oceanbase::share;
diff --git a/src/share/schema/ob_schema_printer.h b/src/share/schema/ob_schema_printer.h
index f14241c6eaff34956face25086e7a5367f64ef66..fd491304d856ca9241203d66b111fd3017cc0165 100644
--- a/src/share/schema/ob_schema_printer.h
+++ b/src/share/schema/ob_schema_printer.h
@@ -16,6 +16,7 @@
 #include "share/ob_define.h"
 #include "lib/container/ob_iarray.h"
 #include "share/schema/ob_schema_struct.h"
+#include "common/sql_mode/ob_sql_mode.h"
 
 namespace oceanbase {
 namespace common {