diff --git a/mingw-compat/condition_variable b/mingw-compat/condition_variable
index 4f7c75b..445b6ce 100644
--- a/mingw-compat/condition_variable
+++ b/mingw-compat/condition_variable
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <condition_variable>
+
+#if __GNUC__ < 12
 #include "mingw.condition_variable.h"
+#endif
diff --git a/mingw-compat/future b/mingw-compat/future
index 4a7c14e..940b84c 100644
--- a/mingw-compat/future
+++ b/mingw-compat/future
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <future>
+
+#if __GNUC__ < 12
 #include "mingw.future.h"
+#endif
diff --git a/mingw-compat/invoke b/mingw-compat/invoke
index abf27da..ac60fed 100644
--- a/mingw-compat/invoke
+++ b/mingw-compat/invoke
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <invoke>
+
+#if __GNUC__ < 12
 #include "mingw.invoke.h"
+#endif
diff --git a/mingw-compat/latch b/mingw-compat/latch
new file mode 100644
index 0000000..3f3eb0a
--- /dev/null
+++ b/mingw-compat/latch
@@ -0,0 +1,9 @@
+// Copyright 2023 Filipe Coelho <falktx@falktx.com>
+// SPDX-License-Identifier: 0BSD OR ISC
+
+#pragma once
+#include_next <latch>
+
+#if __GNUC__ < 12
+#include "mingw.latch.h"
+#endif
diff --git a/mingw-compat/mutex b/mingw-compat/mutex
index 1e62929..75098c1 100644
--- a/mingw-compat/mutex
+++ b/mingw-compat/mutex
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <mutex>
+
+#if __GNUC__ < 12
 #include "mingw.mutex.h"
+#endif
diff --git a/mingw-compat/shared_mutex b/mingw-compat/shared_mutex
index cde69f9..c72f9df 100644
--- a/mingw-compat/shared_mutex
+++ b/mingw-compat/shared_mutex
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <shared_mutex>
+
+#if __GNUC__ < 12
 #include "mingw.shared_mutex.h"
+#endif
diff --git a/mingw-compat/thread b/mingw-compat/thread
index 09a7758..d2c5b5d 100644
--- a/mingw-compat/thread
+++ b/mingw-compat/thread
@@ -3,4 +3,7 @@
 
 #pragma once
 #include_next <thread>
+
+#if __GNUC__ < 12
 #include "mingw.thread.h"
+#endif
diff --git a/setup/versions.sh b/setup/versions.sh
index 29402cf..e2ad115 100644
--- a/setup/versions.sh
+++ b/setup/versions.sh
@@ -37,7 +37,7 @@ LIBSNDFILE_URL=https://github.com/libsndfile/libsndfile/releases/download/${LIBS
 LIBSAMPLERATE_VERSION=0.1.9
 LIBSAMPLERATE_URL=http://www.mega-nerd.com/SRC
 
-MINGW_STD_THREADS_VERSION=6c2061b7da41d6aa1b2162ff4383ec3ece864bc6
+MINGW_STD_THREADS_VERSION=c931bac289dd431f1dd30fc4a5d1a7be36668073
 MINGW_STD_THREADS_URL=https://github.com/meganz/mingw-std-threads.git
 
 ZLIB_VERSION=cacf7f1d4e3d44d871b605da3b647f07d718623f # 1.2.11