From 91043351aa4030855df3105c2d8b095f19ebd5a6 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jul 2022 20:30:16 +0000
Subject: [PATCH] Fixing build.

---
 programs/disks/CommandCopy.cpp                              | 1 +
 programs/disks/CommandLink.cpp                              | 1 +
 programs/disks/CommandList.cpp                              | 1 +
 programs/disks/CommandListDisks.cpp                         | 1 +
 programs/disks/CommandMove.cpp                              | 1 +
 programs/disks/CommandRead.cpp                              | 1 +
 programs/disks/CommandRemove.cpp                            | 1 +
 programs/disks/CommandWrite.cpp                             | 1 +
 src/Access/DiskAccessStorage.cpp                            | 1 +
 src/AggregateFunctions/parseAggregateFunctionParameters.h   | 2 ++
 src/Backups/registerBackupEnginesFileAndDisk.cpp            | 1 +
 src/Common/ShellCommand.h                                   | 1 +
 src/Coordination/CoordinationSettings.cpp                   | 2 +-
 src/Coordination/KeeperServer.cpp                           | 1 +
 src/Disks/DiskEncrypted.cpp                                 | 2 ++
 src/Disks/IDisk.h                                           | 6 ++++--
 src/Disks/IO/CachedReadBufferFromRemoteFS.cpp               | 1 +
 .../ObjectStorages/AzureBlobStorage/AzureObjectStorage.h    | 1 +
 .../AzureBlobStorage/registerDiskAzureBlobStorage.cpp       | 1 +
 src/Disks/ObjectStorages/DiskObjectStorage.cpp              | 1 +
 src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp        | 1 +
 src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h      | 1 +
 src/Disks/ObjectStorages/IObjectStorage.cpp                 | 1 +
 src/Disks/ObjectStorages/IObjectStorage.h                   | 1 +
 src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp             | 1 +
 src/Disks/ObjectStorages/S3/S3ObjectStorage.h               | 1 +
 src/IO/ReadBufferFromFileDescriptor.cpp                     | 1 +
 src/IO/ReadBufferFromFileDescriptor.h                       | 2 +-
 src/Parsers/IAST.h                                          | 3 +--
 src/Parsers/MySQL/ASTDeclareOption.h                        | 1 +
 src/Processors/Formats/Impl/ArrowBufferedStreams.cpp        | 1 +
 src/Processors/QueryPlan/ReadFromMergeTree.cpp              | 1 +
 src/Processors/QueryPlan/ReadFromMergeTree.h                | 3 +++
 src/Processors/TTL/TTLAggregationAlgorithm.cpp              | 1 +
 src/QueryPipeline/RemoteInserter.cpp                        | 1 +
 src/Server/KeeperTCPHandler.h                               | 1 -
 src/Storages/MergeTree/BackgroundJobsAssignee.cpp           | 1 +
 src/Storages/MergeTree/IMergeTreeReader.cpp                 | 1 +
 src/Storages/MergeTree/MergePlainMergeTreeTask.h            | 1 +
 src/Storages/MergeTree/MergeTreeData.h                      | 3 +++
 src/Storages/MergeTree/MergeTreePartition.cpp               | 1 +
 src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp           | 1 +
 src/Storages/ReadInOrderOptimizer.cpp                       | 1 +
 src/Storages/System/StorageSystemParts.cpp                  | 1 +
 44 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/programs/disks/CommandCopy.cpp b/programs/disks/CommandCopy.cpp
index f9cd7444287..1e5852fe651 100644
--- a/programs/disks/CommandCopy.cpp
+++ b/programs/disks/CommandCopy.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandLink.cpp b/programs/disks/CommandLink.cpp
index 6e9a7e64324..af48f0de097 100644
--- a/programs/disks/CommandLink.cpp
+++ b/programs/disks/CommandLink.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandList.cpp b/programs/disks/CommandList.cpp
index 8c6bfac3a9b..e76bb9e65fb 100644
--- a/programs/disks/CommandList.cpp
+++ b/programs/disks/CommandList.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandListDisks.cpp b/programs/disks/CommandListDisks.cpp
index 2bcbb045d67..22cffdd21fd 100644
--- a/programs/disks/CommandListDisks.cpp
+++ b/programs/disks/CommandListDisks.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandMove.cpp b/programs/disks/CommandMove.cpp
index 4a377cc7225..6322cf4b47d 100644
--- a/programs/disks/CommandMove.cpp
+++ b/programs/disks/CommandMove.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandRead.cpp b/programs/disks/CommandRead.cpp
index aa472fa217e..6b77a27e918 100644
--- a/programs/disks/CommandRead.cpp
+++ b/programs/disks/CommandRead.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandRemove.cpp b/programs/disks/CommandRemove.cpp
index d9925fbd93e..c1d3129bb8d 100644
--- a/programs/disks/CommandRemove.cpp
+++ b/programs/disks/CommandRemove.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/programs/disks/CommandWrite.cpp b/programs/disks/CommandWrite.cpp
index c8ae91ea8d5..0b1c5823c81 100644
--- a/programs/disks/CommandWrite.cpp
+++ b/programs/disks/CommandWrite.cpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index 994abc7b53a..0cbe420f345 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -15,6 +15,7 @@
 #include <Poco/JSON/Stringifier.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <base/range.h>
 #include <filesystem>
 #include <fstream>
 
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.h b/src/AggregateFunctions/parseAggregateFunctionParameters.h
index a67bc081303..41a04324f6d 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.h
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.h
@@ -8,6 +8,8 @@
 namespace DB
 {
 
+struct Array;
+
 Array getAggregateFunctionParametersArray(
     const ASTPtr & expression_list,
     const std::string & error_context,
diff --git a/src/Backups/registerBackupEnginesFileAndDisk.cpp b/src/Backups/registerBackupEnginesFileAndDisk.cpp
index 050a51939b6..380ae36a8e3 100644
--- a/src/Backups/registerBackupEnginesFileAndDisk.cpp
+++ b/src/Backups/registerBackupEnginesFileAndDisk.cpp
@@ -7,6 +7,7 @@
 #include <IO/Archives/hasRegisteredArchiveFileExtension.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/src/Common/ShellCommand.h b/src/Common/ShellCommand.h
index 190b5bc664e..dfc4a826f62 100644
--- a/src/Common/ShellCommand.h
+++ b/src/Common/ShellCommand.h
@@ -3,6 +3,7 @@
 #include <memory>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
+#include <unordered_map>
 
 
 namespace DB
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index 34d69967828..c3decc071de 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -1,5 +1,5 @@
 #include <Coordination/CoordinationSettings.h>
-#include <Core/Settings.h>
+//#include <Core/Settings.h>
 #include <Common/logger_useful.h>
 #include <filesystem>
 #include <Coordination/Defines.h>
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 7c6ed227a06..864bb477786 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -21,6 +21,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/Stopwatch.h>
 
 namespace DB
 {
diff --git a/src/Disks/DiskEncrypted.cpp b/src/Disks/DiskEncrypted.cpp
index 8edb00e5a67..e6479727aad 100644
--- a/src/Disks/DiskEncrypted.cpp
+++ b/src/Disks/DiskEncrypted.cpp
@@ -8,6 +8,8 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromEncryptedFile.h>
 #include <boost/algorithm/hex.hpp>
+#include <Common/quoteString.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 941df99298b..2337fa00af5 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/Context.h>
 #include <Core/Defines.h>
 #include <base/types.h>
 #include <Common/CurrentMetrics.h>
@@ -41,6 +40,10 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+using DisksMap = std::map<String, DiskPtr>;
+
 class IReservation;
 using ReservationPtr = std::unique_ptr<IReservation>;
 using Reservations = std::vector<ReservationPtr>;
@@ -363,7 +366,6 @@ private:
     std::unique_ptr<Executor> executor;
 };
 
-using DiskPtr = std::shared_ptr<IDisk>;
 using Disks = std::vector<DiskPtr>;
 
 /**
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
index b929cea0236..a3d5cfc408d 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
@@ -6,6 +6,7 @@
 #include <Common/assert_cast.h>
 #include <Common/hex.h>
 #include <Common/getRandomASCIIString.h>
+#include <Interpreters/Context.h>
 
 
 namespace ProfileEvents
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 6df093ebd43..34b3d86b355 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -10,6 +10,7 @@
 #include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/getRandomASCIIString.h>
+#include <Common/MultiVersion.h>
 
 
 namespace DB
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
index 44976b7cf2d..dc70008649e 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
@@ -12,6 +12,7 @@
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index ca414a7ee72..0b7d16bd895 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -18,6 +18,7 @@
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
index 99606a18517..b8ab2f49202 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
@@ -3,6 +3,7 @@
 #include <Common/FileCacheFactory.h>
 #include <Common/IFileCache.h>
 #include <Common/FileCacheSettings.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
index b6426df1e9a..6d5ae12a157 100644
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Disks/IDisk.h>
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 #include <Disks/ObjectStorages/MetadataFromDiskTransactionState.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h>
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
index f9c5c139b95..f3ac94768d8 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -2,6 +2,7 @@
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/copyData.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 06398b11aec..1ab2d75ff86 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -7,6 +7,7 @@
 #include <optional>
 
 #include <Poco/Timestamp.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Core/Defines.h>
 #include <Common/Exception.h>
 #include <IO/ReadSettings.h>
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index 55c466d45f6..d36bf655c02 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -28,6 +28,7 @@
 #include <Common/FileCacheFactory.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index 98397224629..8f20671d841 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -11,6 +11,7 @@
 #include <aws/s3/model/HeadObjectResult.h>
 #include <aws/s3/model/ListObjectsV2Result.h>
 #include <Storages/StorageS3Settings.h>
+#include <Common/MultiVersion.h>
 
 
 namespace DB
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 406b519df79..920e76cd7d0 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -10,6 +10,7 @@
 #include <IO/Progress.h>
 #include <Common/filesystemHelpers.h>
 #include <sys/stat.h>
+#include <Interpreters/Context.h>
 
 
 #ifdef HAS_RESERVED_IDENTIFIER
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index 40b0717c8b1..73c651189cd 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <IO/ReadBufferFromFileBase.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <unistd.h>
 
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index b73919f4f36..1999eff37a8 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -5,7 +5,6 @@
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Common/Exception.h>
 #include <Common/TypePromotion.h>
-#include <Core/Settings.h>
 #include <IO/WriteBufferFromString.h>
 
 #include <algorithm>
@@ -26,7 +25,7 @@ namespace ErrorCodes
 using IdentifierNameSet = std::set<String>;
 
 class WriteBuffer;
-
+using Strings = std::vector<String>;
 
 /** Element of the syntax tree (hereinafter - directed acyclic graph with elements of semantics)
   */
diff --git a/src/Parsers/MySQL/ASTDeclareOption.h b/src/Parsers/MySQL/ASTDeclareOption.h
index a9529924567..c493c49c61b 100644
--- a/src/Parsers/MySQL/ASTDeclareOption.h
+++ b/src/Parsers/MySQL/ASTDeclareOption.h
@@ -3,6 +3,7 @@
 #include <Parsers/IAST.h>
 #include <Parsers/IParserBase.h>
 #include <Parsers/CommonParsers.h>
+#include <unordered_map>
 
 namespace DB
 {
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 5232d9166af..ebd9783b4fd 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -13,6 +13,7 @@
 #include <arrow/buffer.h>
 #include <arrow/io/memory.h>
 #include <arrow/result.h>
+#include <Core/Settings.h>
 
 #include <sys/stat.h>
 
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index b4e143cc002..473798b1a2b 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -7,6 +7,7 @@
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectQuery.h>
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 5d5c7e9cb2c..46be5ea1d7d 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/RequestResponse.h>
 
 namespace DB
 {
@@ -9,6 +10,8 @@ using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 
 class Pipe;
 
+using MergeTreeReadTaskCallback = std::function<std::optional<PartitionReadResponse>(PartitionReadRequest)>;
+
 struct MergeTreeDataSelectSamplingData
 {
     bool use_sampling = false;
diff --git a/src/Processors/TTL/TTLAggregationAlgorithm.cpp b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
index d8b022f0acb..0d160b8d32d 100644
--- a/src/Processors/TTL/TTLAggregationAlgorithm.cpp
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
@@ -1,4 +1,5 @@
 #include <Processors/TTL/TTLAggregationAlgorithm.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/QueryPipeline/RemoteInserter.cpp b/src/QueryPipeline/RemoteInserter.cpp
index ce2ba23576d..58fed6e5466 100644
--- a/src/QueryPipeline/RemoteInserter.cpp
+++ b/src/QueryPipeline/RemoteInserter.cpp
@@ -7,6 +7,7 @@
 #include <Common/CurrentThread.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Server/KeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
index 9895c335c96..ee83c4fa21b 100644
--- a/src/Server/KeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -9,7 +9,6 @@
 #include <Common/MultiVersion.h>
 #include "IServer.h"
 #include <Common/Stopwatch.h>
-#include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <Common/ConcurrentBoundedQueue.h>
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.cpp b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
index 81445f40ed6..9617d16f6f1 100644
--- a/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/randomSeed.h>
+#include <Interpreters/Context.h>
 #include <pcg_random.hpp>
 #include <random>
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index b8aeb8e6a5a..3acb4910e28 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -4,6 +4,7 @@
 #include <Compression/CachedCompressedReadBuffer.h>
 #include <Columns/ColumnArray.h>
 #include <Interpreters/inplaceBlockConversions.h>
+#include <Interpreters/Context.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Common/typeid_cast.h>
 
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.h b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
index 0f6d38d2cbf..7488b9655fe 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.h
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
@@ -4,6 +4,7 @@
 #include <Storages/MergeTree/MergeTask.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+#include <Interpreters/MergeTreeTransactionHolder.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 26ac4d362ec..7c3bc21f391 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -56,6 +56,9 @@ struct ZeroCopyLock;
 class IBackupEntry;
 using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBackupEntry>>>;
 
+class MergeTreeTransaction;
+using MergeTreeTransactionPtr = std::shared_ptr<MergeTreeTransaction>;
+
 /// Auxiliary struct holding information about the future merged or mutated part.
 struct EmergingPartInfo
 {
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 81026989f95..4ea6ec11ecc 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <IO/HashingWriteBuffer.h>
+#include <Interpreters/Context.h>
 #include <Common/FieldVisitors.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 3eb638d15c0..9ed8fe0ad14 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -6,6 +6,7 @@
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/copyData.h>
+#include <Interpreters/Context.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
diff --git a/src/Storages/ReadInOrderOptimizer.cpp b/src/Storages/ReadInOrderOptimizer.cpp
index 3ff4baa0b11..b188cef065e 100644
--- a/src/Storages/ReadInOrderOptimizer.cpp
+++ b/src/Storages/ReadInOrderOptimizer.cpp
@@ -6,6 +6,7 @@
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/TableJoin.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTFunction.h>
 
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 01bba669c0e..1b207d1d165 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -13,6 +13,7 @@
 #include <Parsers/queryToString.h>
 #include <Common/hex.h>
 #include <Interpreters/TransactionVersionMetadata.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {