diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
index 767c183f8d5..b7602f8bedb 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
@@ -2,9 +2,8 @@
 #include <Interpreters/Context.h>
 #include <Storages/RocksDB/StorageEmbeddedRocksDB.h>
 #include <Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h>
-#include <rocksdb/db.h>
 
-#include <ext/enumerate.h>
+#include <rocksdb/db.h>
 
 
 namespace DB
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
index b00901d6033..a3a0ddb4348 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
@@ -1,8 +1,10 @@
-
 #include <Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.h>
 #include <Storages/RocksDB/StorageEmbeddedRocksDB.h>
 #include <IO/WriteBufferFromString.h>
 
+#include <rocksdb/db.h>
+
+
 namespace DB
 {
 
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 38025a997d2..977b80bc348 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -1,10 +1,10 @@
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <Storages/StorageFactory.h>
 #include <Storages/RocksDB/StorageEmbeddedRocksDB.h>
 #include <Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.h>
 #include <Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h>
+
+#include <DataTypes/DataTypesNumber.h>
+#include <Storages/StorageFactory.h>
+
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
@@ -12,28 +12,26 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <DataTypes/NestedUtils.h>
-#include <Common/typeid_cast.h>
-#include <Common/StringUtils/StringUtils.h>
 
 #include <IO/WriteBufferFromString.h>
-#include <DataStreams/IBlockOutputStream.h>
 
 #include <Processors/Sources/SourceFromInputStream.h>
+#include <Processors/Pipe.h>
+
 #include <Interpreters/Context.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/PreparedSets.h>
 #include <Interpreters/TreeRewriter.h>
-#include <Columns/IColumn.h>
-#include <Columns/ColumnString.h>
-#include <Processors/Pipe.h>
-#include <ext/enumerate.h>
 
 #include <Poco/File.h>
 #include <Poco/Path.h>
 #include <Poco/Logger.h>
 #include <common/logger_useful.h>
 
+#include <rocksdb/db.h>
+#include <rocksdb/table.h>
+
+
 namespace DB
 {
 
@@ -213,9 +211,11 @@ public:
                 ReadBufferFromString key_buffer(slices_keys[i]);
                 ReadBufferFromString value_buffer(values[i]);
 
-                for (const auto [idx, column_type] : ext::enumerate(sample_block.getColumnsWithTypeAndName()))
+                size_t idx = 0;
+                for (const auto & elem : sample_block)
                 {
-                    column_type.type->deserializeBinary(*columns[idx], idx == primary_key_pos? key_buffer: value_buffer);
+                    elem.type->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
+                    ++idx;
                 }
             }
         }
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index 209f70ceb52..bd700a35809 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -1,14 +1,15 @@
 #pragma once
 
+#include <memory>
 #include <ext/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
-#include <Storages/TableLockHolder.h>
-#include <Disks/IDisk.h>
 
-#include <shared_mutex>
 
-#include "rocksdb/db.h"
-#include "rocksdb/table.h"
+namespace rocksdb
+{
+    class DB;
+}
+
 
 namespace DB
 {
@@ -38,7 +39,8 @@ public:
 
     bool supportsParallelInsert() const override { return true; }
     bool supportsIndexForIn() const override { return true; }
-    bool mayBenefitFromIndexForIn(const ASTPtr & node, const Context & /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
+    bool mayBenefitFromIndexForIn(
+        const ASTPtr & node, const Context & /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
     {
         return node->getColumnName() == primary_key;
     }