diff --git a/be/src/agent/cgroups_mgr.cpp b/be/src/agent/cgroups_mgr.cpp
index 0822c621f5..936ed73427 100644
--- a/be/src/agent/cgroups_mgr.cpp
+++ b/be/src/agent/cgroups_mgr.cpp
@@ -33,7 +33,6 @@
 #include "olap/data_dir.h"
 #include "olap/storage_engine.h"
 #include "runtime/exec_env.h"
-#include "runtime/load_path_mgr.h"
 
 using std::string;
 using std::map;
diff --git a/be/src/agent/heartbeat_server.cpp b/be/src/agent/heartbeat_server.cpp
index 25f9b05c6b..0c5d7fefa7 100644
--- a/be/src/agent/heartbeat_server.cpp
+++ b/be/src/agent/heartbeat_server.cpp
@@ -27,7 +27,6 @@
 #include "gen_cpp/HeartbeatService.h"
 #include "gen_cpp/Status_types.h"
 #include "olap/storage_engine.h"
-#include "olap/utils.h"
 #include "runtime/heartbeat_flags.h"
 #include "service/backend_options.h"
 #include "util/debug_util.h"
@@ -38,7 +37,7 @@ using std::fstream;
 using std::nothrow;
 using std::string;
 using std::vector;
-using apache::thrift::transport::TProcessor;
+using apache::thrift::TProcessor;
 
 namespace doris {
 
diff --git a/be/src/agent/heartbeat_server.h b/be/src/agent/heartbeat_server.h
index 3ca7ab8582..bc94b2276d 100644
--- a/be/src/agent/heartbeat_server.h
+++ b/be/src/agent/heartbeat_server.h
@@ -21,10 +21,8 @@
 
 #include "common/status.h"
 #include "gen_cpp/HeartbeatService.h"
-#include "gen_cpp/Status_types.h"
 #include "olap/olap_define.h"
 #include "runtime/exec_env.h"
-#include "thrift/transport/TTransportUtils.h"
 
 namespace doris {
 
diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
index 06ca61eef0..c5fbe42c8d 100644
--- a/be/src/agent/task_worker_pool.cpp
+++ b/be/src/agent/task_worker_pool.cpp
@@ -29,10 +29,8 @@
 
 #include "common/status.h"
 #include "env/env.h"
-#include "gen_cpp/FrontendService.h"
 #include "gen_cpp/Types_types.h"
 #include "gutil/strings/substitute.h"
-#include "http/http_client.h"
 #include "olap/data_dir.h"
 #include "olap/olap_common.h"
 #include "olap/snapshot_manager.h"
diff --git a/be/src/agent/task_worker_pool.h b/be/src/agent/task_worker_pool.h
index e398e95109..0e9615f15b 100644
--- a/be/src/agent/task_worker_pool.h
+++ b/be/src/agent/task_worker_pool.h
@@ -27,11 +27,9 @@
 #include "common/status.h"
 #include "gen_cpp/AgentService_types.h"
 #include "gen_cpp/HeartbeatService_types.h"
-#include "gutil/ref_counted.h"
-#include "olap/olap_define.h"
-#include "olap/storage_engine.h"
+#include "olap/data_dir.h"
+#include "olap/tablet.h"
 #include "util/countdown_latch.h"
-#include "util/thread.h"
 
 namespace doris {
 
diff --git a/be/src/agent/topic_subscriber.cpp b/be/src/agent/topic_subscriber.cpp
index cdc99d54c8..88754efd2b 100644
--- a/be/src/agent/topic_subscriber.cpp
+++ b/be/src/agent/topic_subscriber.cpp
@@ -17,8 +17,6 @@
 
 #include "agent/topic_subscriber.h"
 
-#include "common/logging.h"
-
 namespace doris {
 
 TopicSubscriber::TopicSubscriber() {}
diff --git a/be/src/agent/user_resource_listener.cpp b/be/src/agent/user_resource_listener.cpp
index 56cd0f1407..abd938537e 100644
--- a/be/src/agent/user_resource_listener.cpp
+++ b/be/src/agent/user_resource_listener.cpp
@@ -26,7 +26,6 @@
 #include <future>
 #include <map>
 
-#include "common/logging.h"
 #include "gen_cpp/FrontendService.h"
 #include "runtime/client_cache.h"
 
diff --git a/be/src/agent/user_resource_listener.h b/be/src/agent/user_resource_listener.h
index 525561f942..828ca4fefa 100644
--- a/be/src/agent/user_resource_listener.h
+++ b/be/src/agent/user_resource_listener.h
@@ -23,7 +23,6 @@
 #include "agent/topic_listener.h"
 #include "gen_cpp/AgentService_types.h"
 #include "gen_cpp/HeartbeatService_types.h"
-#include "gen_cpp/MasterService_types.h"
 #include "runtime/exec_env.h"
 
 namespace doris {
diff --git a/be/src/agent/utils.h b/be/src/agent/utils.h
index c22cb8064b..2785e562e4 100644
--- a/be/src/agent/utils.h
+++ b/be/src/agent/utils.h
@@ -17,10 +17,11 @@
 
 #pragma once
 
+#include <gen_cpp/FrontendService.h>
+#include <gen_cpp/HeartbeatService_types.h>
+#include <gen_cpp/MasterService_types.h>
+
 #include "common/status.h"
-#include "gen_cpp/FrontendService.h"
-#include "gen_cpp/FrontendService_types.h"
-#include "gen_cpp/HeartbeatService_types.h"
 #include "runtime/client_cache.h"
 
 namespace doris {
diff --git a/be/src/common/daemon.cpp b/be/src/common/daemon.cpp
index 5d8af62815..7b58e32bfa 100644
--- a/be/src/common/daemon.cpp
+++ b/be/src/common/daemon.cpp
@@ -50,7 +50,6 @@
 #include "olap/options.h"
 #include "runtime/bufferpool/buffer_pool.h"
 #include "runtime/exec_env.h"
-#include "runtime/mem_tracker.h"
 #include "runtime/memory/chunk_allocator.h"
 #include "runtime/user_function_cache.h"
 #include "util/cpu_info.h"
diff --git a/be/src/common/status.cpp b/be/src/common/status.cpp
index 4f5c992a8f..c46fdb1a8c 100644
--- a/be/src/common/status.cpp
+++ b/be/src/common/status.cpp
@@ -10,7 +10,6 @@
 
 #include <boost/stacktrace.hpp>
 
-#include "gutil/strings/fastmem.h" // for memcpy_inlined
 namespace doris {
 
 constexpr int MAX_ERROR_NUM = 65536;
diff --git a/be/src/env/env.cpp b/be/src/env/env.cpp
index dab94e0401..3e0b963ac8 100644
--- a/be/src/env/env.cpp
+++ b/be/src/env/env.cpp
@@ -17,7 +17,6 @@
 
 #include "env/env.h"
 
-#include "common/config.h"
 #include "env/env_posix.h"
 
 namespace doris {
diff --git a/be/src/env/env.h b/be/src/env/env.h
index e4c1ee55bb..bf09d4a488 100644
--- a/be/src/env/env.h
+++ b/be/src/env/env.h
@@ -13,7 +13,6 @@
 #include <string>
 
 #include "common/status.h"
-#include "gen_cpp/AgentService_types.h"
 #include "gen_cpp/Types_types.h"
 #include "gen_cpp/olap_file.pb.h"
 #include "util/slice.h"
diff --git a/be/src/env/env_posix.cpp b/be/src/env/env_posix.cpp
index 5ec462f153..a31cc92aa1 100644
--- a/be/src/env/env_posix.cpp
+++ b/be/src/env/env_posix.cpp
@@ -29,14 +29,12 @@
 #include <fstream>
 #include <memory>
 
-#include "common/logging.h"
 #include "env/env.h"
 #include "gutil/gscoped_ptr.h"
 #include "gutil/macros.h"
 #include "gutil/port.h"
 #include "gutil/strings/substitute.h"
 #include "util/errno.h"
-#include "util/file_cache.h"
 #include "util/slice.h"
 
 namespace doris {
diff --git a/be/src/env/env_util.cpp b/be/src/env/env_util.cpp
index c6527392dc..1043231176 100644
--- a/be/src/env/env_util.cpp
+++ b/be/src/env/env_util.cpp
@@ -18,7 +18,6 @@
 #include "env/env_util.h"
 
 #include "env/env.h"
-#include "util/faststring.h"
 
 using std::shared_ptr;
 using std::string;
diff --git a/be/src/exec/analytic_eval_node.cpp b/be/src/exec/analytic_eval_node.cpp
index 43e193d0ab..9b2c6803db 100644
--- a/be/src/exec/analytic_eval_node.cpp
+++ b/be/src/exec/analytic_eval_node.cpp
@@ -21,7 +21,6 @@
 #include "exec/analytic_eval_node.h"
 
 #include "exprs/agg_fn_evaluator.h"
-#include "exprs/anyval_util.h"
 #include "runtime/descriptors.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
diff --git a/be/src/exec/arrow/parquet_reader.cpp b/be/src/exec/arrow/parquet_reader.cpp
index dad3e9e5e8..05f81c049d 100644
--- a/be/src/exec/arrow/parquet_reader.cpp
+++ b/be/src/exec/arrow/parquet_reader.cpp
@@ -27,11 +27,7 @@
 
 #include "common/logging.h"
 #include "common/status.h"
-#include "gen_cpp/PaloBrokerService_types.h"
-#include "gen_cpp/TPaloBrokerService.h"
 #include "io/file_reader.h"
-#include "runtime/broker_mgr.h"
-#include "runtime/client_cache.h"
 #include "runtime/descriptors.h"
 #include "runtime/mem_pool.h"
 #include "runtime/string_value.h"
diff --git a/be/src/exec/base_scanner.cpp b/be/src/exec/base_scanner.cpp
index 11247a860c..e8e4d21118 100644
--- a/be/src/exec/base_scanner.cpp
+++ b/be/src/exec/base_scanner.cpp
@@ -19,7 +19,6 @@
 
 #include <fmt/format.h>
 
-#include "common/logging.h"
 #include "common/utils.h"
 #include "exec/exec_node.h"
 #include "exprs/expr_context.h"
diff --git a/be/src/exec/blocking_join_node.cpp b/be/src/exec/blocking_join_node.cpp
index d88ce56ecf..3aa1794a7a 100644
--- a/be/src/exec/blocking_join_node.cpp
+++ b/be/src/exec/blocking_join_node.cpp
@@ -22,10 +22,11 @@
 
 #include <sstream>
 
-#include "exprs/expr.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
+#include "runtime/tuple.h"
+#include "runtime/tuple_row.h"
 #include "util/runtime_profile.h"
 
 namespace doris {
diff --git a/be/src/exec/broker_scan_node.cpp b/be/src/exec/broker_scan_node.cpp
index c47134be19..fb47d2b821 100644
--- a/be/src/exec/broker_scan_node.cpp
+++ b/be/src/exec/broker_scan_node.cpp
@@ -26,7 +26,6 @@
 #include "exec/parquet_scanner.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
-#include "runtime/dpp_sink_internal.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "util/runtime_profile.h"
diff --git a/be/src/exec/broker_scanner.cpp b/be/src/exec/broker_scanner.cpp
index 8942c4fd67..29350645bb 100644
--- a/be/src/exec/broker_scanner.cpp
+++ b/be/src/exec/broker_scanner.cpp
@@ -18,23 +18,18 @@
 #include "exec/broker_scanner.h"
 
 #include <fmt/format.h>
+#include <gen_cpp/internal_service.pb.h>
 
 #include <iostream>
 #include <sstream>
 
 #include "common/consts.h"
 #include "exec/decompressor.h"
-#include "exec/exec_node.h"
 #include "exec/plain_binary_line_reader.h"
 #include "exec/plain_text_line_reader.h"
-#include "exprs/expr.h"
-#include "io/buffered_reader.h"
 #include "io/file_factory.h"
 #include "runtime/descriptors.h"
 #include "runtime/exec_env.h"
-#include "runtime/raw_value.h"
-#include "runtime/stream_load/load_stream_mgr.h"
-#include "runtime/stream_load/stream_load_pipe.h"
 #include "runtime/tuple.h"
 #include "util/string_util.h"
 #include "util/utf8_check.h"
diff --git a/be/src/exec/broker_scanner.h b/be/src/exec/broker_scanner.h
index 379b1630cd..d25ec3bbc4 100644
--- a/be/src/exec/broker_scanner.h
+++ b/be/src/exec/broker_scanner.h
@@ -27,7 +27,6 @@
 #include "exec/base_scanner.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "gen_cpp/Types_types.h"
-#include "gen_cpp/internal_service.pb.h"
 #include "runtime/mem_pool.h"
 #include "util/runtime_profile.h"
 #include "util/slice.h"
diff --git a/be/src/exec/cross_join_node.cpp b/be/src/exec/cross_join_node.cpp
index 3ba307fd0c..38084768b8 100644
--- a/be/src/exec/cross_join_node.cpp
+++ b/be/src/exec/cross_join_node.cpp
@@ -23,7 +23,6 @@
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "util/debug_util.h"
 #include "util/runtime_profile.h"
 
 namespace doris {
diff --git a/be/src/exec/cross_join_node.h b/be/src/exec/cross_join_node.h
index 698d397dc1..dc8cfac171 100644
--- a/be/src/exec/cross_join_node.h
+++ b/be/src/exec/cross_join_node.h
@@ -22,11 +22,9 @@
 #include <unordered_set>
 
 #include "exec/blocking_join_node.h"
-#include "exec/exec_node.h"
 #include "exec/row_batch_list.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/descriptors.h"
-#include "runtime/mem_pool.h"
 
 namespace doris {
 
diff --git a/be/src/exec/csv_scan_node.cpp b/be/src/exec/csv_scan_node.cpp
index f8a1a80437..1b0e406c82 100644
--- a/be/src/exec/csv_scan_node.cpp
+++ b/be/src/exec/csv_scan_node.cpp
@@ -23,16 +23,10 @@
 #include <vector>
 
 #include "exec/text_converter.hpp"
-#include "exprs/hll_hash_function.h"
 #include "gen_cpp/PlanNodes_types.h"
-#include "olap/olap_common.h"
-#include "olap/utils.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.h"
 #include "runtime/tuple_row.h"
-#include "util/debug_util.h"
-#include "util/file_utils.h"
 #include "util/hash_util.hpp"
 #include "util/runtime_profile.h"
 
diff --git a/be/src/exec/csv_scan_node.h b/be/src/exec/csv_scan_node.h
index e59c048ae3..f89b75a1ff 100644
--- a/be/src/exec/csv_scan_node.h
+++ b/be/src/exec/csv_scan_node.h
@@ -20,7 +20,6 @@
 #include <fstream>
 #include <sstream>
 
-#include "common/config.h"
 #include "exec/csv_scanner.h"
 #include "exec/scan_node.h"
 #include "runtime/descriptors.h"
diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp
index ef93a0c354..c71e39a999 100644
--- a/be/src/exec/data_sink.cpp
+++ b/be/src/exec/data_sink.cpp
@@ -24,10 +24,7 @@
 #include <memory>
 #include <string>
 
-#include "common/logging.h"
-#include "exec/exec_node.h"
 #include "exec/tablet_sink.h"
-#include "exprs/expr.h"
 #include "gen_cpp/PaloInternalService_types.h"
 #include "runtime/data_stream_sender.h"
 #include "runtime/export_sink.h"
@@ -40,7 +37,6 @@
 #include "vec/sink/result_sink.h"
 #include "vec/sink/vdata_stream_sender.h"
 #include "vec/sink/vmysql_table_sink.h"
-#include "vec/sink/vmysql_table_writer.h"
 #include "vec/sink/vresult_file_sink.h"
 #include "vec/sink/vtablet_sink.h"
 
diff --git a/be/src/exec/es/es_predicate.cpp b/be/src/exec/es/es_predicate.cpp
index 7dab9ca265..8f231e4692 100644
--- a/be/src/exec/es/es_predicate.cpp
+++ b/be/src/exec/es/es_predicate.cpp
@@ -24,25 +24,15 @@
 #include <map>
 #include <sstream>
 
-#include "common/logging.h"
 #include "common/status.h"
 #include "exec/es/es_query_builder.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
 #include "exprs/in_predicate.h"
-#include "gen_cpp/PlanNodes_types.h"
-#include "olap/olap_common.h"
-#include "olap/utils.h"
-#include "runtime/client_cache.h"
 #include "runtime/datetime_value.h"
 #include "runtime/large_int_value.h"
-#include "runtime/row_batch.h"
-#include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
 #include "runtime/tuple_row.h"
-#include "service/backend_options.h"
-#include "util/debug_util.h"
-#include "util/runtime_profile.h"
 
 namespace doris {
 
diff --git a/be/src/exec/es/es_predicate.h b/be/src/exec/es/es_predicate.h
index 05c4e2b946..5d7c7570bd 100644
--- a/be/src/exec/es/es_predicate.h
+++ b/be/src/exec/es/es_predicate.h
@@ -25,7 +25,6 @@
 #include "gen_cpp/Opcodes_types.h"
 #include "runtime/descriptors.h"
 #include "runtime/primitive_type.h"
-#include "runtime/tuple.h"
 
 namespace doris {
 
diff --git a/be/src/exec/es/es_query_builder.cpp b/be/src/exec/es/es_query_builder.cpp
index 1f9488e697..31a5e5a205 100644
--- a/be/src/exec/es/es_query_builder.cpp
+++ b/be/src/exec/es/es_query_builder.cpp
@@ -19,10 +19,7 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
-#include "common/logging.h"
 #include "rapidjson/rapidjson.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
 
 namespace doris {
 
diff --git a/be/src/exec/es/es_scroll_query.cpp b/be/src/exec/es/es_scroll_query.cpp
index dd86d39fbd..8123139a6c 100644
--- a/be/src/exec/es/es_scroll_query.cpp
+++ b/be/src/exec/es/es_scroll_query.cpp
@@ -19,7 +19,6 @@
 
 #include <sstream>
 
-#include "common/logging.h"
 #include "exec/es/es_query_builder.h"
 #include "exec/es/es_scan_reader.h"
 #include "rapidjson/document.h"
diff --git a/be/src/exec/es_http_scan_node.cpp b/be/src/exec/es_http_scan_node.cpp
index 9a3f5baf38..ee762a68f4 100644
--- a/be/src/exec/es_http_scan_node.cpp
+++ b/be/src/exec/es_http_scan_node.cpp
@@ -27,7 +27,6 @@
 #include "exec/es/es_scroll_query.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
-#include "runtime/dpp_sink_internal.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "service/backend_options.h"
diff --git a/be/src/exec/es_http_scanner.cpp b/be/src/exec/es_http_scanner.cpp
index 9a70e88579..ca022be173 100644
--- a/be/src/exec/es_http_scanner.cpp
+++ b/be/src/exec/es_http_scanner.cpp
@@ -23,8 +23,6 @@
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
 #include "runtime/descriptors.h"
-#include "runtime/exec_env.h"
-#include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
 #include "runtime/tuple.h"
 
diff --git a/be/src/exec/es_http_scanner.h b/be/src/exec/es_http_scanner.h
index f1abbd3c7e..4e86a2ba36 100644
--- a/be/src/exec/es_http_scanner.h
+++ b/be/src/exec/es_http_scanner.h
@@ -27,8 +27,6 @@
 #include "common/global_types.h"
 #include "common/status.h"
 #include "exec/es/es_scan_reader.h"
-#include "gen_cpp/PlanNodes_types.h"
-#include "gen_cpp/Types_types.h"
 #include "runtime/mem_pool.h"
 #include "util/runtime_profile.h"
 
diff --git a/be/src/exec/except_node.cpp b/be/src/exec/except_node.cpp
index 893a8f8d71..79ce14fa3d 100644
--- a/be/src/exec/except_node.cpp
+++ b/be/src/exec/except_node.cpp
@@ -17,7 +17,7 @@
 
 #include "exec/except_node.h"
 
-#include "exec/hash_table.hpp"
+#include "exec/hash_table.h"
 #include "exprs/expr.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
diff --git a/be/src/exec/exec_node.cpp b/be/src/exec/exec_node.cpp
index dd5bfda921..4030b552ac 100644
--- a/be/src/exec/exec_node.cpp
+++ b/be/src/exec/exec_node.cpp
@@ -54,7 +54,6 @@
 #include "runtime/descriptors.h"
 #include "runtime/exec_env.h"
 #include "runtime/initial_reservations.h"
-#include "runtime/mem_pool.h"
 #include "runtime/mem_tracker.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
diff --git a/be/src/exec/exec_node.h b/be/src/exec/exec_node.h
index e5b0bd485b..35e495d158 100644
--- a/be/src/exec/exec_node.h
+++ b/be/src/exec/exec_node.h
@@ -28,13 +28,10 @@
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/bufferpool/buffer_pool.h"
 #include "runtime/descriptors.h"
-#include "runtime/mem_pool.h"
 #include "runtime/query_statistics.h"
-#include "runtime/thread_context.h"
 #include "service/backend_options.h"
 #include "util/blocking_queue.hpp"
 #include "util/runtime_profile.h"
-#include "util/uid_util.h" // for print_id
 #include "vec/exprs/vexpr_context.h"
 
 namespace doris {
diff --git a/be/src/exec/hash_join_node.cpp b/be/src/exec/hash_join_node.cpp
index 1ee401fe51..da822b9142 100644
--- a/be/src/exec/hash_join_node.cpp
+++ b/be/src/exec/hash_join_node.cpp
@@ -23,12 +23,11 @@
 #include <sstream>
 
 #include "common/utils.h"
-#include "exec/hash_table.hpp"
+#include "exec/hash_table.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
-#include "exprs/in_predicate.h"
 #include "exprs/runtime_filter.h"
-#include "exprs/slot_ref.h"
+#include "exprs/runtime_filter_slots.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_filter_mgr.h"
diff --git a/be/src/exec/hash_join_node.h b/be/src/exec/hash_join_node.h
index ece87ab1a1..506ac07b9e 100644
--- a/be/src/exec/hash_join_node.h
+++ b/be/src/exec/hash_join_node.h
@@ -27,7 +27,6 @@
 
 #include "exec/exec_node.h"
 #include "exec/hash_table.h"
-#include "exprs/runtime_filter_slots.h"
 #include "gen_cpp/PlanNodes_types.h"
 
 namespace doris {
diff --git a/be/src/exec/hash_table.cpp b/be/src/exec/hash_table.cpp
index 668a2a2242..cd32d3fb36 100644
--- a/be/src/exec/hash_table.cpp
+++ b/be/src/exec/hash_table.cpp
@@ -18,15 +18,12 @@
 // https://github.com/apache/impala/blob/branch-2.9.0/be/src/exec/hash-table.cc
 // and modified by Doris
 
-#include "exec/hash_table.hpp"
+#include "exec/hash_table.h"
 
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
 #include "runtime/mem_tracker.h"
 #include "runtime/raw_value.h"
-#include "runtime/runtime_state.h"
-#include "runtime/string_value.hpp"
-#include "util/doris_metrics.h"
 
 namespace doris {
 
@@ -280,4 +277,175 @@ std::string HashTable::debug_string(bool skip_empty, const RowDescriptor* desc)
     return ss.str();
 }
 
+bool HashTable::emplace_key(TupleRow* row, TupleRow** dest_addr) {
+    if (_num_filled_buckets > _num_buckets_till_resize) {
+        if (!resize_buckets(_num_buckets * 2).ok()) {
+            return false;
+        }
+    }
+    if (_current_used == _current_capacity) {
+        grow_node_array();
+    }
+
+    bool has_nulls = eval_build_row(row);
+
+    if (!_stores_nulls && has_nulls) {
+        return false;
+    }
+
+    uint32_t hash = hash_current_row();
+    int64_t bucket_idx = hash & (_num_buckets - 1);
+
+    Bucket* bucket = &_buckets[bucket_idx];
+    Node* node = bucket->_node;
+
+    bool will_insert = true;
+
+    if (node == nullptr) {
+        will_insert = true;
+    } else {
+        Node* last_node = node;
+        while (node != nullptr) {
+            if (node->_hash == hash && equals(node->data())) {
+                will_insert = false;
+                break;
+            }
+            last_node = node;
+            node = node->_next;
+        }
+        node = last_node;
+    }
+    if (will_insert) {
+        Node* alloc_node =
+                reinterpret_cast<Node*>(_current_nodes + _node_byte_size * _current_used++);
+        ++_num_nodes;
+        TupleRow* data = alloc_node->data();
+        *dest_addr = data;
+        alloc_node->_hash = hash;
+        if (node == nullptr) {
+            add_to_bucket(&_buckets[bucket_idx], alloc_node);
+        } else {
+            node->_next = alloc_node;
+        }
+    }
+    return will_insert;
+}
+
+HashTable::Iterator HashTable::find(TupleRow* probe_row, bool probe) {
+    bool has_nulls = probe ? eval_probe_row(probe_row) : eval_build_row(probe_row);
+
+    if (!_stores_nulls && has_nulls) {
+        return end();
+    }
+
+    uint32_t hash = hash_current_row();
+    int64_t bucket_idx = hash & (_num_buckets - 1);
+
+    Bucket* bucket = &_buckets[bucket_idx];
+    Node* node = bucket->_node;
+
+    while (node != nullptr) {
+        if (node->_hash == hash && equals(node->data())) {
+            return Iterator(this, bucket_idx, node, hash);
+        }
+
+        node = node->_next;
+    }
+
+    return end();
+}
+
+HashTable::Iterator HashTable::begin() {
+    int64_t bucket_idx = -1;
+    Bucket* bucket = next_bucket(&bucket_idx);
+
+    if (bucket != nullptr) {
+        return Iterator(this, bucket_idx, bucket->_node, 0);
+    }
+
+    return end();
+}
+
+HashTable::Bucket* HashTable::next_bucket(int64_t* bucket_idx) {
+    ++*bucket_idx;
+
+    for (; *bucket_idx < _num_buckets; ++*bucket_idx) {
+        if (_buckets[*bucket_idx]._node != nullptr) {
+            return &_buckets[*bucket_idx];
+        }
+    }
+
+    *bucket_idx = -1;
+    return nullptr;
+}
+
+void HashTable::insert_impl(TupleRow* row) {
+    bool has_null = eval_build_row(row);
+
+    if (!_stores_nulls && has_null) {
+        return;
+    }
+
+    uint32_t hash = hash_current_row();
+    int64_t bucket_idx = hash & (_num_buckets - 1);
+
+    if (_current_used == _current_capacity) {
+        grow_node_array();
+    }
+    // get a node from memory pool
+    Node* node = reinterpret_cast<Node*>(_current_nodes + _node_byte_size * _current_used++);
+
+    TupleRow* data = node->data();
+    node->_hash = hash;
+    memcpy(data, row, sizeof(Tuple*) * _num_build_tuples);
+    add_to_bucket(&_buckets[bucket_idx], node);
+    ++_num_nodes;
+}
+
+void HashTable::add_to_bucket(Bucket* bucket, Node* node) {
+    if (bucket->_node == nullptr) {
+        ++_num_filled_buckets;
+    }
+
+    node->_next = bucket->_node;
+    bucket->_node = node;
+    bucket->_size++;
+}
+
+void HashTable::move_node(Bucket* from_bucket, Bucket* to_bucket, Node* node, Node* previous_node) {
+    Node* next_node = node->_next;
+    from_bucket->_size--;
+
+    if (previous_node != nullptr) {
+        previous_node->_next = next_node;
+    } else {
+        // Update bucket directly
+        from_bucket->_node = next_node;
+
+        if (next_node == nullptr) {
+            --_num_filled_buckets;
+        }
+    }
+
+    add_to_bucket(to_bucket, node);
+}
+
+std::pair<int64_t, int64_t> HashTable::minmax_node() {
+    bool has_value = false;
+    int64_t min_size = std::numeric_limits<int64_t>::max();
+    int64_t max_size = std::numeric_limits<int64_t>::min();
+    for (const auto bucket : _buckets) {
+        int64_t counter = bucket._size;
+        if (counter > 0) {
+            has_value = true;
+            min_size = std::min(counter, min_size);
+            max_size = std::max(counter, max_size);
+        }
+    }
+    if (!has_value) {
+        return std::make_pair(0, 0);
+    }
+    return std::make_pair(min_size, max_size);
+}
+
 } // namespace doris
diff --git a/be/src/exec/hash_table.h b/be/src/exec/hash_table.h
index 18e9165525..b2e8b73a66 100644
--- a/be/src/exec/hash_table.h
+++ b/be/src/exec/hash_table.h
@@ -22,8 +22,6 @@
 
 #include <vector>
 
-#include "common/logging.h"
-#include "common/object_pool.h"
 #include "common/status.h"
 #include "util/hash_util.hpp"
 
@@ -73,6 +71,7 @@ class RuntimeState;
 // all the rows and then calls scan to find them.  Aggregation interleaves find() and
 // inserts().  We can want to optimize joins more heavily for inserts() (in particular
 // growing).
+
 class HashTable {
 private:
     struct Node;
@@ -151,13 +150,13 @@ public:
     Iterator find(TupleRow* probe_row, bool probe = true);
 
     // Returns number of elements in the hash table
-    int64_t size() { return _num_nodes; }
+    int64_t size() const { return _num_nodes; }
 
     // Returns the number of buckets
     int64_t num_buckets() { return _buckets.size(); }
 
     // Returns the number of filled buckets
-    int64_t num_filled_buckets() { return _num_filled_buckets; }
+    int64_t num_filled_buckets() const { return _num_filled_buckets; }
 
     // Check the hash table should be shrink
     bool should_be_shrink(int64_t valid_row) {
@@ -211,7 +210,51 @@ public:
         // from a Find, this will lazily evaluate that bucket, only returning
         // TupleRows that match the current scan row.
         template <bool check_match>
-        void next();
+        void next() {
+            if (_bucket_idx == -1) {
+                return;
+            }
+
+            // TODO: this should prefetch the next tuplerow
+            Node* node = _node;
+
+            // Iterator is not from a full table scan, evaluate equality now.  Only the current
+            // bucket needs to be scanned. '_expr_values_buffer' contains the results
+            // for the current probe row.
+            if (check_match) {
+                // TODO: this should prefetch the next node
+                Node* next_node = node->_next;
+
+                while (next_node != nullptr) {
+                    node = next_node;
+
+                    if (node->_hash == _scan_hash && _table->equals(node->data())) {
+                        _node = next_node;
+                        return;
+                    }
+
+                    next_node = node->_next;
+                }
+
+                *this = _table->end();
+            } else {
+                // Move onto the next chained node
+                if (node->_next != nullptr) {
+                    _node = node->_next;
+                    return;
+                }
+
+                // Move onto the next bucket
+                Bucket* bucket = _table->next_bucket(&_bucket_idx);
+
+                if (bucket == nullptr) {
+                    _bucket_idx = -1;
+                    _node = nullptr;
+                } else {
+                    _node = bucket->_node;
+                }
+            }
+        }
 
         // Returns the current row or nullptr if at end.
         TupleRow* get_row() {
diff --git a/be/src/exec/hash_table.hpp b/be/src/exec/hash_table.hpp
deleted file mode 100644
index 58d187ebaa..0000000000
--- a/be/src/exec/hash_table.hpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-// This file is copied from
-// https://github.com/apache/impala/blob/branch-2.9.0/be/src/exec/hash-table.hpp
-// and modified by Doris
-
-#ifndef DORIS_BE_SRC_QUERY_EXEC_HASH_TABLE_HPP
-#define DORIS_BE_SRC_QUERY_EXEC_HASH_TABLE_HPP
-
-#include "exec/hash_table.h"
-
-namespace doris {
-
-inline bool HashTable::emplace_key(TupleRow* row, TupleRow** dest_addr) {
-    if (_num_filled_buckets > _num_buckets_till_resize) {
-        if (!resize_buckets(_num_buckets * 2).ok()) {
-            return false;
-        }
-    }
-    if (_current_used == _current_capacity) {
-        grow_node_array();
-    }
-
-    bool has_nulls = eval_build_row(row);
-
-    if (!_stores_nulls && has_nulls) {
-        return false;
-    }
-
-    uint32_t hash = hash_current_row();
-    int64_t bucket_idx = hash & (_num_buckets - 1);
-
-    Bucket* bucket = &_buckets[bucket_idx];
-    Node* node = bucket->_node;
-
-    bool will_insert = true;
-
-    if (node == nullptr) {
-        will_insert = true;
-    } else {
-        Node* last_node = node;
-        while (node != nullptr) {
-            if (node->_hash == hash && equals(node->data())) {
-                will_insert = false;
-                break;
-            }
-            last_node = node;
-            node = node->_next;
-        }
-        node = last_node;
-    }
-    if (will_insert) {
-        Node* alloc_node =
-                reinterpret_cast<Node*>(_current_nodes + _node_byte_size * _current_used++);
-        ++_num_nodes;
-        TupleRow* data = alloc_node->data();
-        *dest_addr = data;
-        alloc_node->_hash = hash;
-        if (node == nullptr) {
-            add_to_bucket(&_buckets[bucket_idx], alloc_node);
-        } else {
-            node->_next = alloc_node;
-        }
-    }
-    return will_insert;
-}
-
-inline HashTable::Iterator HashTable::find(TupleRow* probe_row, bool probe) {
-    bool has_nulls = probe ? eval_probe_row(probe_row) : eval_build_row(probe_row);
-
-    if (!_stores_nulls && has_nulls) {
-        return end();
-    }
-
-    uint32_t hash = hash_current_row();
-    int64_t bucket_idx = hash & (_num_buckets - 1);
-
-    Bucket* bucket = &_buckets[bucket_idx];
-    Node* node = bucket->_node;
-
-    while (node != nullptr) {
-        if (node->_hash == hash && equals(node->data())) {
-            return Iterator(this, bucket_idx, node, hash);
-        }
-
-        node = node->_next;
-    }
-
-    return end();
-}
-
-inline HashTable::Iterator HashTable::begin() {
-    int64_t bucket_idx = -1;
-    Bucket* bucket = next_bucket(&bucket_idx);
-
-    if (bucket != NULL) {
-        return Iterator(this, bucket_idx, bucket->_node, 0);
-    }
-
-    return end();
-}
-
-inline HashTable::Bucket* HashTable::next_bucket(int64_t* bucket_idx) {
-    ++*bucket_idx;
-
-    for (; *bucket_idx < _num_buckets; ++*bucket_idx) {
-        if (_buckets[*bucket_idx]._node != nullptr) {
-            return &_buckets[*bucket_idx];
-        }
-    }
-
-    *bucket_idx = -1;
-    return NULL;
-}
-
-inline void HashTable::insert_impl(TupleRow* row) {
-    bool has_null = eval_build_row(row);
-
-    if (!_stores_nulls && has_null) {
-        return;
-    }
-
-    uint32_t hash = hash_current_row();
-    int64_t bucket_idx = hash & (_num_buckets - 1);
-
-    if (_current_used == _current_capacity) {
-        grow_node_array();
-    }
-    // get a node from memory pool
-    Node* node = reinterpret_cast<Node*>(_current_nodes + _node_byte_size * _current_used++);
-
-    TupleRow* data = node->data();
-    node->_hash = hash;
-    memcpy(data, row, sizeof(Tuple*) * _num_build_tuples);
-    add_to_bucket(&_buckets[bucket_idx], node);
-    ++_num_nodes;
-}
-
-inline void HashTable::add_to_bucket(Bucket* bucket, Node* node) {
-    if (bucket->_node == nullptr) {
-        ++_num_filled_buckets;
-    }
-
-    node->_next = bucket->_node;
-    bucket->_node = node;
-    bucket->_size++;
-}
-
-inline void HashTable::move_node(Bucket* from_bucket, Bucket* to_bucket, Node* node,
-                                 Node* previous_node) {
-    Node* next_node = node->_next;
-    from_bucket->_size--;
-
-    if (previous_node != NULL) {
-        previous_node->_next = next_node;
-    } else {
-        // Update bucket directly
-        from_bucket->_node = next_node;
-
-        if (next_node == nullptr) {
-            --_num_filled_buckets;
-        }
-    }
-
-    add_to_bucket(to_bucket, node);
-}
-
-inline std::pair<int64_t, int64_t> HashTable::minmax_node() {
-    bool has_value = false;
-    int64_t min_size = std::numeric_limits<int64_t>::max();
-    int64_t max_size = std::numeric_limits<int64_t>::min();
-    for (const auto bucket : _buckets) {
-        int64_t counter = bucket._size;
-        if (counter > 0) {
-            has_value = true;
-            min_size = std::min(counter, min_size);
-            max_size = std::max(counter, max_size);
-        }
-    }
-    if (!has_value) {
-        return std::make_pair(0, 0);
-    }
-    return std::make_pair(min_size, max_size);
-}
-
-template <bool check_match>
-inline void HashTable::Iterator::next() {
-    if (_bucket_idx == -1) {
-        return;
-    }
-
-    // TODO: this should prefetch the next tuplerow
-    Node* node = _node;
-
-    // Iterator is not from a full table scan, evaluate equality now.  Only the current
-    // bucket needs to be scanned. '_expr_values_buffer' contains the results
-    // for the current probe row.
-    if (check_match) {
-        // TODO: this should prefetch the next node
-        Node* next_node = node->_next;
-
-        while (next_node != nullptr) {
-            node = next_node;
-
-            if (node->_hash == _scan_hash && _table->equals(node->data())) {
-                _node = next_node;
-                return;
-            }
-
-            next_node = node->_next;
-        }
-
-        *this = _table->end();
-    } else {
-        // Move onto the next chained node
-        if (node->_next != nullptr) {
-            _node = node->_next;
-            return;
-        }
-
-        // Move onto the next bucket
-        Bucket* bucket = _table->next_bucket(&_bucket_idx);
-
-        if (bucket == NULL) {
-            _bucket_idx = -1;
-            _node = nullptr;
-        } else {
-            _node = bucket->_node;
-        }
-    }
-}
-
-} // namespace doris
-
-#endif
diff --git a/be/src/exec/intersect_node.cpp b/be/src/exec/intersect_node.cpp
index 2f218ca399..3aac0adfd7 100644
--- a/be/src/exec/intersect_node.cpp
+++ b/be/src/exec/intersect_node.cpp
@@ -17,7 +17,7 @@
 
 #include "exec/intersect_node.h"
 
-#include "exec/hash_table.hpp"
+#include "exec/hash_table.h"
 #include "exprs/expr.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
diff --git a/be/src/exec/json_scanner.cpp b/be/src/exec/json_scanner.cpp
index 5e7b8ba309..a7e5263b98 100644
--- a/be/src/exec/json_scanner.cpp
+++ b/be/src/exec/json_scanner.cpp
@@ -21,12 +21,8 @@
 
 #include <algorithm>
 
-#include "env/env.h"
 #include "exec/plain_text_line_reader.h"
-#include "exprs/expr.h"
 #include "exprs/json_functions.h"
-#include "gutil/strings/split.h"
-#include "io/buffered_reader.h"
 #include "io/file_factory.h"
 #include "runtime/exec_env.h"
 #include "runtime/runtime_state.h"
diff --git a/be/src/exec/json_scanner.h b/be/src/exec/json_scanner.h
index 981e242d96..c6787b0f77 100644
--- a/be/src/exec/json_scanner.h
+++ b/be/src/exec/json_scanner.h
@@ -35,11 +35,9 @@
 #include "gen_cpp/Types_types.h"
 #include "runtime/descriptors.h"
 #include "runtime/mem_pool.h"
-#include "runtime/small_file_mgr.h"
-#include "runtime/stream_load/load_stream_mgr.h"
+#include "runtime/stream_load/stream_load_pipe.h"
 #include "runtime/tuple.h"
 #include "util/runtime_profile.h"
-#include "util/slice.h"
 
 namespace doris {
 class Tuple;
diff --git a/be/src/exec/merge_node.h b/be/src/exec/merge_node.h
index 9b162d47fa..a25ea19867 100644
--- a/be/src/exec/merge_node.h
+++ b/be/src/exec/merge_node.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "exec/exec_node.h"
-#include "runtime/mem_pool.h"
 
 namespace doris {
 
diff --git a/be/src/exec/mysql_scan_node.cpp b/be/src/exec/mysql_scan_node.cpp
index cdd3682809..641c10a582 100644
--- a/be/src/exec/mysql_scan_node.cpp
+++ b/be/src/exec/mysql_scan_node.cpp
@@ -23,7 +23,6 @@
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.h"
 #include "runtime/tuple_row.h"
 #include "util/runtime_profile.h"
 
diff --git a/be/src/exec/odbc_connector.h b/be/src/exec/odbc_connector.h
index f2cc0f3a6f..f0634f9436 100644
--- a/be/src/exec/odbc_connector.h
+++ b/be/src/exec/odbc_connector.h
@@ -27,7 +27,6 @@
 
 #include "common/status.h"
 #include "exprs/expr_context.h"
-#include "gen_cpp/Types_types.h"
 #include "runtime/descriptors.h"
 #include "runtime/row_batch.h"
 
diff --git a/be/src/exec/odbc_scan_node.cpp b/be/src/exec/odbc_scan_node.cpp
index c2783abeac..8ea597b0f4 100644
--- a/be/src/exec/odbc_scan_node.cpp
+++ b/be/src/exec/odbc_scan_node.cpp
@@ -23,7 +23,6 @@
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.h"
 #include "runtime/tuple_row.h"
 #include "util/runtime_profile.h"
 
diff --git a/be/src/exec/olap_common.h b/be/src/exec/olap_common.h
index 70583e6bd8..9eb0e0a3b2 100644
--- a/be/src/exec/olap_common.h
+++ b/be/src/exec/olap_common.h
@@ -25,13 +25,8 @@
 #include <string>
 #include <variant>
 
-#include "common/logging.h"
 #include "exec/olap_utils.h"
-#include "exec/scan_node.h"
-#include "gen_cpp/PlanNodes_types.h"
 #include "olap/tuple.h"
-#include "runtime/descriptors.h"
-#include "runtime/string_value.hpp"
 #include "runtime/type_limit.h"
 
 namespace doris {
diff --git a/be/src/exec/olap_scan_node.cpp b/be/src/exec/olap_scan_node.cpp
index 5a621e5f06..94d3aacf4a 100644
--- a/be/src/exec/olap_scan_node.cpp
+++ b/be/src/exec/olap_scan_node.cpp
@@ -29,6 +29,7 @@
 #include "exprs/expr_context.h"
 #include "exprs/runtime_filter.h"
 #include "gen_cpp/PlanNodes_types.h"
+#include "olap/storage_engine.h"
 #include "runtime/exec_env.h"
 #include "runtime/large_int_value.h"
 #include "runtime/row_batch.h"
@@ -38,6 +39,7 @@
 #include "runtime/tuple_row.h"
 #include "util/priority_thread_pool.hpp"
 #include "util/runtime_profile.h"
+#include "util/thread.h"
 #include "util/to_string.h"
 
 namespace doris {
diff --git a/be/src/exec/olap_scan_node.h b/be/src/exec/olap_scan_node.h
index 8a9f755cfe..d3883fdfc7 100644
--- a/be/src/exec/olap_scan_node.h
+++ b/be/src/exec/olap_scan_node.h
@@ -27,12 +27,9 @@
 #include "exprs/bloomfilter_predicate.h"
 #include "exprs/in_predicate.h"
 #include "runtime/descriptors.h"
-#include "runtime/row_batch_interface.hpp"
-#include "runtime/vectorized_row_batch.h"
 #include "util/progress_updater.h"
 #include "util/spinlock.h"
 #include "vec/exec/volap_scanner.h"
-#include "vec/exprs/vexpr.h"
 
 namespace doris {
 class IRuntimeFilter;
diff --git a/be/src/exec/olap_scanner.cpp b/be/src/exec/olap_scanner.cpp
index da506d84db..69d23f5219 100644
--- a/be/src/exec/olap_scanner.cpp
+++ b/be/src/exec/olap_scanner.cpp
@@ -23,19 +23,19 @@
 #include "exprs/expr_context.h"
 #include "gen_cpp/PaloInternalService_types.h"
 #include "olap/decimal12.h"
-#include "olap/field.h"
+#include "olap/storage_engine.h"
 #include "olap/uint24.h"
 #include "olap_scan_node.h"
 #include "olap_utils.h"
 #include "runtime/descriptors.h"
 #include "runtime/mem_pool.h"
 #include "runtime/mem_tracker.h"
+#include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "runtime/thread_context.h"
 #include "service/backend_options.h"
 #include "util/doris_metrics.h"
 #include "util/mem_util.hpp"
-#include "util/network_util.h"
 
 namespace doris {
 
diff --git a/be/src/exec/olap_scanner.h b/be/src/exec/olap_scanner.h
index a00bbccb8f..92b8c07205 100644
--- a/be/src/exec/olap_scanner.h
+++ b/be/src/exec/olap_scanner.h
@@ -27,17 +27,11 @@
 #include "exec/exec_node.h"
 #include "exec/olap_utils.h"
 #include "exprs/bloomfilter_predicate.h"
-#include "exprs/expr.h"
 #include "gen_cpp/PaloInternalService_types.h"
 #include "gen_cpp/PlanNodes_types.h"
-#include "olap/delete_handler.h"
-#include "olap/olap_cond.h"
-#include "olap/rowset/column_data.h"
-#include "olap/storage_engine.h"
 #include "olap/tuple_reader.h"
 #include "runtime/descriptors.h"
 #include "runtime/tuple.h"
-#include "runtime/vectorized_row_batch.h"
 
 namespace doris {
 
diff --git a/be/src/exec/orc_scanner.cpp b/be/src/exec/orc_scanner.cpp
index c20aef7d05..549132cb17 100644
--- a/be/src/exec/orc_scanner.cpp
+++ b/be/src/exec/orc_scanner.cpp
@@ -17,11 +17,8 @@
 
 #include "exec/orc_scanner.h"
 
-#include "io/buffered_reader.h"
 #include "io/file_factory.h"
-#include "io/local_file_reader.h"
 #include "runtime/exec_env.h"
-#include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
 #include "runtime/tuple.h"
 
diff --git a/be/src/exec/parquet_scanner.cpp b/be/src/exec/parquet_scanner.cpp
index a47e965de5..81d81656d3 100644
--- a/be/src/exec/parquet_scanner.cpp
+++ b/be/src/exec/parquet_scanner.cpp
@@ -18,18 +18,10 @@
 #include "exec/parquet_scanner.h"
 
 #include "exec/arrow/parquet_reader.h"
-#include "exec/decompressor.h"
-#include "exec/text_converter.h"
-#include "exec/text_converter.hpp"
-#include "exprs/expr.h"
-#include "io/buffered_reader.h"
 #include "io/file_factory.h"
 #include "runtime/descriptors.h"
 #include "runtime/exec_env.h"
-#include "runtime/raw_value.h"
-#include "runtime/stream_load/load_stream_mgr.h"
 #include "runtime/stream_load/stream_load_pipe.h"
-#include "runtime/tuple.h"
 
 namespace doris {
 
diff --git a/be/src/exec/parquet_writer.cpp b/be/src/exec/parquet_writer.cpp
index 5f1da82469..1f316a473e 100644
--- a/be/src/exec/parquet_writer.cpp
+++ b/be/src/exec/parquet_writer.cpp
@@ -21,17 +21,8 @@
 #include <arrow/status.h>
 #include <time.h>
 
-#include "common/logging.h"
-#include "gen_cpp/PaloBrokerService_types.h"
-#include "gen_cpp/TPaloBrokerService.h"
 #include "io/file_writer.h"
-#include "runtime/broker_mgr.h"
-#include "runtime/client_cache.h"
-#include "runtime/descriptors.h"
-#include "runtime/exec_env.h"
-#include "runtime/mem_pool.h"
 #include "util/mysql_global.h"
-#include "util/thrift_util.h"
 #include "util/types.h"
 
 namespace doris {
diff --git a/be/src/exec/parquet_writer.h b/be/src/exec/parquet_writer.h
index c076aed941..0698b8d491 100644
--- a/be/src/exec/parquet_writer.h
+++ b/be/src/exec/parquet_writer.h
@@ -34,11 +34,7 @@
 
 #include "common/status.h"
 #include "exprs/expr_context.h"
-#include "gen_cpp/PaloBrokerService_types.h"
-#include "gen_cpp/PlanNodes_types.h"
-#include "gen_cpp/Types_types.h"
 #include "runtime/row_batch.h"
-#include "runtime/tuple.h"
 
 namespace doris {
 class FileWriter;
diff --git a/be/src/exec/partitioned_aggregation_node.cc b/be/src/exec/partitioned_aggregation_node.cc
index a99b0da23b..9bd0d7dd1e 100644
--- a/be/src/exec/partitioned_aggregation_node.cc
+++ b/be/src/exec/partitioned_aggregation_node.cc
@@ -28,10 +28,8 @@
 
 #include "exec/partitioned_hash_table.h"
 #include "exec/partitioned_hash_table.inline.h"
-#include "exprs/anyval_util.h"
 #include "exprs/expr_context.h"
 #include "exprs/new_agg_fn_evaluator.h"
-// #include "exprs/scalar_expr_evaluator.h"
 #include "exprs/slot_ref.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "gutil/strings/substitute.h"
@@ -46,7 +44,6 @@
 #include "runtime/string_value.h"
 #include "runtime/tuple.h"
 #include "runtime/tuple_row.h"
-#include "udf/udf_internal.h"
 
 using namespace strings;
 
diff --git a/be/src/exec/partitioned_aggregation_node.h b/be/src/exec/partitioned_aggregation_node.h
index 847c96a8a3..c4f95d5036 100644
--- a/be/src/exec/partitioned_aggregation_node.h
+++ b/be/src/exec/partitioned_aggregation_node.h
@@ -28,7 +28,6 @@
 #include "runtime/bufferpool/suballocator.h"
 #include "runtime/descriptors.h" // for TupleId
 #include "runtime/mem_pool.h"
-#include "runtime/string_value.h"
 
 namespace doris {
 
diff --git a/be/src/exec/partitioned_hash_table.cc b/be/src/exec/partitioned_hash_table.cc
index d27f562cb2..712f4fa4d2 100644
--- a/be/src/exec/partitioned_hash_table.cc
+++ b/be/src/exec/partitioned_hash_table.cc
@@ -27,13 +27,10 @@
 #include "exec/partitioned_hash_table.inline.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
-#include "exprs/slot_ref.h"
-#include "runtime/bufferpool/reservation_tracker.h"
 #include "runtime/mem_tracker.h"
 #include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
-#include "util/doris_metrics.h"
 
 using namespace doris;
 using namespace strings;
diff --git a/be/src/exec/partitioned_hash_table.h b/be/src/exec/partitioned_hash_table.h
index 514a592bf5..45f13a0d1f 100644
--- a/be/src/exec/partitioned_hash_table.h
+++ b/be/src/exec/partitioned_hash_table.h
@@ -24,14 +24,10 @@
 #include <vector>
 
 #include "common/compiler_util.h"
-#include "common/logging.h"
 #include "runtime/buffered_tuple_stream3.h"
-#include "runtime/buffered_tuple_stream3.inline.h"
-#include "runtime/bufferpool/buffer_pool.h"
 #include "runtime/bufferpool/suballocator.h"
 #include "runtime/tuple_row.h"
 #include "util/bitmap.h"
-#include "util/hash_util.hpp"
 
 namespace doris {
 
diff --git a/be/src/exec/partitioned_hash_table.inline.h b/be/src/exec/partitioned_hash_table.inline.h
index 7b5ef02f00..1f789ce821 100644
--- a/be/src/exec/partitioned_hash_table.inline.h
+++ b/be/src/exec/partitioned_hash_table.inline.h
@@ -21,8 +21,6 @@
 #pragma once
 
 #include "exec/partitioned_hash_table.h"
-#include "exprs/expr.h"
-#include "exprs/expr_context.h"
 
 namespace doris {
 
diff --git a/be/src/exec/read_write_util.h b/be/src/exec/read_write_util.h
index e87827bb49..f160949cab 100644
--- a/be/src/exec/read_write_util.h
+++ b/be/src/exec/read_write_util.h
@@ -19,7 +19,6 @@
 
 #include <sstream>
 
-#include "common/logging.h"
 #include "common/status.h"
 
 namespace doris {
diff --git a/be/src/exec/repeat_node.cpp b/be/src/exec/repeat_node.cpp
index 086ff64a9e..23e7bf299f 100644
--- a/be/src/exec/repeat_node.cpp
+++ b/be/src/exec/repeat_node.cpp
@@ -17,11 +17,12 @@
 
 #include "exec/repeat_node.h"
 
-#include "exprs/expr.h"
 #include "gutil/strings/join.h"
 #include "runtime/raw_value.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
+#include "runtime/tuple.h"
+#include "runtime/tuple_row.h"
 #include "util/runtime_profile.h"
 
 namespace doris {
diff --git a/be/src/exec/row_batch_list.h b/be/src/exec/row_batch_list.h
index 43bc5963de..a81f0aae86 100644
--- a/be/src/exec/row_batch_list.h
+++ b/be/src/exec/row_batch_list.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 
-#include "common/logging.h"
 #include "runtime/row_batch.h"
 #include "runtime/tuple_row.h"
 
diff --git a/be/src/exec/scan_node.h b/be/src/exec/scan_node.h
index e4b4a58d30..17a14b8b08 100644
--- a/be/src/exec/scan_node.h
+++ b/be/src/exec/scan_node.h
@@ -25,7 +25,6 @@
 #include "exec/exec_node.h"
 #include "gen_cpp/PaloInternalService_types.h"
 #include "util/runtime_profile.h"
-#include "vec/exprs/vexpr.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scan_node.cpp b/be/src/exec/schema_scan_node.cpp
index b689154274..befb694a13 100644
--- a/be/src/exec/schema_scan_node.cpp
+++ b/be/src/exec/schema_scan_node.cpp
@@ -17,13 +17,10 @@
 
 #include "schema_scan_node.h"
 
-#include "exec/schema_scanner/schema_helper.h"
-#include "exec/text_converter.hpp"
 #include "gen_cpp/PlanNodes_types.h"
 #include "gen_cpp/Types_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.h"
 #include "runtime/tuple_row.h"
 #include "util/runtime_profile.h"
 #include "util/string_util.h"
diff --git a/be/src/exec/schema_scan_node.h b/be/src/exec/schema_scan_node.h
index 46cdfc707e..2b7b780ad9 100644
--- a/be/src/exec/schema_scan_node.h
+++ b/be/src/exec/schema_scan_node.h
@@ -19,7 +19,6 @@
 
 #include "exec/scan_node.h"
 #include "exec/schema_scanner.h"
-#include "gen_cpp/Descriptors_types.h"
 #include "runtime/descriptors.h"
 
 namespace doris {
diff --git a/be/src/exec/schema_scanner.cpp b/be/src/exec/schema_scanner.cpp
index a5c084d058..82831a70d2 100644
--- a/be/src/exec/schema_scanner.cpp
+++ b/be/src/exec/schema_scanner.cpp
@@ -25,7 +25,6 @@
 #include "exec/schema_scanner/schema_partitions_scanner.h"
 #include "exec/schema_scanner/schema_schema_privileges_scanner.h"
 #include "exec/schema_scanner/schema_schemata_scanner.h"
-#include "exec/schema_scanner/schema_statistics_scanner.h"
 #include "exec/schema_scanner/schema_table_privileges_scanner.h"
 #include "exec/schema_scanner/schema_tables_scanner.h"
 #include "exec/schema_scanner/schema_user_privileges_scanner.h"
diff --git a/be/src/exec/schema_scanner/schema_charsets_scanner.h b/be/src/exec/schema_scanner/schema_charsets_scanner.h
index a95292c710..3a9f07100a 100644
--- a/be/src/exec/schema_scanner/schema_charsets_scanner.h
+++ b/be/src/exec/schema_scanner/schema_charsets_scanner.h
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include "exec/schema_scanner.h"
-#include "gen_cpp/FrontendService_types.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_collations_scanner.h b/be/src/exec/schema_scanner/schema_collations_scanner.h
index 3378aa700c..66e3faeed3 100644
--- a/be/src/exec/schema_scanner/schema_collations_scanner.h
+++ b/be/src/exec/schema_scanner/schema_collations_scanner.h
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include "exec/schema_scanner.h"
-#include "gen_cpp/FrontendService_types.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_columns_scanner.cpp b/be/src/exec/schema_scanner/schema_columns_scanner.cpp
index 390a0af5bc..bac45b4ab3 100644
--- a/be/src/exec/schema_scanner/schema_columns_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_columns_scanner.cpp
@@ -20,7 +20,6 @@
 #include <sstream>
 
 #include "exec/schema_scanner/schema_helper.h"
-#include "runtime/datetime_value.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
 
diff --git a/be/src/exec/schema_scanner/schema_dummy_scanner.cpp b/be/src/exec/schema_scanner/schema_dummy_scanner.cpp
index 1319a5d21d..5fb37d2a38 100644
--- a/be/src/exec/schema_scanner/schema_dummy_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_dummy_scanner.cpp
@@ -17,9 +17,6 @@
 
 #include "schema_dummy_scanner.h"
 
-#include "runtime/primitive_type.h"
-#include "runtime/string_value.h"
-
 namespace doris {
 
 SchemaScanner::ColumnDesc SchemaDummyScanner::_s_dummy_columns[] = {};
diff --git a/be/src/exec/schema_scanner/schema_dummy_scanner.h b/be/src/exec/schema_scanner/schema_dummy_scanner.h
index 0e5d19acc6..e48cb4d808 100644
--- a/be/src/exec/schema_scanner/schema_dummy_scanner.h
+++ b/be/src/exec/schema_scanner/schema_dummy_scanner.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "exec/schema_scanner.h"
-#include "gen_cpp/FrontendService_types.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_helper.cpp b/be/src/exec/schema_scanner/schema_helper.cpp
index f59cc00eda..d31edd0da3 100644
--- a/be/src/exec/schema_scanner/schema_helper.cpp
+++ b/be/src/exec/schema_scanner/schema_helper.cpp
@@ -20,21 +20,10 @@
 #include <sstream>
 #include <thread>
 
-#include "exec/text_converter.hpp"
 #include "gen_cpp/FrontendService.h"
 #include "gen_cpp/FrontendService_types.h"
-#include "gen_cpp/PlanNodes_types.h"
 #include "runtime/client_cache.h"
-#include "runtime/exec_env.h"
-#include "runtime/row_batch.h"
-#include "runtime/runtime_state.h"
-#include "runtime/string_value.h"
-#include "runtime/tuple_row.h"
-#include "util/debug_util.h"
-#include "util/network_util.h"
-#include "util/runtime_profile.h"
 #include "util/thrift_rpc_helper.h"
-#include "util/thrift_util.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_schema_privileges_scanner.cpp b/be/src/exec/schema_scanner/schema_schema_privileges_scanner.cpp
index f6756912e6..196f796d36 100644
--- a/be/src/exec/schema_scanner/schema_schema_privileges_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_schema_privileges_scanner.cpp
@@ -20,7 +20,6 @@
 #include "exec/schema_scanner/schema_helper.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
-//#include "runtime/datetime_value.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_statistics_scanner.h b/be/src/exec/schema_scanner/schema_statistics_scanner.h
index cbf968be4a..7953a57987 100644
--- a/be/src/exec/schema_scanner/schema_statistics_scanner.h
+++ b/be/src/exec/schema_scanner/schema_statistics_scanner.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "exec/schema_scanner.h"
-#include "gen_cpp/FrontendService_types.h"
 
 namespace doris {
 class SchemaStatisticsScanner : public SchemaScanner {
diff --git a/be/src/exec/schema_scanner/schema_table_privileges_scanner.cpp b/be/src/exec/schema_scanner/schema_table_privileges_scanner.cpp
index 132114bd2c..372e721c28 100644
--- a/be/src/exec/schema_scanner/schema_table_privileges_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_table_privileges_scanner.cpp
@@ -20,7 +20,6 @@
 #include "exec/schema_scanner/schema_helper.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
-//#include "runtime/datetime_value.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_tables_scanner.cpp b/be/src/exec/schema_scanner/schema_tables_scanner.cpp
index 8e391165a5..580e6cbc41 100644
--- a/be/src/exec/schema_scanner/schema_tables_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_tables_scanner.cpp
@@ -20,6 +20,7 @@
 #include "exec/schema_scanner/schema_helper.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
+
 namespace doris {
 
 SchemaScanner::ColumnDesc SchemaTablesScanner::_s_tbls_columns[] = {
diff --git a/be/src/exec/schema_scanner/schema_user_privileges_scanner.cpp b/be/src/exec/schema_scanner/schema_user_privileges_scanner.cpp
index 1d931c8bab..533311319e 100644
--- a/be/src/exec/schema_scanner/schema_user_privileges_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_user_privileges_scanner.cpp
@@ -20,7 +20,6 @@
 #include "exec/schema_scanner/schema_helper.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
-//#include "runtime/datetime_value.h"
 
 namespace doris {
 
diff --git a/be/src/exec/schema_scanner/schema_views_scanner.cpp b/be/src/exec/schema_scanner/schema_views_scanner.cpp
index 52d7148e06..b48948716b 100644
--- a/be/src/exec/schema_scanner/schema_views_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_views_scanner.cpp
@@ -20,7 +20,6 @@
 #include "exec/schema_scanner/schema_helper.h"
 #include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
-//#include "runtime/datetime_value.h"
 
 namespace doris {
 
diff --git a/be/src/exec/select_node.cpp b/be/src/exec/select_node.cpp
index c21d6bc9ba..a0c8cebb84 100644
--- a/be/src/exec/select_node.cpp
+++ b/be/src/exec/select_node.cpp
@@ -22,7 +22,6 @@
 
 #include "exprs/expr.h"
 #include "gen_cpp/PlanNodes_types.h"
-#include "runtime/raw_value.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 
diff --git a/be/src/exec/select_node.h b/be/src/exec/select_node.h
index e20dc6117d..cf4a871fe6 100644
--- a/be/src/exec/select_node.h
+++ b/be/src/exec/select_node.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "exec/exec_node.h"
-#include "runtime/mem_pool.h"
 
 namespace doris {
 
diff --git a/be/src/exec/set_operation_node.cpp b/be/src/exec/set_operation_node.cpp
index 6d0ee3676d..b5ed4b0133 100644
--- a/be/src/exec/set_operation_node.cpp
+++ b/be/src/exec/set_operation_node.cpp
@@ -17,7 +17,6 @@
 
 #include "exec/set_operation_node.h"
 
-#include "exec/hash_table.hpp"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
 #include "runtime/raw_value.h"
diff --git a/be/src/exec/spill_sort_node.cc b/be/src/exec/spill_sort_node.cc
index c71deb5bac..32f1217e5b 100644
--- a/be/src/exec/spill_sort_node.cc
+++ b/be/src/exec/spill_sort_node.cc
@@ -20,8 +20,6 @@
 #include "exec/sort_exec_exprs.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
-#include "runtime/sorted_run_merger.h"
-#include "util/debug_util.h"
 
 namespace doris {
 
diff --git a/be/src/exec/spill_sort_node.h b/be/src/exec/spill_sort_node.h
index dc4832fc7c..4633c4748a 100644
--- a/be/src/exec/spill_sort_node.h
+++ b/be/src/exec/spill_sort_node.h
@@ -19,7 +19,6 @@
 
 #include "exec/exec_node.h"
 #include "exec/sort_exec_exprs.h"
-#include "runtime/buffered_block_mgr2.h"
 #include "runtime/spill_sorter.h"
 
 namespace doris {
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index c15f303200..a718fa0475 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -25,14 +25,12 @@
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
 #include "olap/hll.h"
-#include "olap/olap_define.h"
 #include "runtime/exec_env.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "runtime/thread_context.h"
 #include "runtime/tuple_row.h"
 #include "service/backend_options.h"
-#include "service/brpc.h"
 #include "util/brpc_client_cache.h"
 #include "util/debug/sanitizer_scopes.h"
 #include "util/defer_op.h"
@@ -40,7 +38,6 @@
 #include "util/threadpool.h"
 #include "util/time.h"
 #include "util/uid_util.h"
-#include "vec/core/block.h"
 #include "vec/sink/vtablet_sink.h"
 
 namespace doris {
diff --git a/be/src/exec/tablet_sink.h b/be/src/exec/tablet_sink.h
index d797a1b80c..ad691cfc48 100644
--- a/be/src/exec/tablet_sink.h
+++ b/be/src/exec/tablet_sink.h
@@ -39,7 +39,6 @@
 #include "util/ref_count_closure.h"
 #include "util/spinlock.h"
 #include "util/thread.h"
-#include "util/thrift_util.h"
 
 namespace doris {
 
diff --git a/be/src/exec/text_converter.cpp b/be/src/exec/text_converter.cpp
index e2d37d536a..5fac00569c 100644
--- a/be/src/exec/text_converter.cpp
+++ b/be/src/exec/text_converter.cpp
@@ -19,12 +19,8 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "runtime/descriptors.h"
 #include "runtime/mem_pool.h"
-#include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
-#include "runtime/tuple.h"
-#include "util/string_parser.hpp"
 
 namespace doris {
 
diff --git a/be/src/exec/text_converter.h b/be/src/exec/text_converter.h
index 0f0f871e19..b729d2012d 100644
--- a/be/src/exec/text_converter.h
+++ b/be/src/exec/text_converter.h
@@ -17,9 +17,7 @@
 
 #pragma once
 
-#include "runtime/runtime_state.h"
-#include "vec/core/block.h"
-
+#include "vec/columns/column.h"
 namespace doris {
 
 class MemPool;
diff --git a/be/src/exec/text_converter.hpp b/be/src/exec/text_converter.hpp
index 0d4c5af788..0d6297f501 100644
--- a/be/src/exec/text_converter.hpp
+++ b/be/src/exec/text_converter.hpp
@@ -32,6 +32,7 @@
 #include "util/string_parser.hpp"
 #include "util/types.h"
 #include "vec/columns/column_complex.h"
+#include "vec/columns/column_nullable.h"
 #include "vec/runtime/vdatetime_value.h"
 
 namespace doris {
diff --git a/be/src/exec/topn_node.cpp b/be/src/exec/topn_node.cpp
index 73ad4410a1..e9494ec102 100644
--- a/be/src/exec/topn_node.cpp
+++ b/be/src/exec/topn_node.cpp
@@ -23,11 +23,9 @@
 #include <sstream>
 
 #include "exprs/expr.h"
-#include "gen_cpp/Exprs_types.h"
 #include "gen_cpp/PlanNodes_types.h"
 #include "runtime/descriptors.h"
 #include "runtime/mem_pool.h"
-#include "runtime/raw_value.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "runtime/tuple.h"
diff --git a/be/src/exec/union_node.cpp b/be/src/exec/union_node.cpp
index f71135f3ca..2de9ff0fd3 100644
--- a/be/src/exec/union_node.cpp
+++ b/be/src/exec/union_node.cpp
@@ -22,12 +22,11 @@
 
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
+#include "gen_cpp/PlanNodes_types.h"
 #include "runtime/row_batch.h"
 #include "runtime/runtime_state.h"
 #include "runtime/tuple.h"
 #include "runtime/tuple_row.h"
-// #include "util/runtime_profile_counters.h"
-#include "gen_cpp/PlanNodes_types.h"
 #include "util/runtime_profile.h"
 
 namespace doris {
diff --git a/be/src/exprs/agg_fn_evaluator.cpp b/be/src/exprs/agg_fn_evaluator.cpp
index 966e115431..9c9d6f4eeb 100644
--- a/be/src/exprs/agg_fn_evaluator.cpp
+++ b/be/src/exprs/agg_fn_evaluator.cpp
@@ -33,15 +33,12 @@
 
 #include <sstream>
 
-#include "common/logging.h"
-#include "exprs/aggregate_functions.h"
 #include "exprs/anyval_util.h"
 #include "runtime/datetime_value.h"
 #include "runtime/mem_tracker.h"
 #include "runtime/raw_value.h"
 #include "runtime/user_function_cache.h"
 #include "udf/udf_internal.h"
-#include "util/debug_util.h"
 
 namespace doris {
 using doris_udf::FunctionContext;
diff --git a/be/src/exprs/agg_fn_evaluator.h b/be/src/exprs/agg_fn_evaluator.h
index 10e450d504..af864b14d3 100644
--- a/be/src/exprs/agg_fn_evaluator.h
+++ b/be/src/exprs/agg_fn_evaluator.h
@@ -30,7 +30,7 @@
 #include "runtime/runtime_state.h"
 #include "runtime/tuple.h"
 #include "udf/udf.h"
-#include "util/hash_util.hpp"
+#include "udf/udf_internal.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/aggregate_functions.cpp b/be/src/exprs/aggregate_functions.cpp
index c1c0c2d90a..992bd42b74 100644
--- a/be/src/exprs/aggregate_functions.cpp
+++ b/be/src/exprs/aggregate_functions.cpp
@@ -29,12 +29,12 @@
 #include "common/logging.h"
 #include "exprs/anyval_util.h"
 #include "exprs/hybrid_set.h"
+#include "olap/hll.h"
 #include "runtime/datetime_value.h"
 #include "runtime/decimalv2_value.h"
-#include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
+#include "udf/udf_internal.h"
 #include "util/counts.h"
-#include "util/debug_util.h"
 #include "util/tdigest.h"
 
 // TODO: this file should be cross compiled and then all of the builtin
diff --git a/be/src/exprs/aggregate_functions.h b/be/src/exprs/aggregate_functions.h
index b1d6062563..ba283578e9 100644
--- a/be/src/exprs/aggregate_functions.h
+++ b/be/src/exprs/aggregate_functions.h
@@ -20,9 +20,7 @@
 
 #pragma once
 
-#include "olap/hll.h"
 #include "udf/udf.h"
-#include "udf/udf_internal.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/arithmetic_expr.cpp b/be/src/exprs/arithmetic_expr.cpp
index 23668805a6..cc39140ce7 100644
--- a/be/src/exprs/arithmetic_expr.cpp
+++ b/be/src/exprs/arithmetic_expr.cpp
@@ -17,8 +17,6 @@
 
 #include "exprs/arithmetic_expr.h"
 
-#include "runtime/runtime_state.h"
-
 namespace doris {
 
 std::set<std::string> ArithmeticExpr::_s_valid_fn_names = {
diff --git a/be/src/exprs/array_functions.cpp b/be/src/exprs/array_functions.cpp
index be9f151b22..32a1639af7 100644
--- a/be/src/exprs/array_functions.cpp
+++ b/be/src/exprs/array_functions.cpp
@@ -17,7 +17,6 @@
 
 #include "exprs/array_functions.h"
 
-#include "common/logging.h"
 #include "runtime/collection_value.h"
 
 namespace doris {
diff --git a/be/src/exprs/array_functions.h b/be/src/exprs/array_functions.h
index b2cf2a010d..7bceebf429 100644
--- a/be/src/exprs/array_functions.h
+++ b/be/src/exprs/array_functions.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "anyval_util.h"
+#include "udf/udf.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/binary_predicate.cpp b/be/src/exprs/binary_predicate.cpp
index ef772cbc98..ac815b67ac 100644
--- a/be/src/exprs/binary_predicate.cpp
+++ b/be/src/exprs/binary_predicate.cpp
@@ -20,11 +20,8 @@
 #include <sstream>
 
 #include "gen_cpp/Exprs_types.h"
-#include "runtime/datetime_value.h"
 #include "runtime/decimalv2_value.h"
-#include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
-#include "util/debug_util.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/block_bloom_filter.hpp b/be/src/exprs/block_bloom_filter.hpp
index c683f2c40a..e1d64013af 100644
--- a/be/src/exprs/block_bloom_filter.hpp
+++ b/be/src/exprs/block_bloom_filter.hpp
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "common/status.h"
-#include "fmt/format.h"
 #include "gutil/macros.h"
 #include "util/hash_util.hpp"
 #include "util/slice.h"
diff --git a/be/src/exprs/bloomfilter_predicate.cpp b/be/src/exprs/bloomfilter_predicate.cpp
index 1ce5acd1f5..26cd7a209b 100644
--- a/be/src/exprs/bloomfilter_predicate.cpp
+++ b/be/src/exprs/bloomfilter_predicate.cpp
@@ -19,11 +19,8 @@
 
 #include <sstream>
 
-#include "exprs/anyval_util.h"
 #include "exprs/expr_context.h"
-#include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/bloomfilter_predicate.h b/be/src/exprs/bloomfilter_predicate.h
index e2e0b27ea3..d9e8c8b34e 100644
--- a/be/src/exprs/bloomfilter_predicate.h
+++ b/be/src/exprs/bloomfilter_predicate.h
@@ -25,12 +25,10 @@
 #include "common/object_pool.h"
 #include "exprs/block_bloom_filter.hpp"
 #include "exprs/predicate.h"
-#include "olap/bloom_filter.hpp"
 #include "olap/decimal12.h"
 #include "olap/rowset/segment_v2/bloom_filter.h"
 #include "olap/uint24.h"
 #include "runtime/mem_tracker.h"
-#include "runtime/raw_value.h"
 
 namespace doris {
 namespace detail {
diff --git a/be/src/exprs/cast_expr.cpp b/be/src/exprs/cast_expr.cpp
index 2393fa8895..eaed69faed 100644
--- a/be/src/exprs/cast_expr.cpp
+++ b/be/src/exprs/cast_expr.cpp
@@ -20,8 +20,6 @@
 
 #include "exprs/cast_expr.h"
 
-#include "runtime/runtime_state.h"
-
 namespace doris {
 
 Expr* CastExpr::from_thrift(const TExprNode& node) {
diff --git a/be/src/exprs/compound_predicate.cpp b/be/src/exprs/compound_predicate.cpp
index 63fb04ad89..e4d5cbb213 100644
--- a/be/src/exprs/compound_predicate.cpp
+++ b/be/src/exprs/compound_predicate.cpp
@@ -22,9 +22,6 @@
 
 #include <sstream>
 
-#include "runtime/runtime_state.h"
-#include "util/debug_util.h"
-
 namespace doris {
 
 CompoundPredicate::CompoundPredicate(const TExprNode& node) : Predicate(node) {}
diff --git a/be/src/exprs/conditional_functions.cpp b/be/src/exprs/conditional_functions.cpp
index 89233277b5..7c76c20525 100644
--- a/be/src/exprs/conditional_functions.cpp
+++ b/be/src/exprs/conditional_functions.cpp
@@ -21,7 +21,6 @@
 #include "exprs/conditional_functions.h"
 
 #include "exprs/anyval_util.h"
-#include "exprs/case_expr.h"
 #include "exprs/expr.h"
 #include "runtime/tuple_row.h"
 #include "udf/udf.h"
diff --git a/be/src/exprs/decimalv2_operators.cpp b/be/src/exprs/decimalv2_operators.cpp
index 94747e6d43..f56d130d30 100644
--- a/be/src/exprs/decimalv2_operators.cpp
+++ b/be/src/exprs/decimalv2_operators.cpp
@@ -23,11 +23,6 @@
 #include <sstream>
 
 #include "exprs/anyval_util.h"
-#include "exprs/case_expr.h"
-#include "exprs/expr.h"
-#include "runtime/tuple_row.h"
-// #include "util/decimal_util.h"
-#include "util/string_parser.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/decimalv2_operators.h b/be/src/exprs/decimalv2_operators.h
index f37b3d9473..a1f6c73950 100644
--- a/be/src/exprs/decimalv2_operators.h
+++ b/be/src/exprs/decimalv2_operators.h
@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 
-#include "runtime/decimalv2_value.h"
 #include "udf/udf.h"
 
 namespace doris {
diff --git a/be/src/exprs/encryption_functions.cpp b/be/src/exprs/encryption_functions.cpp
index a4d93b776f..9b462592c0 100644
--- a/be/src/exprs/encryption_functions.cpp
+++ b/be/src/exprs/encryption_functions.cpp
@@ -18,10 +18,6 @@
 #include "exprs/encryption_functions.h"
 
 #include "exprs/anyval_util.h"
-#include "exprs/expr.h"
-#include "runtime/string_value.h"
-#include "runtime/tuple_row.h"
-#include "util/debug_util.h"
 #include "util/md5.h"
 #include "util/sm3.h"
 #include "util/url_coding.h"
diff --git a/be/src/exprs/encryption_functions.h b/be/src/exprs/encryption_functions.h
index 4c946215ab..0083cb4c81 100644
--- a/be/src/exprs/encryption_functions.h
+++ b/be/src/exprs/encryption_functions.h
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include "udf/udf.h"
-#include "udf/udf_internal.h"
 #include "util/encryption_util.h"
 #include "util/string_util.h"
 
diff --git a/be/src/exprs/es_functions.cpp b/be/src/exprs/es_functions.cpp
index 06ca7a009d..4da1e19c0c 100644
--- a/be/src/exprs/es_functions.cpp
+++ b/be/src/exprs/es_functions.cpp
@@ -17,11 +17,6 @@
 
 #include "exprs/es_functions.h"
 
-#include "exprs/anyval_util.h"
-#include "exprs/expr.h"
-#include "runtime/tuple_row.h"
-#include "util/debug_util.h"
-
 namespace doris {
 
 void ESFunctions::init() {}
diff --git a/be/src/exprs/expr.h b/be/src/exprs/expr.h
index 7618aa41ab..4e95c53237 100644
--- a/be/src/exprs/expr.h
+++ b/be/src/exprs/expr.h
@@ -27,14 +27,8 @@
 #include "common/status.h"
 #include "exprs/expr_value.h"
 #include "gen_cpp/Opcodes_types.h"
-#include "runtime/datetime_value.h"
-#include "runtime/decimalv2_value.h"
 #include "runtime/descriptors.h"
-#include "runtime/string_value.h"
-#include "runtime/string_value.hpp"
-#include "runtime/tuple.h"
 #include "runtime/tuple_row.h"
-#include "runtime/types.h"
 #include "udf/udf.h"
 
 #undef USING_DORIS_UDF
diff --git a/be/src/exprs/expr_context.cpp b/be/src/exprs/expr_context.cpp
index 518a69d774..84a51ba619 100644
--- a/be/src/exprs/expr_context.cpp
+++ b/be/src/exprs/expr_context.cpp
@@ -33,8 +33,6 @@
 #include "runtime/runtime_state.h"
 #include "runtime/thread_context.h"
 #include "udf/udf_internal.h"
-#include "util/debug_util.h"
-#include "util/stack_util.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/expr_context.h b/be/src/exprs/expr_context.h
index a553a3006f..7fcb277bb0 100644
--- a/be/src/exprs/expr_context.h
+++ b/be/src/exprs/expr_context.h
@@ -27,7 +27,6 @@
 #include "exprs/expr_value.h"
 #include "exprs/slot_ref.h"
 #include "udf/udf.h"
-#include "udf/udf_internal.h" // for CollectionVal
 
 #undef USING_DORIS_UDF
 #define USING_DORIS_UDF using namespace doris_udf
diff --git a/be/src/exprs/expr_value.h b/be/src/exprs/expr_value.h
index 99a0bd2198..ede221147e 100644
--- a/be/src/exprs/expr_value.h
+++ b/be/src/exprs/expr_value.h
@@ -24,7 +24,6 @@
 #include "runtime/datetime_value.h"
 #include "runtime/decimalv2_value.h"
 #include "runtime/string_value.h"
-#include "runtime/string_value.hpp"
 #include "runtime/types.h"
 
 namespace doris {
diff --git a/be/src/exprs/hll_hash_function.cpp b/be/src/exprs/hll_hash_function.cpp
index 79f699e82b..06247435ed 100644
--- a/be/src/exprs/hll_hash_function.cpp
+++ b/be/src/exprs/hll_hash_function.cpp
@@ -18,6 +18,9 @@
 #include "exprs/hll_hash_function.h"
 
 #include "exprs/aggregate_functions.h"
+#include "exprs/anyval_util.h"
+#include "olap/hll.h"
+#include "util/hash_util.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/hll_hash_function.h b/be/src/exprs/hll_hash_function.h
index 4f2c1b3afe..8e8e8db486 100644
--- a/be/src/exprs/hll_hash_function.h
+++ b/be/src/exprs/hll_hash_function.h
@@ -17,9 +17,7 @@
 
 #pragma once
 
-#include "exprs/anyval_util.h"
 #include "udf/udf.h"
-#include "util/hash_util.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/hybrid_map.h b/be/src/exprs/hybrid_map.h
index 27652b63f3..0f24744018 100644
--- a/be/src/exprs/hybrid_map.h
+++ b/be/src/exprs/hybrid_map.h
@@ -20,12 +20,9 @@
 #include <unordered_map>
 
 #include "common/object_pool.h"
-#include "common/status.h"
 #include "exprs/create_predicate_function.h"
 #include "exprs/hybrid_set.h"
-#include "runtime/datetime_value.h"
 #include "runtime/primitive_type.h"
-#include "runtime/string_value.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/hybrid_set.h b/be/src/exprs/hybrid_set.h
index 2f6da691f3..578c8d2e96 100644
--- a/be/src/exprs/hybrid_set.h
+++ b/be/src/exprs/hybrid_set.h
@@ -22,10 +22,7 @@
 #include <cstring>
 
 #include "common/object_pool.h"
-#include "common/status.h"
-#include "runtime/datetime_value.h"
 #include "runtime/decimalv2_value.h"
-#include "runtime/primitive_type.h"
 #include "runtime/string_value.h"
 
 namespace doris {
diff --git a/be/src/exprs/in_predicate.cpp b/be/src/exprs/in_predicate.cpp
index 8a99c92f7e..a0db24592b 100644
--- a/be/src/exprs/in_predicate.cpp
+++ b/be/src/exprs/in_predicate.cpp
@@ -22,11 +22,9 @@
 
 #include <sstream>
 
-#include "exprs/anyval_util.h"
+#include "exprs/create_predicate_function.h"
 #include "exprs/expr_context.h"
-#include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/in_predicate.h b/be/src/exprs/in_predicate.h
index c18b7303d7..0d43b4cefc 100644
--- a/be/src/exprs/in_predicate.h
+++ b/be/src/exprs/in_predicate.h
@@ -23,10 +23,8 @@
 #include <string>
 #include <unordered_set>
 
-#include "exprs/create_predicate_function.h"
 #include "exprs/hybrid_set.h"
 #include "exprs/predicate.h"
-#include "runtime/raw_value.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/info_func.cpp b/be/src/exprs/info_func.cpp
index 8096bf8fc2..1418b04acd 100644
--- a/be/src/exprs/info_func.cpp
+++ b/be/src/exprs/info_func.cpp
@@ -19,8 +19,6 @@
 
 #include <sstream>
 
-#include "util/debug_util.h"
-
 namespace doris {
 
 InfoFunc::InfoFunc(const TExprNode& node)
diff --git a/be/src/exprs/json_functions.cpp b/be/src/exprs/json_functions.cpp
index bfe26c2d20..595587ffcb 100644
--- a/be/src/exprs/json_functions.cpp
+++ b/be/src/exprs/json_functions.cpp
@@ -33,12 +33,8 @@
 
 #include "common/logging.h"
 #include "exprs/anyval_util.h"
-#include "exprs/expr.h"
 #include "gutil/strings/stringpiece.h"
-#include "olap/olap_define.h"
 #include "rapidjson/error/en.h"
-#include "runtime/string_value.h"
-#include "runtime/tuple_row.h"
 #include "udf/udf.h"
 #include "util/string_util.h"
 
diff --git a/be/src/exprs/json_functions.h b/be/src/exprs/json_functions.h
index f62c2f0671..2d0be74c9e 100644
--- a/be/src/exprs/json_functions.h
+++ b/be/src/exprs/json_functions.h
@@ -17,10 +17,12 @@
 
 #pragma once
 
+#include <fmt/core.h>
 #include <rapidjson/document.h>
 
-#include "fmt/format.h"
-#include "runtime/string_value.h"
+#include <sstream>
+
+#include "udf/udf.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/like_predicate.cpp b/be/src/exprs/like_predicate.cpp
index 13c0832f95..cd4fa586c4 100644
--- a/be/src/exprs/like_predicate.cpp
+++ b/be/src/exprs/like_predicate.cpp
@@ -25,7 +25,6 @@
 #include <sstream>
 
 #include "exprs/string_functions.h"
-#include "runtime/string_value.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/like_predicate.h b/be/src/exprs/like_predicate.h
index d9c895b533..c530e32f6f 100644
--- a/be/src/exprs/like_predicate.h
+++ b/be/src/exprs/like_predicate.h
@@ -25,8 +25,6 @@
 #include <memory>
 #include <string>
 
-#include "exprs/predicate.h"
-#include "gen_cpp/Exprs_types.h"
 #include "runtime/string_search.hpp"
 
 namespace doris {
diff --git a/be/src/exprs/literal.h b/be/src/exprs/literal.h
index 7dc93df733..ebccdd3b9e 100644
--- a/be/src/exprs/literal.h
+++ b/be/src/exprs/literal.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "binary_predicate.h"
 #include "common/object_pool.h"
 #include "exprs/expr.h"
 
diff --git a/be/src/exprs/minmax_predicate.h b/be/src/exprs/minmax_predicate.h
index cad94810c5..ef811c5c9e 100644
--- a/be/src/exprs/minmax_predicate.h
+++ b/be/src/exprs/minmax_predicate.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "common/object_pool.h"
-#include "runtime/primitive_type.h"
 #include "runtime/type_limit.h"
 
 namespace doris {
diff --git a/be/src/exprs/new_agg_fn_evaluator.cc b/be/src/exprs/new_agg_fn_evaluator.cc
index 0c09a78ed5..d595221a7d 100644
--- a/be/src/exprs/new_agg_fn_evaluator.cc
+++ b/be/src/exprs/new_agg_fn_evaluator.cc
@@ -24,20 +24,15 @@
 
 #include <sstream>
 
-#include "common/logging.h"
 #include "exprs/agg_fn.h"
-#include "exprs/aggregate_functions.h"
 #include "exprs/anyval_util.h"
 #include "exprs/expr.h"
 #include "exprs/expr_context.h"
-#include "exprs/scalar_fn_call.h"
-#include "gutil/strings/substitute.h"
 #include "runtime/mem_tracker.h"
 #include "runtime/raw_value.h"
 #include "runtime/runtime_state.h"
 #include "runtime/string_value.h"
 #include "udf/udf_internal.h"
-#include "util/debug_util.h"
 
 using namespace doris;
 using namespace doris_udf;
@@ -164,9 +159,9 @@ cleanup:
     return status;
 }
 
-Status NewAggFnEvaluator::Create(const vector<AggFn*>& agg_fns, RuntimeState* state,
+Status NewAggFnEvaluator::Create(const std::vector<AggFn*>& agg_fns, RuntimeState* state,
                                  ObjectPool* pool, MemPool* mem_pool,
-                                 vector<NewAggFnEvaluator*>* evals,
+                                 std::vector<NewAggFnEvaluator*>* evals,
                                  const std::shared_ptr<MemTracker>& tracker,
                                  const RowDescriptor& row_desc) {
     for (const AggFn* agg_fn : agg_fns) {
@@ -186,7 +181,7 @@ Status NewAggFnEvaluator::Open(RuntimeState* state) {
     // Now that we have opened all our input exprs, it is safe to evaluate any constant
     // values for the UDA's FunctionContext (we cannot evaluate exprs before calling Open()
     // on them).
-    vector<AnyVal*> constant_args(input_evals_.size(), nullptr);
+    std::vector<AnyVal*> constant_args(input_evals_.size(), nullptr);
     for (int i = 0; i < input_evals_.size(); ++i) {
         ExprContext* eval = input_evals_[i];
         RETURN_IF_ERROR(eval->get_const_value(state, *(agg_fn_.get_child(i)), &constant_args[i]));
@@ -195,7 +190,7 @@ Status NewAggFnEvaluator::Open(RuntimeState* state) {
     return Status::OK();
 }
 
-Status NewAggFnEvaluator::Open(const vector<NewAggFnEvaluator*>& evals, RuntimeState* state) {
+Status NewAggFnEvaluator::Open(const std::vector<NewAggFnEvaluator*>& evals, RuntimeState* state) {
     for (NewAggFnEvaluator* eval : evals) RETURN_IF_ERROR(eval->Open(state));
     return Status::OK();
 }
@@ -217,7 +212,7 @@ void NewAggFnEvaluator::Close(RuntimeState* state) {
     input_evals_.clear();
 }
 
-void NewAggFnEvaluator::Close(const vector<NewAggFnEvaluator*>& evals, RuntimeState* state) {
+void NewAggFnEvaluator::Close(const std::vector<NewAggFnEvaluator*>& evals, RuntimeState* state) {
     for (NewAggFnEvaluator* eval : evals) eval->Close(state);
 }
 
@@ -641,8 +636,8 @@ void NewAggFnEvaluator::ShallowClone(ObjectPool* pool, MemPool* mem_pool,
 }
 
 void NewAggFnEvaluator::ShallowClone(ObjectPool* pool, MemPool* mem_pool,
-                                     const vector<NewAggFnEvaluator*>& evals,
-                                     vector<NewAggFnEvaluator*>* cloned_evals) {
+                                     const std::vector<NewAggFnEvaluator*>& evals,
+                                     std::vector<NewAggFnEvaluator*>* cloned_evals) {
     for (const NewAggFnEvaluator* eval : evals) {
         NewAggFnEvaluator* cloned_eval;
         eval->ShallowClone(pool, mem_pool, &cloned_eval);
diff --git a/be/src/exprs/new_agg_fn_evaluator.h b/be/src/exprs/new_agg_fn_evaluator.h
index c330cd29cd..4ddf4e3f48 100644
--- a/be/src/exprs/new_agg_fn_evaluator.h
+++ b/be/src/exprs/new_agg_fn_evaluator.h
@@ -22,13 +22,8 @@
 
 #include <string>
 
-#include "common/compiler_util.h"
 #include "common/status.h"
 #include "exprs/agg_fn.h"
-#include "exprs/hybrid_map.h"
-#include "gen_cpp/Exprs_types.h"
-#include "gen_cpp/PlanNodes_types.h"
-#include "gen_cpp/Types_types.h"
 #include "runtime/descriptors.h"
 #include "runtime/tuple_row.h"
 #include "runtime/types.h"
diff --git a/be/src/exprs/new_in_predicate.cpp b/be/src/exprs/new_in_predicate.cpp
index b0a6390373..04d739ee5f 100644
--- a/be/src/exprs/new_in_predicate.cpp
+++ b/be/src/exprs/new_in_predicate.cpp
@@ -20,7 +20,6 @@
 #include <sstream>
 
 #include "exprs/anyval_util.h"
-#include "runtime/string_value.hpp"
 
 namespace doris {
 
diff --git a/be/src/exprs/new_in_predicate.h b/be/src/exprs/new_in_predicate.h
index afd54fd710..a9bb8d1315 100644
--- a/be/src/exprs/new_in_predicate.h
+++ b/be/src/exprs/new_in_predicate.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
+#include <set>
 #include <string>
 
-#include "exprs/predicate.h"
 #include "udf/udf.h"
 
 /* added by lide */
diff --git a/be/src/exprs/null_literal.cpp b/be/src/exprs/null_literal.cpp
index d6eaac0c2f..1cf54a3277 100644
--- a/be/src/exprs/null_literal.cpp
+++ b/be/src/exprs/null_literal.cpp
@@ -21,7 +21,6 @@
 #include "null_literal.h"
 
 #include "gen_cpp/Exprs_types.h"
-#include "runtime/runtime_state.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/operators.cpp b/be/src/exprs/operators.cpp
index 79b4111dd1..625a1db346 100644
--- a/be/src/exprs/operators.cpp
+++ b/be/src/exprs/operators.cpp
@@ -20,10 +20,8 @@
 
 #include "exprs/operators.h"
 
-#include "exprs/anyval_util.h"
 #include "runtime/datetime_value.h"
 #include "runtime/string_value.h"
-#include "util/debug_util.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/quantile_function.cpp b/be/src/exprs/quantile_function.cpp
index d925b251e6..ad8ecfa841 100644
--- a/be/src/exprs/quantile_function.cpp
+++ b/be/src/exprs/quantile_function.cpp
@@ -17,9 +17,7 @@
 
 #include "exprs/quantile_function.h"
 
-#include "exprs/anyval_util.h"
-#include "gutil/strings/numbers.h"
-#include "gutil/strings/split.h"
+#include "runtime/collection_value.h"
 #include "util/quantile_state.h"
 #include "util/slice.h"
 #include "util/string_parser.hpp"
diff --git a/be/src/exprs/rpc_fn.cpp b/be/src/exprs/rpc_fn.cpp
index 39337e0a6e..797968b775 100644
--- a/be/src/exprs/rpc_fn.cpp
+++ b/be/src/exprs/rpc_fn.cpp
@@ -20,20 +20,13 @@
 #include <fmt/format.h>
 
 #include "runtime/fragment_mgr.h"
-#include "runtime/user_function_cache.h"
-#include "service/brpc.h"
 #include "util/brpc_client_cache.h"
 #include "vec/columns/column.h"
 #include "vec/columns/column_vector.h"
 #include "vec/core/block.h"
 #include "vec/core/column_numbers.h"
-#include "vec/data_types/data_type_bitmap.h"
-#include "vec/data_types/data_type_date.h"
-#include "vec/data_types/data_type_date_time.h"
 #include "vec/data_types/data_type_decimal.h"
 #include "vec/data_types/data_type_nullable.h"
-#include "vec/data_types/data_type_number.h"
-#include "vec/data_types/data_type_string.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/rpc_fn_call.cpp b/be/src/exprs/rpc_fn_call.cpp
index 8d779f0ce8..05074f3f1c 100644
--- a/be/src/exprs/rpc_fn_call.cpp
+++ b/be/src/exprs/rpc_fn_call.cpp
@@ -20,10 +20,8 @@
 #include "exprs/anyval_util.h"
 #include "exprs/expr_context.h"
 #include "exprs/rpc_fn.h"
-#include "fmt/format.h"
 #include "rpc_fn.h"
 #include "runtime/runtime_state.h"
-#include "runtime/user_function_cache.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/runtime_filter.h b/be/src/exprs/runtime_filter.h
index f082bc1016..b1fa8e7d5a 100644
--- a/be/src/exprs/runtime_filter.h
+++ b/be/src/exprs/runtime_filter.h
@@ -23,8 +23,6 @@
 #include <mutex>
 
 #include "exprs/expr_context.h"
-#include "gen_cpp/Exprs_types.h"
-#include "runtime/types.h"
 #include "util/runtime_profile.h"
 #include "util/uid_util.h"
 
diff --git a/be/src/exprs/runtime_filter_rpc.cpp b/be/src/exprs/runtime_filter_rpc.cpp
index 764dcf9092..ed147db2be 100644
--- a/be/src/exprs/runtime_filter_rpc.cpp
+++ b/be/src/exprs/runtime_filter_rpc.cpp
@@ -22,9 +22,7 @@
 #include "runtime/runtime_state.h"
 
 // for rpc
-#include "gen_cpp/PlanNodes_types.h"
 #include "gen_cpp/internal_service.pb.h"
-#include "service/brpc.h"
 #include "util/brpc_client_cache.h"
 
 namespace doris {
diff --git a/be/src/exprs/runtime_filter_slots.h b/be/src/exprs/runtime_filter_slots.h
index 80716936e4..144a31224c 100644
--- a/be/src/exprs/runtime_filter_slots.h
+++ b/be/src/exprs/runtime_filter_slots.h
@@ -20,7 +20,6 @@
 #include "exprs/runtime_filter.h"
 #include "runtime/runtime_filter_mgr.h"
 #include "runtime/runtime_state.h"
-#include "vec/exprs/vexpr.h"
 
 namespace doris {
 // this class used in a hash join node
diff --git a/be/src/exprs/scalar_fn_call.cpp b/be/src/exprs/scalar_fn_call.cpp
index 9f77cecbc4..302bcad0c2 100644
--- a/be/src/exprs/scalar_fn_call.cpp
+++ b/be/src/exprs/scalar_fn_call.cpp
@@ -27,7 +27,6 @@
 #include "runtime/runtime_state.h"
 #include "runtime/user_function_cache.h"
 #include "udf/udf_internal.h"
-#include "util/debug_util.h"
 #include "util/symbols_util.h"
 
 namespace doris {
diff --git a/be/src/exprs/string_functions.cpp b/be/src/exprs/string_functions.cpp
index c976dbb243..462d7b6146 100644
--- a/be/src/exprs/string_functions.cpp
+++ b/be/src/exprs/string_functions.cpp
@@ -25,9 +25,7 @@
 #include <algorithm>
 
 #include "exprs/anyval_util.h"
-#include "fmt/format.h"
 #include "math_functions.h"
-#include "runtime/string_value.hpp"
 #include "util/simd/vstring_function.h"
 #include "util/url_parser.h"
 
diff --git a/be/src/exprs/string_functions.h b/be/src/exprs/string_functions.h
index 28f8dd6084..3d47963c12 100644
--- a/be/src/exprs/string_functions.h
+++ b/be/src/exprs/string_functions.h
@@ -27,9 +27,7 @@
 #include <sstream>
 #include <string_view>
 
-#include "anyval_util.h"
 #include "gutil/strings/numbers.h"
-#include "runtime/string_search.hpp"
 #include "runtime/string_value.h"
 
 namespace doris {
diff --git a/be/src/exprs/table_function/dummy_table_functions.cpp b/be/src/exprs/table_function/dummy_table_functions.cpp
index 8bbf7a35cb..a1d9b5a4fd 100644
--- a/be/src/exprs/table_function/dummy_table_functions.cpp
+++ b/be/src/exprs/table_function/dummy_table_functions.cpp
@@ -17,6 +17,8 @@
 
 #include "exprs/table_function/dummy_table_functions.h"
 
+#include "runtime/collection_value.h"
+
 namespace doris {
 
 void DummyTableFunctions::init() {}
diff --git a/be/src/exprs/table_function/dummy_table_functions.h b/be/src/exprs/table_function/dummy_table_functions.h
index 3f6f879548..59730cce91 100644
--- a/be/src/exprs/table_function/dummy_table_functions.h
+++ b/be/src/exprs/table_function/dummy_table_functions.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "exprs/anyval_util.h"
 #include "udf/udf.h"
 
 namespace doris {
diff --git a/be/src/exprs/table_function/explode_bitmap.cpp b/be/src/exprs/table_function/explode_bitmap.cpp
index 3ffac5f6f7..26d01891ba 100644
--- a/be/src/exprs/table_function/explode_bitmap.cpp
+++ b/be/src/exprs/table_function/explode_bitmap.cpp
@@ -18,7 +18,6 @@
 #include "exprs/table_function/explode_bitmap.h"
 
 #include "exprs/expr_context.h"
-#include "exprs/scalar_fn_call.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/table_function/explode_json_array.cpp b/be/src/exprs/table_function/explode_json_array.cpp
index 5158157e5d..76c55ffd78 100644
--- a/be/src/exprs/table_function/explode_json_array.cpp
+++ b/be/src/exprs/table_function/explode_json_array.cpp
@@ -18,7 +18,6 @@
 #include "exprs/table_function/explode_json_array.h"
 
 #include "exprs/expr_context.h"
-#include "exprs/scalar_fn_call.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/table_function/explode_json_array.h b/be/src/exprs/table_function/explode_json_array.h
index 616535ea12..b246c34f71 100644
--- a/be/src/exprs/table_function/explode_json_array.h
+++ b/be/src/exprs/table_function/explode_json_array.h
@@ -21,7 +21,6 @@
 #include <rapidjson/stringbuffer.h>
 
 #include "exprs/table_function/table_function.h"
-#include "gutil/strings/stringpiece.h"
 #include "runtime/string_value.h"
 
 namespace doris {
diff --git a/be/src/exprs/time_operators.cpp b/be/src/exprs/time_operators.cpp
index c2e17dc6bf..8ee617c1d2 100644
--- a/be/src/exprs/time_operators.cpp
+++ b/be/src/exprs/time_operators.cpp
@@ -23,11 +23,7 @@
 #include <sstream>
 
 #include "exprs/anyval_util.h"
-#include "exprs/case_expr.h"
-#include "exprs/expr.h"
-#include "runtime/tuple_row.h"
 #include "util/date_func.h"
-#include "util/string_parser.hpp"
 
 namespace doris {
 void TimeOperators::init() {}
diff --git a/be/src/exprs/timestamp_functions.cpp b/be/src/exprs/timestamp_functions.cpp
index 4ce6ce477e..e1f8ce6a95 100644
--- a/be/src/exprs/timestamp_functions.cpp
+++ b/be/src/exprs/timestamp_functions.cpp
@@ -21,18 +21,12 @@
 #include "exprs/timestamp_functions.h"
 
 #include "exprs/anyval_util.h"
-#include "exprs/expr.h"
-#include "exprs/expr_context.h"
 #include "runtime/datetime_value.h"
 #include "runtime/runtime_state.h"
-#include "runtime/string_value.hpp"
-#include "runtime/tuple_row.h"
-#include "util/debug_util.h"
-#include "util/path_builder.h"
+#include "udf/udf_internal.h"
 #include "util/timezone_utils.h"
 
 namespace doris {
-
 void TimestampFunctions::init() {}
 
 // TODO: accept Java data/time format strings:
diff --git a/be/src/exprs/timestamp_functions.h b/be/src/exprs/timestamp_functions.h
index 8dd93509b6..22d678cb20 100644
--- a/be/src/exprs/timestamp_functions.h
+++ b/be/src/exprs/timestamp_functions.h
@@ -23,7 +23,6 @@
 #include <thread>
 
 #include "runtime/datetime_value.h"
-#include "runtime/string_value.h"
 
 namespace doris {
 
diff --git a/be/src/exprs/udf_builtins.cpp b/be/src/exprs/udf_builtins.cpp
index d667f613d3..2f55d65974 100644
--- a/be/src/exprs/udf_builtins.cpp
+++ b/be/src/exprs/udf_builtins.cpp
@@ -23,8 +23,6 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "common/logging.h"
-
 namespace doris {
 using doris_udf::FunctionContext;
 using doris_udf::BooleanVal;
diff --git a/be/src/exprs/utility_functions.cpp b/be/src/exprs/utility_functions.cpp
index dd3d46e7c2..9817e09be0 100644
--- a/be/src/exprs/utility_functions.cpp
+++ b/be/src/exprs/utility_functions.cpp
@@ -23,9 +23,6 @@
 #include <thread>
 
 #include "exprs/anyval_util.h"
-#include "exprs/expr.h"
-#include "runtime/tuple_row.h"
-#include "util/debug_util.h"
 
 namespace doris {
 
diff --git a/be/src/geo/geo_functions.cpp b/be/src/geo/geo_functions.cpp
index 9148b5b347..bda65a1346 100644
--- a/be/src/geo/geo_functions.cpp
+++ b/be/src/geo/geo_functions.cpp
@@ -20,7 +20,6 @@
 #include <s2/s2debug.h>
 #include <s2/s2earth.h>
 
-#include "common/logging.h"
 #include "geo/geo_types.h"
 
 namespace doris {
diff --git a/be/src/geo/wkt_parse.cpp b/be/src/geo/wkt_parse.cpp
index fba2e20327..1e69f7036a 100644
--- a/be/src/geo/wkt_parse.cpp
+++ b/be/src/geo/wkt_parse.cpp
@@ -19,7 +19,6 @@
 
 #include "geo/geo_types.h"
 #include "geo/wkt_parse_ctx.h"
-#include "geo/wkt_parse_type.h"
 #include "geo/wkt_yacc.y.hpp"
 #define YYSTYPE WKT_STYPE
 #define YY_EXTRA_TYPE WktParseContext*
diff --git a/be/src/geo/wkt_parse.h b/be/src/geo/wkt_parse.h
index 4adb84a355..a121944aef 100644
--- a/be/src/geo/wkt_parse.h
+++ b/be/src/geo/wkt_parse.h
@@ -17,7 +17,6 @@
 
 #include <memory>
 
-#include "common/status.h"
 #include "geo/geo_common.h"
 
 namespace doris {
diff --git a/be/src/io/broker_reader.cpp b/be/src/io/broker_reader.cpp
index 173a1c8de4..b2f33b7d29 100644
--- a/be/src/io/broker_reader.cpp
+++ b/be/src/io/broker_reader.cpp
@@ -25,7 +25,6 @@
 #include "runtime/broker_mgr.h"
 #include "runtime/client_cache.h"
 #include "runtime/exec_env.h"
-#include "util/thrift_util.h"
 
 namespace doris {
 
diff --git a/be/src/io/broker_writer.cpp b/be/src/io/broker_writer.cpp
index 419e962b68..5271d34f73 100644
--- a/be/src/io/broker_writer.cpp
+++ b/be/src/io/broker_writer.cpp
@@ -17,6 +17,8 @@
 
 #include "io/broker_writer.h"
 
+#include <thrift/protocol/TDebugProtocol.h>
+
 #include <sstream>
 
 #include "common/logging.h"
@@ -25,7 +27,6 @@
 #include "runtime/broker_mgr.h"
 #include "runtime/client_cache.h"
 #include "runtime/exec_env.h"
-#include "util/thrift_util.h"
 
 namespace doris {
 
diff --git a/be/src/io/buffered_reader.cpp b/be/src/io/buffered_reader.cpp
index 5125facddc..453ed4b97b 100644
--- a/be/src/io/buffered_reader.cpp
+++ b/be/src/io/buffered_reader.cpp
@@ -21,7 +21,7 @@
 #include <sstream>
 
 #include "common/config.h"
-#include "common/logging.h"
+#include "olap/olap_define.h"
 
 namespace doris {
 
diff --git a/be/src/io/hdfs_file_reader.cpp b/be/src/io/hdfs_file_reader.cpp
index 0c5c57afad..b832991356 100644
--- a/be/src/io/hdfs_file_reader.cpp
+++ b/be/src/io/hdfs_file_reader.cpp
@@ -19,7 +19,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "common/logging.h"
 #include "service/backend_options.h"
 
 namespace doris {
diff --git a/be/src/io/hdfs_writer.cpp b/be/src/io/hdfs_writer.cpp
index 1f6ada8c4b..5f823fa2f8 100644
--- a/be/src/io/hdfs_writer.cpp
+++ b/be/src/io/hdfs_writer.cpp
@@ -19,7 +19,6 @@
 
 #include <filesystem>
 
-#include "common/logging.h"
 #include "service/backend_options.h"
 
 namespace doris {
diff --git a/be/src/io/local_file_reader.cpp b/be/src/io/local_file_reader.cpp
index 514d3483cf..898e657117 100644
--- a/be/src/io/local_file_reader.cpp
+++ b/be/src/io/local_file_reader.cpp
@@ -19,8 +19,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "common/logging.h"
-
 namespace doris {
 
 LocalFileReader::LocalFileReader(const std::string& path, int64_t start_offset)
diff --git a/be/src/io/s3_writer.cpp b/be/src/io/s3_writer.cpp
index 8c0ddd6696..c7cf4abe19 100644
--- a/be/src/io/s3_writer.cpp
+++ b/be/src/io/s3_writer.cpp
@@ -22,7 +22,6 @@
 #include <aws/s3/model/HeadObjectRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
 
-#include "common/logging.h"
 #include "runtime/exec_env.h"
 #include "runtime/tmp_file_mgr.h"
 #include "service/backend_options.h"
diff --git a/be/src/vec/exec/volap_scan_node.cpp b/be/src/vec/exec/volap_scan_node.cpp
index d1159ea244..16bed3f56d 100644
--- a/be/src/vec/exec/volap_scan_node.cpp
+++ b/be/src/vec/exec/volap_scan_node.cpp
@@ -20,6 +20,7 @@
 #include "common/resource_tls.h"
 #include "exec/scan_node.h"
 #include "gen_cpp/PlanNodes_types.h"
+#include "olap/storage_engine.h"
 #include "runtime/descriptors.h"
 #include "runtime/exec_env.h"
 #include "runtime/large_int_value.h"
diff --git a/be/src/vec/exec/volap_scanner.cpp b/be/src/vec/exec/volap_scanner.cpp
index ab56c4b657..f1c15408e4 100644
--- a/be/src/vec/exec/volap_scanner.cpp
+++ b/be/src/vec/exec/volap_scanner.cpp
@@ -19,13 +19,11 @@
 
 #include <memory>
 
+#include "olap/storage_engine.h"
 #include "runtime/runtime_state.h"
-#include "vec/columns/column_string.h"
-#include "vec/common/assert_cast.h"
 #include "vec/core/block.h"
 #include "vec/exec/volap_scan_node.h"
 #include "vec/exprs/vexpr_context.h"
-#include "vec/runtime/vdatetime_value.h"
 
 namespace doris::vectorized {
 
diff --git a/be/test/exec/hash_table_test.cpp b/be/test/exec/hash_table_test.cpp
index abd40ff638..c94fcceb77 100644
--- a/be/test/exec/hash_table_test.cpp
+++ b/be/test/exec/hash_table_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "exec/hash_table.hpp"
+#include "exec/hash_table.h"
 
 #include <gtest/gtest.h>
 #include <stdio.h>
diff --git a/be/test/testutil/function_utils.h b/be/test/testutil/function_utils.h
index 0b0902ddac..9c759f7b23 100644
--- a/be/test/testutil/function_utils.h
+++ b/be/test/testutil/function_utils.h
@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "udf/udf.h"
+#include "udf/udf_internal.h"
 
 namespace doris {