diff --git a/.clang-tidy b/.clang-tidy
index 0a47511c34b13e86c655d13cd8bac2518f54d0e0..88e28ad1f4f23eb29dc25ddb2a79c05b72328166 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -23,8 +23,8 @@ Checks: >
     modernize-*, -modernize-pass-by-value
 
 # produce HeaderFilterRegex from core/build-support/lint_exclusions.txt with:
-# echo -n '^('; sed -e 's/*/\.*/g' core/build-support/lint_exclusions.txt | tr '\n' '|'; echo ')$'
-HeaderFilterRegex: '^(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*thirdparty.*|.*src/grpc.*|.*milvus/include.*|.*unittest.*)$'
+# echo -n '^?!('; sed -e 's/*/\.*/g' core/build-support/lint_exclusions.txt | tr '\n' '|'; echo ')$'
+HeaderFilterRegex: '^?!(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*thirdparty.*|.*src/grpc.*|.*milvus/include.*|.*unittest.*)$'
 AnalyzeTemporaryDtors: true
 CheckOptions:
   - key:             google-readability-braces-around-statements.ShortStatementLines
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 17595744d21861593d6b5b4c0ade526651e7c66d..e3d8a47d4161be99b392ab9a80c335665959f253 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -118,7 +118,6 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1" OR CLANG_TIDY_FOUND)
   # with various development tools, such as Vim's YouCompleteMe plugin.
   # See http://clang.llvm.org/docs/JSONCompilationDatabase.html
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-  set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 endif()
 
 #
diff --git a/core/build-support/lint_exclusions.txt b/core/build-support/lint_exclusions.txt
index fe64fe833cbec4922e4423b82e21cae9bdb2c7cb..78e745511761cbe7d4527abc425388c4c9f3470c 100644
--- a/core/build-support/lint_exclusions.txt
+++ b/core/build-support/lint_exclusions.txt
@@ -4,4 +4,4 @@
 *thirdparty*
 *src/grpc*
 *milvus/include*
-*unittest*
\ No newline at end of file
+*unittest*