diff --git a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
index 6dd15731eea0b..fa726d1d62ed1 100644
--- a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
+++ b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
@@ -30,6 +30,11 @@
 #include <IO/ReadHelpers.h>
 #include <Interpreters/BloomFilter.h>
 
+namespace DB::ErrorCodes
+{
+extern const int BAD_ARGUMENTS;
+}
+
 namespace local_engine
 {
 using namespace DB;
diff --git a/cpp-ch/local-engine/Common/CHUtil.h b/cpp-ch/local-engine/Common/CHUtil.h
index 65764af7d148c..7be3f86dc2303 100644
--- a/cpp-ch/local-engine/Common/CHUtil.h
+++ b/cpp-ch/local-engine/Common/CHUtil.h
@@ -21,6 +21,7 @@
 #include <Core/Block.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/NamesAndTypes.h>
+#include <Core/Settings.h>
 #include <Functions/CastOverloadResolver.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Interpreters/Context.h>
diff --git a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
index d32c640c3d841..d04c67d71b663 100644
--- a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
+++ b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
@@ -16,6 +16,7 @@
  */
 #include <cstring>
 #include <vector>
+#include <Core/Settings.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFileDescriptorDiscardOnFailure.h>
diff --git a/cpp-ch/local-engine/Disks/ObjectStorages/registerGlutenDiskObjectStorage.cpp b/cpp-ch/local-engine/Disks/ObjectStorages/registerGlutenDiskObjectStorage.cpp
index 9e45464980347..7d4d06a1239ff 100644
--- a/cpp-ch/local-engine/Disks/ObjectStorages/registerGlutenDiskObjectStorage.cpp
+++ b/cpp-ch/local-engine/Disks/ObjectStorages/registerGlutenDiskObjectStorage.cpp
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 #include "config.h"
+#include <Core/Settings.h>
 #include <Disks/ObjectStorages/ObjectStorageFactory.h>
 #if USE_AWS_S3
+#include <Disks/ObjectStorages/S3/DiskS3Utils.h>
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
 #include <Disks/ObjectStorages/S3/diskSettings.h>
-#include <Disks/ObjectStorages/S3/DiskS3Utils.h>
 #endif
 
 #if USE_HDFS
diff --git a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
index 9fce53414b016..fea2c7f47d4f5 100644
--- a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
+++ b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
@@ -20,6 +20,7 @@
 #include <memory>
 #include <type_traits>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionGroupBloomFilter.h>
 #include <AggregateFunctions/IAggregateFunction_fwd.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <Columns/ColumnConst.h>
@@ -40,15 +41,11 @@
 #include <Common/typeid_cast.h>
 
 
-#include <AggregateFunctions/AggregateFunctionGroupBloomFilter.h>
-
-
 namespace DB
 {
 namespace ErrorCodes
 {
 extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-extern const int BAD_ARGUMENTS;
 }
 }
 
diff --git a/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.h b/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.h
index 600210e668697..d9766c4392f4d 100644
--- a/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.h
+++ b/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.h
@@ -16,6 +16,7 @@
  */
 #pragma once
 #include <shared_mutex>
+#include <Core/Joins.h>
 #include <Interpreters/JoinUtils.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
diff --git a/cpp-ch/local-engine/Parser/JoinRelParser.h b/cpp-ch/local-engine/Parser/JoinRelParser.h
index 15468b54b6f49..e6d31e6d31d6e 100644
--- a/cpp-ch/local-engine/Parser/JoinRelParser.h
+++ b/cpp-ch/local-engine/Parser/JoinRelParser.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <unordered_set>
+#include <Core/Joins.h>
 #include <Parser/RelParser.h>
 #include <substrait/algebra.pb.h>
 
diff --git a/cpp-ch/local-engine/Shuffle/PartitionWriter.h b/cpp-ch/local-engine/Shuffle/PartitionWriter.h
index 5b4285afda1f9..e2c10b0cbd464 100644
--- a/cpp-ch/local-engine/Shuffle/PartitionWriter.h
+++ b/cpp-ch/local-engine/Shuffle/PartitionWriter.h
@@ -19,13 +19,14 @@
 #include <memory>
 #include <vector>
 #include <Core/Block.h>
+#include <Core/Settings.h>
 #include <IO/WriteBuffer.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
+#include <Parser/SerializedPlanParser.h>
+#include <Shuffle/CachedShuffleWriter.h>
 #include <Shuffle/ShuffleSplitter.h>
 #include <jni/CelebornClient.h>
-#include <Parser/SerializedPlanParser.h>
 
-#include "CachedShuffleWriter.h"
 
 namespace DB
 {
diff --git a/cpp-ch/local-engine/Storages/CustomStorageMergeTree.cpp b/cpp-ch/local-engine/Storages/CustomStorageMergeTree.cpp
index ec0e0932fc763..3e93edaaab700 100644
--- a/cpp-ch/local-engine/Storages/CustomStorageMergeTree.cpp
+++ b/cpp-ch/local-engine/Storages/CustomStorageMergeTree.cpp
@@ -16,9 +16,9 @@
  */
 #include "CustomStorageMergeTree.h"
 
-
-#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Interpreters/MergeTreeTransaction.h>
+#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/checkDataPart.h>
 
 namespace DB
diff --git a/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp b/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
index 57bb804fa9d19..c6a8e03a6ba08 100644
--- a/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
+++ b/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
@@ -17,7 +17,7 @@
 #include "MetaDataHelper.h"
 
 #include <filesystem>
-
+#include <Core/Settings.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
 #include <Parser/MergeTreeRelParser.h>
 #include <Storages/Mergetree/MergeSparkMergeTreeTask.h>
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.cpp
index 31ef5b9e17159..428ef57968880 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.cpp
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 #include "ExcelTextFormatFile.h"
-#include <Common/CHUtil.h>
-
 #include <memory>
 #include <string>
 
@@ -31,6 +29,7 @@
 #include <Storages/Serializations/ExcelDecimalSerialization.h>
 #include <Storages/Serializations/ExcelSerialization.h>
 #include <Storages/Serializations/ExcelStringReader.h>
+#include <Common/CHUtil.h>
 
 namespace DB
 {
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.h b/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.h
index 237a0383c2114..4ec69f33b9c41 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.h
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/ExcelTextFormatFile.h
@@ -16,8 +16,6 @@
  */
 #pragma once
 
-
-#include <memory>
 #include <Columns/IColumn.h>
 #include <IO/PeekableReadBuffer.h>
 #include <IO/ReadBuffer.h>
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
index 7cafee8fe526f..e73ca8ecee2bb 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
@@ -20,6 +20,7 @@
 #include <memory>
 #include <shared_mutex>
 #include <thread>
+#include <Core/Settings.h>
 #include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 #include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.h b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.h
index b07b810e896a8..f5218f0aa5def 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.h
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.h
@@ -22,6 +22,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <boost/core/noncopyable.hpp>
 #include <substrait/plan.pb.h>
+#include <Poco/URI.h>
 
 namespace local_engine
 {
diff --git a/cpp-ch/local-engine/tests/gtest_ch_join.cpp b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
index 43bac7a597286..3202fb235a5f5 100644
--- a/cpp-ch/local-engine/tests/gtest_ch_join.cpp
+++ b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
@@ -31,11 +31,11 @@
 #include <Common/DebugUtils.h>
 #include <Common/MergeTreeTool.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/HashJoin/HashJoin.h>
 #include <Interpreters/TableJoin.h>
 #include <substrait/plan.pb.h>
 
-
 using namespace DB;
 using namespace local_engine;
 
@@ -95,17 +95,13 @@ TEST(TestJoin, simple)
     ASTPtr rkey = std::make_shared<ASTIdentifier>("colD");
     join->addOnKeys(lkey, rkey, false);
     for (const auto & column : join->columnsFromJoinedTable())
-    {
         join->addJoinedColumn(column);
-    }
 
     auto left_keys = left.getNamesAndTypesList();
     join->addJoinedColumnsAndCorrectTypes(left_keys, true);
     std::cerr << "after join:\n";
     for (const auto & key : left_keys)
-    {
         std::cerr << key.dump() << std::endl;
-    }
     ActionsDAGPtr left_convert_actions = nullptr;
     ActionsDAGPtr right_convert_actions = nullptr;
     std::tie(left_convert_actions, right_convert_actions)
diff --git a/cpp-ch/local-engine/tests/gtest_clickhouse_54881.cpp b/cpp-ch/local-engine/tests/gtest_clickhouse_54881.cpp
index 2628eb0e8c040..69966ef93c0b1 100644
--- a/cpp-ch/local-engine/tests/gtest_clickhouse_54881.cpp
+++ b/cpp-ch/local-engine/tests/gtest_clickhouse_54881.cpp
@@ -16,7 +16,7 @@
  */
 #include <gluten_test_util.h>
 #include <incbin.h>
-
+#include <Core/Settings.h>
 #include <Parser/SerializedPlanParser.h>
 #include <gtest/gtest.h>
 #include <Common/DebugUtils.h>
diff --git a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
index bdaa51f974c52..76c0d028a58e2 100644
--- a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
@@ -28,6 +28,7 @@
 #include <Parser/SerializedPlanParser.h>
 #include <Parsers/ExpressionListParsers.h>
 
+#include <Core/Settings.h>
 #include <Processors/Formats/Impl/ArrowBufferedStreams.h>
 #include <Storages/Parquet/ArrowUtils.h>
 #include <Storages/Parquet/ColumnIndexFilter.h>
diff --git a/cpp-ch/local-engine/tests/gtest_parser.cpp b/cpp-ch/local-engine/tests/gtest_parser.cpp
index 24c796358f450..aaaa3679ab94e 100644
--- a/cpp-ch/local-engine/tests/gtest_parser.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parser.cpp
@@ -16,6 +16,7 @@
  */
 #include <gluten_test_util.h>
 #include <incbin.h>
+#include <Core/Settings.h>
 #include <Parser/SerializedPlanParser.h>
 #include <gtest/gtest.h>
 
@@ -138,7 +139,7 @@ TEST(LocalExecutor, StorageFileSink)
     metadata.setColumns(ColumnsDescription::fromNamesAndTypes({{"name", STRING()}, {"value", UINT()}}));
     StorageMetadataPtr metadata_ptr = std::make_shared<StorageInMemoryMetadata>(metadata);
 
-/*
+    /*
     auto sink = createFilelinkSink(
         metadata_ptr,
         "test_table",