diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 7fc049ef3..e52730e50 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -3,6 +3,11 @@
 #include <sys/sysctl.h>
 #endif
 
+
+#if defined(GB_SYSTEM_WINDOWS)
+#define DEFAULT_TO_THREADED_CHECKER
+#endif
+
 enum TargetOsKind {
 	TargetOs_Invalid,
 
@@ -825,7 +830,7 @@ void init_build_context(TargetMetrics *cross_target) {
 	bc->max_align   = metrics->max_align;
 	bc->link_flags  = str_lit(" ");
 
-	#if defined(GB_SYSTEM_WINDOWS)
+	#if defined(DEFAULT_TO_THREADED_CHECKER)
 	bc->threaded_checker = true;
 	#endif
 
diff --git a/src/main.cpp b/src/main.cpp
index a71146ddf..27d69d428 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1226,7 +1226,7 @@ bool parse_build_flags(Array<String> args) {
 							break;
 
 						case BuildFlag_ThreadedChecker:
-							#if defined(GB_SYSTEM_WINDOWS)
+							#if defined(DEFAULT_TO_THREADED_CHECKER)
 							gb_printf_err("-threaded-checker is the default on this platform\n");
 							bad_flags = true;
 							#endif
@@ -1234,7 +1234,7 @@ bool parse_build_flags(Array<String> args) {
 							break;
 
 						case BuildFlag_NoThreadedChecker:
-							#if !defined(GB_SYSTEM_WINDOWS)
+							#if !defined(DEFAULT_TO_THREADED_CHECKER)
 							gb_printf_err("-no-threaded-checker is the default on this platform\n");
 							bad_flags = true;
 							#endif