diff --git a/.clang-tidy b/.clang-tidy
index 6f6c01605d6..1d8142934a0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +1,6 @@
 Checks: '-*,
+    misc-misleading-bidirectional,
+    misc-misleading-identifier,
     misc-misplaced-const,
     misc-redundant-expression,
     misc-static-assert,
@@ -11,15 +13,19 @@ Checks: '-*,
 
     modernize-avoid-bind,
     modernize-loop-convert,
+    modernize-macro-to-enum,
     modernize-make-shared,
     modernize-make-unique,
     modernize-raw-string-literal,
     modernize-redundant-void-arg,
     modernize-replace-random-shuffle,
+    modernize-shrink-to-fit,
     modernize-use-bool-literals,
     modernize-use-equals-default,
     modernize-use-equals-delete,
     modernize-use-nullptr,
+    modernize-use-transparent-functors,
+    modernize-use-uncaught-exceptions,
     modernize-use-using,
 
     performance-faster-string-find,
@@ -30,6 +36,7 @@ Checks: '-*,
     performance-move-const-arg,
     performance-move-constructor-init,
     performance-no-automatic-move,
+    performance-no-int-to-ptr,
     performance-noexcept-move-constructor,
     performance-trivially-destructible,
     performance-unnecessary-copy-initialization,
@@ -41,6 +48,7 @@ Checks: '-*,
     readability-convert-member-functions-to-static,
     readability-delete-null-pointer,
     readability-deleted-default,
+    readability-duplicate-include,
     readability-identifier-naming,
     readability-inconsistent-declaration-parameter-name,
     readability-make-member-function-const,
@@ -51,6 +59,7 @@ Checks: '-*,
     readability-redundant-control-flow,
     readability-redundant-function-ptr-dereference,
     readability-redundant-member-init,
+    readability-redundant-preprocessor,
     readability-redundant-smartptr-get,
     readability-redundant-string-cstr,
     readability-redundant-string-init,
@@ -71,6 +80,7 @@ Checks: '-*,
     bugprone-incorrect-roundings,
     bugprone-infinite-loop,
     bugprone-integer-division,
+    bugprone-lambda-function-name,
     bugprone-macro-parentheses,
     bugprone-macro-repeated-side-effects,
     bugprone-misplaced-operator-in-strlen-in-alloc,
@@ -80,15 +90,19 @@ Checks: '-*,
     bugprone-multiple-statement-macro,
     bugprone-parent-virtual-call,
     bugprone-posix-return,
+    bugprone-redundant-branch-condition,
     bugprone-reserved-identifier,
+    bugprone-shared-ptr-array-mismatch,
     bugprone-signed-char-misuse,
     bugprone-sizeof-container,
     bugprone-sizeof-expression,
     bugprone-string-constructor,
     bugprone-string-integer-assignment,
     bugprone-string-literal-with-embedded-nul,
+    bugprone-stringview-nullptr,
     bugprone-suspicious-enum-usage,
     bugprone-suspicious-include,
+    bugprone-suspicious-memory-comparison,
     bugprone-suspicious-memset-usage,
     bugprone-suspicious-missing-comma,
     bugprone-suspicious-string-compare,
diff --git a/src/Columns/ColumnSparse.cpp b/src/Columns/ColumnSparse.cpp
index d2cc8223a91..4273ebac0be 100644
--- a/src/Columns/ColumnSparse.cpp
+++ b/src/Columns/ColumnSparse.cpp
@@ -53,7 +53,7 @@ ColumnSparse::ColumnSparse(MutableColumnPtr && values_, MutableColumnPtr && offs
 
 #ifndef NDEBUG
     const auto & offsets_data = getOffsetsData();
-    const auto * it = std::adjacent_find(offsets_data.begin(), offsets_data.end(), std::greater_equal<UInt64>());
+    const auto * it = std::adjacent_find(offsets_data.begin(), offsets_data.end(), std::greater_equal<>());
     if (it != offsets_data.end())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Offsets of ColumnSparse must be strictly sorted");
 #endif
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index 9ea9fbd8b45..46b5562ae75 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -373,8 +373,8 @@ struct MinHashImpl
         std::map<UInt64, BytesRef, Comp> values;
     };
 
-    using MaxHeap = Heap<std::less<size_t>>;
-    using MinHeap = Heap<std::greater<size_t>>;
+    using MaxHeap = Heap<std::less<>>;
+    using MinHeap = Heap<std::greater<>>;
 
     static ALWAYS_INLINE inline void ngramHashASCII(
         MinHeap & min_heap,
diff --git a/src/Interpreters/RewriteCountDistinctVisitor.cpp b/src/Interpreters/RewriteCountDistinctVisitor.cpp
index 28950b7a592..a7a26a63460 100644
--- a/src/Interpreters/RewriteCountDistinctVisitor.cpp
+++ b/src/Interpreters/RewriteCountDistinctVisitor.cpp
@@ -12,7 +12,6 @@
 #include <Parsers/Lexer.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserQuery.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 
 namespace DB