diff --git a/.clang-tidy b/.clang-tidy
index 381829cf3a..f45561badb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -7,8 +7,10 @@ CheckOptions:
   misc-include-cleaner.UnusedIncludes: false
   # Headers that declare a symbol but are not the one to include: per-platform
   # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
-  # GTK or pthread one), library internals and forward declarations, CPython's
-  # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and
+  # GTK or pthread one), library internals and forward declarations (MSVC's STL
+  # __msvc_* and the Windows UCRT's corecrt_* included), CPython's headers behind
+  # Python.h (python3.x/ on Linux and macOS, libpython/include/ on Windows),
+  # curl's behind curl.h, oneTBB's behind tbb/, and
   # admesh's stl.h, which the include path also exposes without its directory.
   # Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
   # clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
@@ -27,7 +29,11 @@ CheckOptions:
     .*[/\\]impl[/\\].*;
     .*_fwd\.hpp;
     python3\.[0-9]+[/\\].*;
+    libpython[/\\]include[/\\].*;
     bits[/\\].*;
+    corecrt_.*\.h;
+    __msvc_.*\.hpp;
+    boost[/\\]multiprecision[/\\]fwd\.hpp;
     imconfig\.h;
     expat_external\.h;
     admesh[/\\]stl\.h;
diff --git a/src/libslic3r/OpenVDBUtils.cpp b/src/libslic3r/OpenVDBUtils.cpp
index a7d28dfa4f..d4ac09781d 100644
--- a/src/libslic3r/OpenVDBUtils.cpp
+++ b/src/libslic3r/OpenVDBUtils.cpp
@@ -1,5 +1,7 @@
 #ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include <cstddef>
 #include <openvdb/Types.h>
 #include <Eigen/Core>
@@ -12,7 +14,6 @@
 #include "libslic3r.h"
 #include <utility>
 #include <openvdb/Metadata.h>
-#endif
 #include "OpenVDBUtils.hpp"
 
 #ifdef _MSC_VER
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 6e11f8bc2d..e07dbe9389 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -1,3 +1,9 @@
+#ifdef _WIN32
+// Keep this first. A header below reaches boost/regex, whose w32_regex_traits
+// needs the Win32 types declared already.
+#include <Windows.h>
+#endif
+
 #include "PrintBase.hpp"
 #include <utility>
 #include <string>
@@ -47,11 +53,6 @@
 #include <boost/thread/lock_types.hpp>
 #include <iterator>
 #include "TriangleMesh.hpp"
-#ifdef _WIN32
-// Keep this first. A header below reaches boost/regex, whose w32_regex_traits
-// needs the Win32 types declared already.
-#include <Windows.h>
-#endif
 #include "Config.hpp"
 #include "Exception.hpp"
 #include "Print.hpp"
diff --git a/src/libslic3r/SLA/SupportTreeBuilder.cpp b/src/libslic3r/SLA/SupportTreeBuilder.cpp
index 68a8a70eb6..635b5452d1 100644
--- a/src/libslic3r/SLA/SupportTreeBuilder.cpp
+++ b/src/libslic3r/SLA/SupportTreeBuilder.cpp
@@ -1,5 +1,7 @@
 #ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include "libslic3r/SLA/SpatIndex.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/SLA/Pad.hpp"
@@ -14,7 +16,6 @@
 #include <algorithm>
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/SLA/SupportTree.hpp"
-#endif
 
 #include <libslic3r/SLA/SupportTreeBuilder.hpp>
 #include <libslic3r/SLA/SupportTreeBuildsteps.hpp>
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index e0d839153e..066656c9ed 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -1,10 +1,3 @@
-#include <optional>
-#include <string>
-#include <cstddef>
-#include <cassert>
-#include <sstream>
-#include <locale.h>
-#include <clocale>
 #ifdef _WIN32
 	#include <windows.h>
 	#include <boost/nowide/convert.hpp>
@@ -13,6 +6,14 @@
 	#include <pthread.h>
 #endif
 
+#include <optional>
+#include <string>
+#include <cstddef>
+#include <cassert>
+#include <sstream>
+#include <locale.h>
+#include <clocale>
+
 #include <atomic>
 #include <condition_variable>
 #include <mutex>