diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index c4736ceea3a..963ccd88def 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -34,7 +34,7 @@ class Context;
 /**
  * ORDER-PRESERVING parallel parsing of data formats.
  * It splits original data into chunks. Then each chunk is parsed by different thread.
- * The number of chunks equals to the number or parser threads.
+ * The number of chunks equals to the number of parser threads.
  * The size of chunk is equal to min_chunk_bytes_for_parallel_parsing setting.
  *
  *                    Parsers
@@ -119,25 +119,25 @@ public:
         finishAndWait();
     }
 
-    void resetParser() override final
+    void resetParser() final
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "resetParser() is not allowed for {}", getName());
     }
 
-    const BlockMissingValues & getMissingValues() const override final
+    const BlockMissingValues & getMissingValues() const final
     {
         return last_block_missing_values;
     }
 
     size_t getApproxBytesReadForChunk() const override { return last_approx_bytes_read_for_chunk; }
 
-    String getName() const override final { return "ParallelParsingBlockInputFormat"; }
+    String getName() const final { return "ParallelParsingBlockInputFormat"; }
 
 private:
 
-    Chunk read() override final;
+    Chunk read() final;
 
-    void onCancel() override final
+    void onCancel() final
     {
         /*
          * The format parsers themselves are not being cancelled here, so we'll
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index dfa311a7079..33bd824dd5c 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -1,4 +1,3 @@
-#include <variant>
 #include <Processors/Sources/RemoteSource.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 #include <QueryPipeline/RemoteQueryExecutorReadContext.h>
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index dbfa0156331..4e179371cf5 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -4,7 +4,6 @@
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <QueryPipeline/Pipe.h>
 #include <Core/UUID.h>
-#include <atomic>
 
 namespace DB
 {
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index 0ea224f6ee9..31c241a5b13 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -1,7 +1,5 @@
 #include "Storages/StorageS3Cluster.h"
 
-#include "config.h"
-
 #if USE_AWS_S3
 
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index ac25c506337..03155b6e707 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -4,10 +4,7 @@
 
 #if USE_AWS_S3
 
-#include <memory>
-#include <optional>
-
-#include "Client/Connection.h"
+#include <Client/Connection.h>
 #include <Interpreters/Cluster.h>
 #include <IO/S3Common.h>
 #include <Storages/IStorageCluster.h>