diff --git a/deps/oblib/src/lib/thread/ob_pthread.cpp b/deps/oblib/src/lib/thread/ob_pthread.cpp
index fadd0b6b49..265ab0a3a9 100644
--- a/deps/oblib/src/lib/thread/ob_pthread.cpp
+++ b/deps/oblib/src/lib/thread/ob_pthread.cpp
@@ -12,6 +12,8 @@
 
 #include "lib/thread/threads.h"
 #include "lib/oblog/ob_log.h"
+
+using namespace oceanbase;
 using namespace oceanbase::lib;
 
 extern "C" {
diff --git a/deps/oblib/src/rpc/obrpc/ob_poc_rpc_proxy.cpp b/deps/oblib/src/rpc/obrpc/ob_poc_rpc_proxy.cpp
index e033771caa..2308f7ed93 100644
--- a/deps/oblib/src/rpc/obrpc/ob_poc_rpc_proxy.cpp
+++ b/deps/oblib/src/rpc/obrpc/ob_poc_rpc_proxy.cpp
@@ -23,7 +23,7 @@ namespace oceanbase
 {
 namespace obrpc
 {
-const int easy_head_size = 16;
+extern const int easy_head_size = 16;
 
 common::ObCompressorType get_proxy_compressor_type(ObRpcProxy& proxy) {
   return proxy.get_compressor_type();
diff --git a/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.cpp b/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.cpp
index e976b82163..2c0c339574 100644
--- a/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.cpp
+++ b/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.cpp
@@ -16,6 +16,9 @@
 #include "ob_log_store_service.h"                   // IObStoreService
 #include "ob_log_utils.h"                           // get_timestamp
 #include "ob_log_config.h"                          // ObLogConfig
+#include "logservice/libobcdc/src/ob_log_part_trans_task.h"
+#include "logservice/libobcdc/src/ob_log_tenant.h"
+#include "logservice/libobcdc/src/ob_log_instance.h"
 
 using namespace oceanbase::common;
 
diff --git a/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.h b/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.h
index 347182fb3b..54eaf03a88 100644
--- a/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.h
+++ b/src/logservice/libobcdc/src/ob_cdc_lob_aux_meta_storager.h
@@ -19,6 +19,7 @@
 #include "storage/tx/ob_tx_log.h"    // ObTransID
 #include "ob_log_utils.h"            // _G_, _M_
 #include "ob_cdc_lob_ctx.h"
+#include "logservice/libobcdc/src/ob_log_resource_recycle_task.h"
 
 namespace oceanbase
 {
diff --git a/src/logservice/palf/log_io_utils.cpp b/src/logservice/palf/log_io_utils.cpp
index 2ff5650d55..6e3bbebf19 100644
--- a/src/logservice/palf/log_io_utils.cpp
+++ b/src/logservice/palf/log_io_utils.cpp
@@ -13,6 +13,8 @@
 #include <linux/falloc.h> // FALLOC_FL_ZERO_RANGE for linux kernel 3.15
 #include "log_block_pool_interface.h"
 #include "share/ob_errno.h"
+#include "logservice/ob_server_log_block_mgr.h"
+
 namespace oceanbase
 {
 namespace palf
diff --git a/src/logservice/palf/palf_handle_impl.cpp b/src/logservice/palf/palf_handle_impl.cpp
index 74250a5e57..373b485dba 100755
--- a/src/logservice/palf/palf_handle_impl.cpp
+++ b/src/logservice/palf/palf_handle_impl.cpp
@@ -25,6 +25,7 @@
 #include "election/interface/election_priority.h"
 #include "palf_iterator.h"                             // Iterator
 #include "palf_env_impl.h"                             // IPalfEnvImpl::
+#include "lib/utility/ob_tracepoint.h"
 
 namespace oceanbase
 {
diff --git a/src/observer/table/ob_table_move_response.cpp b/src/observer/table/ob_table_move_response.cpp
index c011b413a8..6364f1aa97 100644
--- a/src/observer/table/ob_table_move_response.cpp
+++ b/src/observer/table/ob_table_move_response.cpp
@@ -15,6 +15,7 @@
 #include "share/schema/ob_schema_getter_guard.h"
 #include "observer/ob_server_struct.h"
 #include "share/partition_table/ob_partition_location.h"
+#include "share/location_cache/ob_location_service.h"
 
 using namespace oceanbase::observer;
 using namespace oceanbase::common;
diff --git a/src/observer/table/ttl/ob_tenant_tablet_ttl_mgr.h b/src/observer/table/ttl/ob_tenant_tablet_ttl_mgr.h
index f8862e4f83..fdc6349e6a 100644
--- a/src/observer/table/ttl/ob_tenant_tablet_ttl_mgr.h
+++ b/src/observer/table/ttl/ob_tenant_tablet_ttl_mgr.h
@@ -231,7 +231,7 @@ private:
   int generate_batch_tablet_task(ObIArray<share::ObTabletTablePair>& tablet_pairs,
                                  hash::ObHashMap<uint64_t, table::ObTTLTaskParam> &param_map);
   int generate_one_tablet_task(table::ObTTLTaskInfo& task_info, const table::ObTTLTaskParam& para);
-  int get_ttl_para_from_schema(const schema::ObTableSchema *table_schema, table::ObTTLTaskParam& param);
+  int get_ttl_para_from_schema(const share::schema::ObTableSchema *table_schema, table::ObTTLTaskParam& param);
   void mark_tenant_need_check();
   virtual int generate_ttl_dag(table::ObTTLTaskInfo& task_info, table::ObTTLTaskParam& para);
   static int construct_task_record_filter(const uint64_t& task_id,
diff --git a/src/observer/virtual_table/ob_mysql_proc_table.cpp b/src/observer/virtual_table/ob_mysql_proc_table.cpp
index 76372de76b..636060bc40 100644
--- a/src/observer/virtual_table/ob_mysql_proc_table.cpp
+++ b/src/observer/virtual_table/ob_mysql_proc_table.cpp
@@ -355,7 +355,7 @@ int ObMySQLProcTable::extract_create_node_from_routine_info(ObIAllocator &alloc,
 
   ParseResult parse_result;
   ObString routine_stmt;
-  pl::ObPLParser parser(alloc, ObCharsets4Parser(), exec_env.get_sql_mode());
+  pl::ObPLParser parser(alloc, sql::ObCharsets4Parser(), exec_env.get_sql_mode());
   const ObString &routine_body = routine_info.get_routine_body();
   const char prefix[] = "CREATE\n";
   int64_t prefix_len = STRLEN(prefix);
diff --git a/src/observer/virtual_table/ob_mysql_proc_table.h b/src/observer/virtual_table/ob_mysql_proc_table.h
index 02a88d4283..c4be6ee24e 100644
--- a/src/observer/virtual_table/ob_mysql_proc_table.h
+++ b/src/observer/virtual_table/ob_mysql_proc_table.h
@@ -14,6 +14,7 @@
 #define OCEANBASE_SRC_OBSERVER_VIRTUAL_TABLE_OB_MYSQL_PROC_TABLE_H_
 
 #include "share/ob_virtual_table_scanner_iterator.h"
+#include "sql/session/ob_basic_session_info.h"
 
 namespace oceanbase
 {
diff --git a/src/observer/virtual_table/ob_tenant_virtual_concurrent_limit_sql.cpp b/src/observer/virtual_table/ob_tenant_virtual_concurrent_limit_sql.cpp
index 2d4025dba9..8893ba14a2 100644
--- a/src/observer/virtual_table/ob_tenant_virtual_concurrent_limit_sql.cpp
+++ b/src/observer/virtual_table/ob_tenant_virtual_concurrent_limit_sql.cpp
@@ -16,6 +16,7 @@
 #include "share/schema/ob_schema_getter_guard.h"
 #include "common/row/ob_row.h"
 #include "lib/utility/utility.h"
+#include "common/ob_smart_call.h"
 namespace oceanbase
 {
 namespace observer
diff --git a/src/observer/virtual_table/ob_virtual_table_iterator_factory.cpp b/src/observer/virtual_table/ob_virtual_table_iterator_factory.cpp
index 565b3dc85d..13821777cc 100644
--- a/src/observer/virtual_table/ob_virtual_table_iterator_factory.cpp
+++ b/src/observer/virtual_table/ob_virtual_table_iterator_factory.cpp
@@ -212,6 +212,8 @@
 #include "observer/virtual_table/ob_virtual_flt_config.h"
 
 #include "observer/virtual_table/ob_all_virtual_kv_connection.h"
+#include "observer/virtual_table/ob_tenant_show_restore_preview.h"
+
 namespace oceanbase
 {
 using namespace common;
diff --git a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
index 8706074bd8..8ea345dd2f 100644
--- a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
+++ b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
@@ -18,6 +18,7 @@
 #include "storage/tablelock/ob_table_lock_service.h"
 #include "storage/tablelock/ob_table_lock_rpc_client.h"
 #include "storage/ddl/ob_ddl_lock.h"
+#include "share/ob_rpc_struct.h"
 
 using namespace oceanbase::common;
 using namespace oceanbase::share;
@@ -475,7 +476,7 @@ int ObModifyAutoincTask::rollback_schema()
     LOG_WARN("error sys, root service must not be nullptr", K(ret));
   } else {
     ObArenaAllocator allocator;
-    SMART_VAR(ObAlterTableArg, alter_table_arg) {
+    SMART_VAR(obrpc::ObAlterTableArg, alter_table_arg) {
       if (OB_FAIL(deep_copy_table_arg(allocator, alter_table_arg_, alter_table_arg))) {
         LOG_WARN("deep copy table arg failed", K(ret));
       } else {
diff --git a/src/rootserver/ob_ddl_operator.h b/src/rootserver/ob_ddl_operator.h
index e8fe97ea65..5b88d840f1 100644
--- a/src/rootserver/ob_ddl_operator.h
+++ b/src/rootserver/ob_ddl_operator.h
@@ -19,7 +19,6 @@
 #include "lib/string/ob_string.h"
 #include "lib/string/ob_sql_string.h"
 #include "share/schema/ob_ddl_sql_service.h"
-#include "share/schema/ob_dependency_info.h"
 #include "share/config/ob_server_config.h"
 #include "share/ob_get_compat_mode.h"
 #include "share/ob_partition_modify.h"
diff --git a/src/rootserver/ob_disaster_recovery_task_mgr.cpp b/src/rootserver/ob_disaster_recovery_task_mgr.cpp
index 9f957dde6e..2691136f4e 100644
--- a/src/rootserver/ob_disaster_recovery_task_mgr.cpp
+++ b/src/rootserver/ob_disaster_recovery_task_mgr.cpp
@@ -719,7 +719,7 @@ void ObDRTaskMgr::run3()
           LOG_WARN("fail to try pop task", KR(ret));
         } else if (OB_NOT_NULL(task)) {
           const ObAddr &dst_server = task->get_dst_server();
-          ObServerInfoInTable server_info;
+          share::ObServerInfoInTable server_info;
           if (OB_FAIL(SVR_TRACER.get_server_info(dst_server, server_info))) {
             LOG_WARN("fail to get server_info", KR(ret), K(dst_server));
           } else if (server_info.is_permanent_offline()) {
diff --git a/src/rootserver/ob_primary_ls_service.cpp b/src/rootserver/ob_primary_ls_service.cpp
index 79173a8210..31a54f56e8 100755
--- a/src/rootserver/ob_primary_ls_service.cpp
+++ b/src/rootserver/ob_primary_ls_service.cpp
@@ -24,6 +24,7 @@
 #include "logservice/palf/palf_base_info.h"//PalfBaseInfo
 #include "rootserver/ob_ls_service_helper.h"//ObTenantLSInfo
 #include "rootserver/ob_ls_recovery_reportor.h"//update_ls_recovery
+#include "rootserver/ob_tenant_info_loader.h"
 
 namespace oceanbase
 {
diff --git a/src/rootserver/ob_rs_rpc_processor.h b/src/rootserver/ob_rs_rpc_processor.h
index d9f0e6346a..bce7adfc3b 100644
--- a/src/rootserver/ob_rs_rpc_processor.h
+++ b/src/rootserver/ob_rs_rpc_processor.h
@@ -27,14 +27,14 @@ namespace oceanbase
 {
 namespace rootserver
 {
-bool is_parallel_ddl(const obrpc::ObRpcPacketCode pcode)
+inline bool is_parallel_ddl(const obrpc::ObRpcPacketCode pcode)
 {
   return obrpc::OB_TRUNCATE_TABLE_V2 == pcode
          || obrpc::OB_PARALLEL_CREATE_TABLE == pcode;
 }
 
 // precondition: enable_ddl = false
-bool is_allow_when_disable_ddl(const obrpc::ObRpcPacketCode pcode, const obrpc::ObDDLArg *ddl_arg)
+inline bool is_allow_when_disable_ddl(const obrpc::ObRpcPacketCode pcode, const obrpc::ObDDLArg *ddl_arg)
 {
   bool bret = false;
   if (OB_ISNULL(ddl_arg)) {
@@ -52,7 +52,7 @@ bool is_allow_when_disable_ddl(const obrpc::ObRpcPacketCode pcode, const obrpc::
   return bret;
 }
 
-bool is_allow_when_create_tenant(const obrpc::ObRpcPacketCode pcode)
+inline bool is_allow_when_create_tenant(const obrpc::ObRpcPacketCode pcode)
 {
   bool bret = false;
   if (obrpc::OB_CREATE_TENANT == pcode
@@ -65,7 +65,7 @@ bool is_allow_when_create_tenant(const obrpc::ObRpcPacketCode pcode)
   }
   return bret;
 }
-bool is_allow_when_drop_tenant(const obrpc::ObRpcPacketCode pcode)
+inline bool is_allow_when_drop_tenant(const obrpc::ObRpcPacketCode pcode)
 {
   bool bret = false;
   if (obrpc::OB_DROP_TENANT == pcode
diff --git a/src/rootserver/parallel_ddl/ob_tablet_balance_allocator.cpp b/src/rootserver/parallel_ddl/ob_tablet_balance_allocator.cpp
index 3c49d307c6..640bb325d0 100644
--- a/src/rootserver/parallel_ddl/ob_tablet_balance_allocator.cpp
+++ b/src/rootserver/parallel_ddl/ob_tablet_balance_allocator.cpp
@@ -15,6 +15,7 @@
 #include "rootserver/parallel_ddl/ob_tablet_balance_allocator.h"
 #include "rootserver/ob_balance_group_ls_stat_operator.h"
 #include "share/ob_share_util.h"
+#include "observer/omt/ob_tenant_config_mgr.h"
 
 using namespace oceanbase::lib;
 using namespace oceanbase::common;
diff --git a/src/rootserver/restore/ob_recover_table_initiator.cpp b/src/rootserver/restore/ob_recover_table_initiator.cpp
index e06d2fef15..5ef30722f6 100644
--- a/src/rootserver/restore/ob_recover_table_initiator.cpp
+++ b/src/rootserver/restore/ob_recover_table_initiator.cpp
@@ -22,6 +22,7 @@
 #include "share/restore/ob_recover_table_persist_helper.h"
 #include "sql/parser/parse_node.h"
 #include "rootserver/ddl_task/ob_ddl_task.h"
+#include "share/restore/ob_import_table_persist_helper.h"
 
 using namespace oceanbase;
 using namespace share::schema;
diff --git a/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp b/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
index cb833c4adf..cd78801498 100644
--- a/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
+++ b/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
@@ -16,6 +16,7 @@
 #include "share/allocator/ob_tenant_mutil_allocator.h"
 #include "ob_gmemstore_allocator.h"
 #include "ob_memstore_allocator_mgr.h"
+#include "observer/omt/ob_tenant_config_mgr.h"
 
 namespace oceanbase
 {
diff --git a/src/share/location_cache/ob_tablet_ls_map.h b/src/share/location_cache/ob_tablet_ls_map.h
index ed6c1a4b27..7a609c15a5 100644
--- a/src/share/location_cache/ob_tablet_ls_map.h
+++ b/src/share/location_cache/ob_tablet_ls_map.h
@@ -13,6 +13,7 @@
 #ifndef OCEANBASE_SHARE_OB_TABLET_LS_MAP
 #define OCEANBASE_SHARE_OB_TABLET_LS_MAP
 
+#include "lib/lock/ob_qsync_lock.h"
 #include "share/location_cache/ob_location_struct.h" // ObTabletLSKey, ObTabletLSCache
 
 namespace oceanbase
diff --git a/src/share/ob_event_history_table_operator.cpp b/src/share/ob_event_history_table_operator.cpp
index 5c17ae4023..ddf9d52574 100644
--- a/src/share/ob_event_history_table_operator.cpp
+++ b/src/share/ob_event_history_table_operator.cpp
@@ -15,6 +15,8 @@
 #include "ob_event_history_table_operator.h"
 #include "share/config/ob_server_config.h"
 #include "share/deadlock/ob_deadlock_inner_table_service.h"
+#include "share/ob_debug_sync_point.h"
+#include "share/ob_debug_sync.h"
 
 namespace oceanbase
 {
diff --git a/src/share/restore/ob_import_table_arg.cpp b/src/share/restore/ob_import_table_arg.cpp
index 947be840ea..06c6a84590 100644
--- a/src/share/restore/ob_import_table_arg.cpp
+++ b/src/share/restore/ob_import_table_arg.cpp
@@ -13,6 +13,7 @@
 #include "share/restore/ob_import_table_arg.h"
 #include "lib/string/ob_sql_string.h"
 #include "lib/oblog/ob_log_module.h"
+#include "share/ob_errno.h"
 
 namespace oceanbase
 {
diff --git a/src/share/restore/ob_import_util.cpp b/src/share/restore/ob_import_util.cpp
index d4bc506944..682ff1b993 100644
--- a/src/share/restore/ob_import_util.cpp
+++ b/src/share/restore/ob_import_util.cpp
@@ -11,6 +11,7 @@
  */
 #define USING_LOG_PREFIX SHARE
 #include "ob_import_util.h"
+#include "observer/ob_server_struct.h"
 
 using namespace oceanbase;
 using namespace share;
diff --git a/src/share/restore/ob_recover_table_util.cpp b/src/share/restore/ob_recover_table_util.cpp
index e992e48c48..26a6eb033b 100644
--- a/src/share/restore/ob_recover_table_util.cpp
+++ b/src/share/restore/ob_recover_table_util.cpp
@@ -11,6 +11,11 @@
  */
 #define USING_LOG_PREFIX SHARE
 #include "share/restore/ob_recover_table_util.h"
+#include "share/ob_cluster_version.h"
+#include "lib/oblog/ob_log.h"
+#include "lib/oblog/ob_log_module.h"
+#include "share/ob_errno.h"
+#include "lib/worker.h"
 
 using namespace oceanbase;
 using namespace share;
diff --git a/src/share/schema/ob_ddl_epoch.h b/src/share/schema/ob_ddl_epoch.h
index 744718cd99..d6d30a9982 100644
--- a/src/share/schema/ob_ddl_epoch.h
+++ b/src/share/schema/ob_ddl_epoch.h
@@ -14,6 +14,7 @@
 #define OCEANBASE_DDL_EPOCH_H
 
 #include "lib/container/ob_se_array.h"
+#include "lib/mysqlclient/ob_mysql_transaction.h"
 
 namespace oceanbase
 {
diff --git a/src/share/schema/ob_multi_version_schema_service.h b/src/share/schema/ob_multi_version_schema_service.h
index 998b98c9c5..a2d6fe8aa3 100644
--- a/src/share/schema/ob_multi_version_schema_service.h
+++ b/src/share/schema/ob_multi_version_schema_service.h
@@ -24,7 +24,6 @@
 #include "share/inner_table/ob_inner_table_schema.h"
 #include "share/schema/ob_ddl_trans_controller.h"
 #include "share/schema/ob_ddl_epoch.h"
-#include "share/ob_rpc_struct.h"
 
 namespace oceanbase
 {
diff --git a/src/share/schema/ob_schema_mgr_cache.cpp b/src/share/schema/ob_schema_mgr_cache.cpp
index eea56eb5e5..c08d3429eb 100755
--- a/src/share/schema/ob_schema_mgr_cache.cpp
+++ b/src/share/schema/ob_schema_mgr_cache.cpp
@@ -18,6 +18,7 @@
 #include "share/config/ob_server_config.h"
 #include "common/ob_clock_generator.h"
 #include "lib/oblog/ob_log.h"
+#include "observer/omt/ob_tenant_config_mgr.h"
 
 namespace oceanbase
 {
diff --git a/src/share/wr/ob_wr_collector.h b/src/share/wr/ob_wr_collector.h
index 497afe6e93..0c56fefa1e 100644
--- a/src/share/wr/ob_wr_collector.h
+++ b/src/share/wr/ob_wr_collector.h
@@ -13,6 +13,7 @@
 #ifndef OCEANBASE_WR_OB_WORKLOAD_REPOSITORY_COLLECTOR_H_
 #define OCEANBASE_WR_OB_WORKLOAD_REPOSITORY_COLLECTOR_H_
 #include "share/wr/ob_wr_snapshot_rpc_processor.h"
+#include "share/wr/ob_wr_task.h"
 namespace oceanbase
 {
 namespace share
diff --git a/src/sql/das/ob_das_simple_op.cpp b/src/sql/das/ob_das_simple_op.cpp
index ea2be0c5cf..54ffd2615f 100644
--- a/src/sql/das/ob_das_simple_op.cpp
+++ b/src/sql/das/ob_das_simple_op.cpp
@@ -14,6 +14,7 @@
 #include "sql/das/ob_das_simple_op.h"
 #include "sql/das/ob_das_ref.h"
 #include "storage/tx_storage/ob_access_service.h"
+#include "sql/engine/ob_exec_context.h"
 
 namespace oceanbase
 {
diff --git a/src/sql/engine/cmd/ob_variable_set_executor.h b/src/sql/engine/cmd/ob_variable_set_executor.h
index 31b0d75ee1..b54ea72bf1 100644
--- a/src/sql/engine/cmd/ob_variable_set_executor.h
+++ b/src/sql/engine/cmd/ob_variable_set_executor.h
@@ -85,9 +85,9 @@ private:
       cur_special_count_(0)
     {}
     int init(uint64_t tenant_id);
-    int get_current_val(schema::ObSchemaGetterGuard &schema_guard,
+    int get_current_val(share::schema::ObSchemaGetterGuard &schema_guard,
                         uint64_t tenant_id,
-                        ObSysVarClassType var_id,
+                        share::ObSysVarClassType var_id,
                         uint64_t &val);
     int update_expect_length();
 
diff --git a/src/sql/engine/expr/ob_expr_convert.cpp b/src/sql/engine/expr/ob_expr_convert.cpp
index 6444ba041b..07d9b0a553 100644
--- a/src/sql/engine/expr/ob_expr_convert.cpp
+++ b/src/sql/engine/expr/ob_expr_convert.cpp
@@ -19,6 +19,7 @@
 #include "sql/session/ob_sql_session_info.h"
 #include "sql/engine/expr/ob_expr_result_type_util.h"
 #include "sql/engine/expr/ob_expr_lob_utils.h"
+#include "sql/engine/ob_exec_context.h"
 
 using namespace oceanbase::common;
 using namespace oceanbase::sql;
diff --git a/src/sql/engine/expr/ob_expr_xml_element.cpp b/src/sql/engine/expr/ob_expr_xml_element.cpp
index b061cba8cf..e0b3119a49 100644
--- a/src/sql/engine/expr/ob_expr_xml_element.cpp
+++ b/src/sql/engine/expr/ob_expr_xml_element.cpp
@@ -13,6 +13,7 @@
 
 #define USING_LOG_PREFIX SQL_ENG
 #include "ob_expr_xml_element.h"
+#include "sql/engine/ob_exec_context.h"
 #ifdef OB_BUILD_ORACLE_XML
 #include "lib/xml/ob_xml_util.h"
 #include "sql/engine/expr/ob_expr_xml_func_helper.h"
diff --git a/src/sql/engine/sequence/ob_sequence_op.cpp b/src/sql/engine/sequence/ob_sequence_op.cpp
index 5131864a26..dc41397021 100644
--- a/src/sql/engine/sequence/ob_sequence_op.cpp
+++ b/src/sql/engine/sequence/ob_sequence_op.cpp
@@ -16,6 +16,7 @@
 #include "sql/session/ob_sql_session_info.h"
 #include "sql/engine/ob_physical_plan.h"
 #include "sql/engine/ob_exec_context.h"
+#include "sql/engine/dml/ob_link_op.h"
 
 namespace oceanbase
 {
diff --git a/src/sql/engine/sequence/ob_sequence_op.h b/src/sql/engine/sequence/ob_sequence_op.h
index 229cc5b821..d3042a7993 100644
--- a/src/sql/engine/sequence/ob_sequence_op.h
+++ b/src/sql/engine/sequence/ob_sequence_op.h
@@ -15,6 +15,7 @@
 #include "sql/engine/ob_operator.h"
 #include "share/sequence/ob_sequence_cache.h"
 #include "share/schema/ob_schema_struct.h"
+#include "lib/mysqlclient/ob_isql_connection_pool.h"
 
 namespace oceanbase
 {
diff --git a/src/sql/optimizer/ob_log_insert.h b/src/sql/optimizer/ob_log_insert.h
index 2afdf9a323..f95b22fa05 100644
--- a/src/sql/optimizer/ob_log_insert.h
+++ b/src/sql/optimizer/ob_log_insert.h
@@ -15,6 +15,7 @@
 #include "ob_logical_operator.h"
 #include "ob_log_del_upd.h"
 #include "sql/resolver/dml/ob_insert_stmt.h"
+#include "sql/optimizer/ob_log_plan.h"
 
 namespace oceanbase
 {
diff --git a/src/sql/plan_cache/ob_values_table_compression.h b/src/sql/plan_cache/ob_values_table_compression.h
index 34622473f1..ce5fc01461 100644
--- a/src/sql/plan_cache/ob_values_table_compression.h
+++ b/src/sql/plan_cache/ob_values_table_compression.h
@@ -15,6 +15,10 @@
 
 #include "sql/parser/ob_parser.h"
 #include "lib/string/ob_string.h"
+#include "sql/resolver/ob_stmt_type.h"
+#include "sql/plan_cache/ob_plan_cache_struct.h"
+#include "sql/parser/ob_char_type.h"
+#include "sql/parser/ob_fast_parser.h"
 
 namespace oceanbase
 {
diff --git a/src/sql/resolver/dml/ob_sequence_namespace_checker.h b/src/sql/resolver/dml/ob_sequence_namespace_checker.h
index d6b512312d..be396bf333 100644
--- a/src/sql/resolver/dml/ob_sequence_namespace_checker.h
+++ b/src/sql/resolver/dml/ob_sequence_namespace_checker.h
@@ -15,6 +15,7 @@
 #include "share/ob_define.h"
 #include "lib/container/ob_array.h"
 #include "lib/string/ob_string.h"
+#include "pl/dblink/ob_pl_dblink_guard.h"
 namespace oceanbase
 {
 namespace sql
@@ -54,7 +55,7 @@ private:
                                               const ObSchemaChecker *schema_checker,
                                               bool &exists,
                                               uint64_t &sequence_id);
-  int check_link_sequence_exists(const ObDbLinkSchema *dblink_schema,
+  int check_link_sequence_exists(const pl::ObDbLinkSchema *dblink_schema,
                                 sql::ObSQLSessionInfo *session_info,
                                 const ObString &database_name,
                                 const ObString &sequence_name,
diff --git a/src/sql/rewrite/ob_transform_predicate_move_around.h b/src/sql/rewrite/ob_transform_predicate_move_around.h
index f278efafeb..fce33a573f 100644
--- a/src/sql/rewrite/ob_transform_predicate_move_around.h
+++ b/src/sql/rewrite/ob_transform_predicate_move_around.h
@@ -15,6 +15,8 @@
 
 #include "sql/rewrite/ob_transform_rule.h"
 #include "sql/resolver/dml/ob_select_stmt.h"
+#include "sql/rewrite/ob_stmt_comparer.h"
+
 namespace oceanbase
 {
 namespace sql
diff --git a/src/storage/checkpoint/ob_data_checkpoint.h b/src/storage/checkpoint/ob_data_checkpoint.h
index 7beef102d5..6179f9463f 100644
--- a/src/storage/checkpoint/ob_data_checkpoint.h
+++ b/src/storage/checkpoint/ob_data_checkpoint.h
@@ -18,6 +18,8 @@
 #include "lib/lock/ob_spin_lock.h"
 #include "storage/checkpoint/ob_freeze_checkpoint.h"
 #include "share/scn.h"
+#include "share/ob_errno.h"
+
 
 namespace oceanbase
 {
diff --git a/src/storage/compaction/ob_medium_compaction_mgr.cpp b/src/storage/compaction/ob_medium_compaction_mgr.cpp
index ad17306ce6..9a0e9c5b9b 100644
--- a/src/storage/compaction/ob_medium_compaction_mgr.cpp
+++ b/src/storage/compaction/ob_medium_compaction_mgr.cpp
@@ -678,17 +678,5 @@ int ObMediumCompactionInfoList::get_max_sync_medium_scn(int64_t &max_sync_medium
   return ret;
 }
 
-bool ObMediumCompactionInfoList::could_schedule_next_round(const int64_t last_major_snapshot) const
-{
-  bool exist = false;
-  DLIST_FOREACH_NORET(info, get_list()) {
-    if (info->medium_snapshot_ > last_major_snapshot) {
-      exist = true;
-      break;
-    }
-  }
-  return !need_check_finish() && !exist;
-}
-
 } //namespace compaction
 } // namespace oceanbase
diff --git a/src/storage/compaction/ob_medium_compaction_mgr.h b/src/storage/compaction/ob_medium_compaction_mgr.h
index 0187fb2aad..5f070d6c89 100644
--- a/src/storage/compaction/ob_medium_compaction_mgr.h
+++ b/src/storage/compaction/ob_medium_compaction_mgr.h
@@ -114,7 +114,17 @@ public:
   OB_INLINE int64_t get_wait_check_medium_scn() const { return extra_info_.wait_check_flag_ ? extra_info_.last_medium_scn_ : 0; }
   OB_INLINE bool need_check_finish() const { return get_wait_check_medium_scn() > 0; }
   // check status on serialized medium list
-  OB_INLINE bool could_schedule_next_round(const int64_t last_major_snapshot) const;
+  OB_INLINE bool could_schedule_next_round(const int64_t last_major_snapshot) const
+  {
+    bool exist = false;
+    DLIST_FOREACH_NORET(info, get_list()) {
+      if (info->medium_snapshot_ > last_major_snapshot) {
+        exist = true;
+        break;
+      }
+    }
+    return !need_check_finish() && !exist;
+  }
   OB_INLINE ObMediumCompactionInfo::ObCompactionType get_last_compaction_type() const
   {
     return static_cast<ObMediumCompactionInfo::ObCompactionType>(extra_info_.last_compaction_type_);
diff --git a/src/storage/high_availability/ob_ls_member_list_service.cpp b/src/storage/high_availability/ob_ls_member_list_service.cpp
index 89d802d597..c4090dd8ee 100644
--- a/src/storage/high_availability/ob_ls_member_list_service.cpp
+++ b/src/storage/high_availability/ob_ls_member_list_service.cpp
@@ -15,6 +15,8 @@
 #include "storage/high_availability/ob_storage_ha_utils.h"
 #include "storage/high_availability/ob_ls_member_list_service.h"
 #include "storage/high_availability/ob_storage_ha_src_provider.h"
+#include "storage/meta_mem/ob_tenant_meta_mem_mgr.h"
+#include "storage/tablet/ob_tablet_iterator.h"
 
 namespace oceanbase
 {
diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp
index 37c4ec14a8..ce77f73c65 100755
--- a/src/storage/tablet/ob_tablet.cpp
+++ b/src/storage/tablet/ob_tablet.cpp
@@ -72,6 +72,7 @@
 #include "storage/tx_storage/ob_ls_service.h"
 #include "storage/compaction/ob_medium_list_checker.h"
 #include "storage/memtable/ob_row_conflict_handler.h"
+#include "storage/tablet/ob_tablet_binding_info.h"
 
 namespace oceanbase
 {
diff --git a/src/storage/tablet/ob_tablet_mds_data.cpp b/src/storage/tablet/ob_tablet_mds_data.cpp
index c488e1cfd3..cd01a680d5 100644
--- a/src/storage/tablet/ob_tablet_mds_data.cpp
+++ b/src/storage/tablet/ob_tablet_mds_data.cpp
@@ -22,6 +22,7 @@
 #include "storage/tablet/ob_tablet_full_memory_mds_data.h"
 #include "storage/tablet/ob_tablet_obj_load_helper.h"
 #include "storage/tablet/ob_i_tablet_mds_interface.h"
+#include "storage/tablet/ob_tablet_binding_info.h"
 
 #define USING_LOG_PREFIX MDS
 
diff --git a/src/storage/tx/ob_tx_ctx_mds.cpp b/src/storage/tx/ob_tx_ctx_mds.cpp
index 11957f1f76..ab534454db 100644
--- a/src/storage/tx/ob_tx_ctx_mds.cpp
+++ b/src/storage/tx/ob_tx_ctx_mds.cpp
@@ -11,6 +11,7 @@
  */
 
 #include "storage/tx/ob_tx_ctx_mds.h"
+#include "storage/tx/ob_trans_part_ctx.h"
 
 namespace oceanbase
 {
diff --git a/src/storage/tx/ob_tx_data_functor.cpp b/src/storage/tx/ob_tx_data_functor.cpp
index d5edbb0b59..3e5a3c8d73 100644
--- a/src/storage/tx/ob_tx_data_functor.cpp
+++ b/src/storage/tx/ob_tx_data_functor.cpp
@@ -22,6 +22,7 @@
 #include "logservice/leader_coordinator/ob_failure_detector.h"
 #include "observer/virtual_table/ob_all_virtual_tx_data.h"
 #include "logservice/ob_garbage_collector.h"
+#include "storage/high_availability/ob_tablet_group_restore.h"
 
 namespace oceanbase
 {
@@ -322,7 +323,7 @@ int LockForReadFunctor::operator()(const ObTxData &tx_data, ObTxCCCtx *tx_cc_ctx
   int ret = OB_ERR_SHARED_LOCK_CONFLICT;
   const int64_t MAX_RETRY_CNT = 1000;
   const int64_t MAX_SLEEP_US = 1000;
-  ObMvccAccessCtx &acc_ctx = lock_for_read_arg_.mvcc_acc_ctx_;
+  memtable::ObMvccAccessCtx &acc_ctx = lock_for_read_arg_.mvcc_acc_ctx_;
   int64_t lock_expire_ts = acc_ctx.eval_lock_expire_ts();
   // check lock_for_read blocked or not every 1ms * 1000 = 1s
   int64_t retry_cnt = 0;
diff --git a/src/storage/tx_storage/ob_checkpoint_service.cpp b/src/storage/tx_storage/ob_checkpoint_service.cpp
index 79a06b4fb2..a7c2c3c0ef 100644
--- a/src/storage/tx_storage/ob_checkpoint_service.cpp
+++ b/src/storage/tx_storage/ob_checkpoint_service.cpp
@@ -14,6 +14,7 @@
 
 #include "lib/oblog/ob_log.h"
 #include "share/ob_thread_mgr.h"
+#include "share/ob_errno.h"
 #include "storage/checkpoint/ob_data_checkpoint.h"
 #include "storage/tx_storage/ob_checkpoint_service.h"
 #include "storage/tx_storage/ob_ls_handle.h"