diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66164782d2f551c03012038471f15e008e40e506..ed88fc0799c1eafc9464870ad5092bd66e49a1b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,7 @@ if(LINTING)
         message(STATUS "clang-tidy: ${clang_tidy}")
         set(_CMAKE_CXX_CLANG_TIDY
             "--warnings-as-errors=*"
+            "--header-filter=caosdb/.*[^\\\(\.pb\.h\\\)]$"
             "--fix")
         set(_CMAKE_CXX_CLANG_TIDY_CHECKS
           "--checks=*,-fuchsia-*,-llvmlibc-*,-llvm-else-after-return,-readability-else-after-return,-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cert-err58-cpp")
@@ -122,7 +123,7 @@ if(LINTING)
             COMMAND ${iwyu}
             ARGS ${_CMAKE_CXX_INCLUDE_WHAT_YOU_USE} "-I${_OCTINCLUDEDIR}"
             "-std=c++17" "-I/usr/include" ${_MKOCTFILE_INCLUDES}
-            ${OCTAVE_CAOSDB_SRC}
+            ${OCTAVE_CAOSDB_SRC} "||" "true"
             DEPENDS ${OCTAVE_CAOSDB_SRC})
     endif()
 
diff --git a/src/caosdb.cpp b/src/caosdb.cpp
index added8465e231fc361d743364bab7a0aed6b0bf0..5fbc38a7d49affa1f15553c636102a2f7f1e4372 100644
--- a/src/caosdb.cpp
+++ b/src/caosdb.cpp
@@ -1,11 +1,11 @@
-#include <mex.h>               // for mxArray, mexFunction
-#include <string.h>            // for strcmp
-#include <memory>              // for unique_ptr, __shared_ptr_access, shar...
-#include <string>              // for allocator, char_traits, operator+
 #include "caosdb/connection.h" // for Connection, ConnectionManager
 #include "caosdb/constants.h"  // for LIBCAOSDB_VERSION_MAJOR, LIBCAOSDB_VE...
 #include "caosdb/info.h"       // for VersionInfo
+#include "mex.h"               // for mxArray, mexFunction
 #include "mexproto.h"          // for mexPrintf, mxCreateString, mxGetChars
+#include <cstring>             // for strcmp
+#include <memory>              // for unique_ptr, __shared_ptr_access, shar...
+#include <string>              // for allocator, char_traits, operator+
 
 auto print_version() -> const char *;
 void print_usage();