diff --git a/.clang-tidy b/.clang-tidy
index 3903911a277..0dacf813c7e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -10,7 +10,7 @@
 
 # TODO Let clang-tidy check headers in further directories
 #      --> HeaderFilterRegex: '^.*/(src|base|programs|utils)/.*(h|hpp)$'
-HeaderFilterRegex: '^.*/(base)/.*(h|hpp)$'
+HeaderFilterRegex: '^.*/(base|programs|utils)/.*(h|hpp)$'
 
 Checks: '*,
     -abseil-*,
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
index 48f4b0fab09..27fedd5d9e8 100644
--- a/programs/copier/Internals.h
+++ b/programs/copier/Internals.h
@@ -102,7 +102,7 @@ struct TaskStateWithOwner
         return TaskStateWithOwner(state, owner).toString();
     }
 
-    String toString()
+    String toString() const
     {
         WriteBufferFromOwnString wb;
         wb << static_cast<UInt32>(state) << "\n" << escape << owner;
diff --git a/programs/copier/ZooKeeperStaff.h b/programs/copier/ZooKeeperStaff.h
index bbdec230d2d..c15db73f060 100644
--- a/programs/copier/ZooKeeperStaff.h
+++ b/programs/copier/ZooKeeperStaff.h
@@ -180,7 +180,7 @@ public:
                     auto logger = getLogger("ClusterCopier");
                     if (rsp.error == Coordination::Error::ZOK)
                     {
-                        switch (rsp.type)
+                        switch (rsp.type) /// NOLINT(bugprone-switch-missing-default-case)
                         {
                             case Coordination::CREATED:
                                 LOG_DEBUG(logger, "CleanStateClock change: CREATED, at {}", rsp.path);
diff --git a/programs/odbc-bridge/ODBCPooledConnectionFactory.h b/programs/odbc-bridge/ODBCPooledConnectionFactory.h
index b70e45f2b9d..c4e3d4c12c6 100644
--- a/programs/odbc-bridge/ODBCPooledConnectionFactory.h
+++ b/programs/odbc-bridge/ODBCPooledConnectionFactory.h
@@ -40,7 +40,6 @@ public:
 
     explicit ConnectionHolder(const String & connection_string_)
         : pool(nullptr)
-        , connection()
         , connection_string(connection_string_)
     {
         updateConnection();
@@ -143,7 +142,7 @@ public:
     {
         std::lock_guard lock(mutex);
 
-        if (!factory.count(connection_string))
+        if (!factory.contains(connection_string))
             factory.emplace(std::make_pair(connection_string, std::make_shared<nanodbc::Pool>(pool_size)));
 
         auto & pool = factory[connection_string];
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index c45291ba52c..f2c5dcc0f6d 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -184,7 +184,7 @@ static bool jemallocOptionEnabled(const char *name)
     return value;
 }
 #else
-static bool jemallocOptionEnabled(const char *) { return 0; }
+static bool jemallocOptionEnabled(const char *) { return false; }
 #endif
 
 int mainEntryClickHouseServer(int argc, char ** argv)
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
index 86941040021..fed5c6b4d22 100644
--- a/src/Backups/registerBackupEngineS3.cpp
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -15,8 +15,6 @@
 
 namespace DB
 {
-namespace fs = std::filesystem;
-
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -65,13 +63,13 @@ void registerBackupEngineS3(BackupFactory & factory)
             secret_access_key = config.getString(config_prefix + ".secret_access_key", "");
 
             if (config.has(config_prefix + ".filename"))
-                s3_uri = fs::path(s3_uri) / config.getString(config_prefix + ".filename");
+                s3_uri = std::filesystem::path(s3_uri) / config.getString(config_prefix + ".filename");
 
             if (args.size() > 1)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Backup S3 requires 1 or 2 arguments: named_collection, [filename]");
 
             if (args.size() == 1)
-                s3_uri = fs::path(s3_uri) / args[0].safeGet<String>();
+                s3_uri = std::filesystem::path(s3_uri) / args[0].safeGet<String>();
         }
         else
         {
diff --git a/utils/memcpy-bench/FastMemcpy.h b/utils/memcpy-bench/FastMemcpy.h
index 85d09c5f53e..650a6761771 100644
--- a/utils/memcpy-bench/FastMemcpy.h
+++ b/utils/memcpy-bench/FastMemcpy.h
@@ -33,9 +33,11 @@
 #endif
 #endif
 
+/// NOLINTBEGIN(modernize-use-using)
 typedef __attribute__((__aligned__(1))) uint16_t uint16_unaligned_t;
 typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
 typedef __attribute__((__aligned__(1))) uint64_t uint64_unaligned_t;
+/// NOLINTEND(modernize-use-using)
 
 //---------------------------------------------------------------------
 // fast copy for different sizes
@@ -98,7 +100,7 @@ __attribute__((__no_sanitize__("undefined"))) inline void *memcpy_tiny(void * __
     unsigned char *dd = ((unsigned char*)dst) + size;
     const unsigned char *ss = ((const unsigned char*)src) + size;
 
-    switch (size)
+    switch (size) /// NOLINT(bugprone-switch-missing-default-case)
     {
     case 64:
         memcpy_sse2_64(dd - 64, ss - 64);
@@ -652,7 +654,7 @@ __attribute__((__no_sanitize__("undefined"))) inline void *memcpy_tiny(void * __
 //---------------------------------------------------------------------
 // main routine
 //---------------------------------------------------------------------
-void* memcpy_fast_sse(void * __restrict destination, const void * __restrict source, size_t size)
+void* memcpy_fast_sse(void * __restrict destination, const void * __restrict source, size_t size) /// NOLINT(misc-definitions-in-headers)
 {
     unsigned char *dst = (unsigned char*)destination;
     const unsigned char *src = (const unsigned char*)source;
diff --git a/utils/memcpy-bench/FastMemcpy_Avx.h b/utils/memcpy-bench/FastMemcpy_Avx.h
index ee7d4e19536..aecf8abbe03 100644
--- a/utils/memcpy-bench/FastMemcpy_Avx.h
+++ b/utils/memcpy-bench/FastMemcpy_Avx.h
@@ -103,7 +103,7 @@ static INLINE void *memcpy_tiny_avx(void * __restrict dst, const void * __restri
     unsigned char *dd = reinterpret_cast<unsigned char *>(dst) + size;
     const unsigned char *ss = reinterpret_cast<const unsigned char*>(src) + size;
 
-    switch (size)
+    switch (size) /// NOLINT(bugprone-switch-missing-default-case)
     {
     case 128: memcpy_avx_128(dd - 128, ss - 128); [[fallthrough]];
     case 0:  break;
@@ -371,7 +371,7 @@ static INLINE void *memcpy_tiny_avx(void * __restrict dst, const void * __restri
 //---------------------------------------------------------------------
 // main routine
 //---------------------------------------------------------------------
-void* memcpy_fast_avx(void * __restrict destination, const void * __restrict source, size_t size)
+void* memcpy_fast_avx(void * __restrict destination, const void * __restrict source, size_t size) /// NOLINT(misc-definitions-in-headers)
 {
     unsigned char *dst = reinterpret_cast<unsigned char*>(destination);
     const unsigned char *src = reinterpret_cast<const unsigned char*>(source);