diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake
index d84db7a..a0ab089 100644
--- a/CMLibCodeAnalysisClangAnalyze.cmake
+++ b/CMLibCodeAnalysisClangAnalyze.cmake
@@ -1,4 +1,12 @@
-find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check)
+find_program(
+  CLANG_CHECK_EXE
+  NAMES
+    clang-check-13
+    clang-check-12
+    clang-check-11
+    clang-check-10
+    clang-check-9
+    clang-check)
 if(CLANG_CHECK_EXE)
   option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
 endif()
diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake
index 6751f29..4116cbd 100644
--- a/CMLibCodeAnalysisClangTidy.cmake
+++ b/CMLibCodeAnalysisClangTidy.cmake
@@ -1,4 +1,12 @@
-find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy)
+find_program(
+  CLANG_TIDY_EXE
+  NAMES
+    clang-tidy-13
+    clang-tidy-12
+    clang-tidy-11
+    clang-tidy-10
+    clang-tidy-9
+    clang-tidy)
 if(CLANG_TIDY_EXE)
   option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
 endif()
diff --git a/CMLibCodeAnalysisClazy.cmake b/CMLibCodeAnalysisClazy.cmake
index 2090dbb..788df68 100644
--- a/CMLibCodeAnalysisClazy.cmake
+++ b/CMLibCodeAnalysisClazy.cmake
@@ -1,5 +1,12 @@
-find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9
-                                                clang-apply-replacements)
+find_program(
+  CLANG_APPLY_REPLACEMENTS_EXE
+  NAMES
+    clang-apply-replacements-13
+    clang-apply-replacements-12
+    clang-apply-replacements-11
+    clang-apply-replacements-10
+    clang-apply-replacements-9
+    clang-apply-replacements)
 
 find_program(CLAZY_EXE NAMES clazy-standalone)
 
diff --git a/CMLibCodeAnalysisPvsStudio.cmake b/CMLibCodeAnalysisPvsStudio.cmake
index 70a8da5..7f82fb9 100644
--- a/CMLibCodeAnalysisPvsStudio.cmake
+++ b/CMLibCodeAnalysisPvsStudio.cmake
@@ -17,15 +17,17 @@ function(add_pvs_check target)
       add_dependencies(pvs-check pvs-check-${target})
       configure_file("${CMLIB_MODULE_DIR}/hpp/pvs_studio.hpp.in" "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
       get_target_property(target_type ${target} TYPE)
-      if (${target_type} STREQUAL "INTERFACE_LIBRARY")
+      if(${target_type} STREQUAL "INTERFACE_LIBRARY")
         set(target_type INTERFACE)
       else()
         set(target_type PRIVATE)
       endif()
       if(MSVC)
-        target_compile_options(${target} BEFORE ${target_type} /FI "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
+        target_compile_options(${target} BEFORE ${target_type} /FI
+                               "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
       else() # GCC/Clang
-        target_compile_options(${target} BEFORE ${target_type} -include "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
+        target_compile_options(${target} BEFORE ${target_type} -include
+                               "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
       endif()
     else()
       message(STATUS "CMLIB warning:")
diff --git a/thirdparty/cotire.cmake b/thirdparty/cotire.cmake
index 075ec79..18b55d8 100644
--- a/thirdparty/cotire.cmake
+++ b/thirdparty/cotire.cmake
@@ -1136,6 +1136,11 @@ function (cotire_parse_includes _language _scanOutput _ignoredIncludeDirs _honor
 	string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}")
 	# then separate lines
 	string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}")
+	if ("${_language}" STREQUAL "CXX")
+	    # Fix clang9's libc++ errno
+	    message (STATUS "replacing <stdlib.h> with <cstdlib>")
+	    string (REGEX REPLACE "include_next" "include" _scanOutput "${_scanOutput}")
+	endif()
 	list (LENGTH _scanOutput _len)
 	# remove duplicate lines to speed up parsing
 	list (REMOVE_DUPLICATES _scanOutput)