diff --git a/include/nana/std_mutex.hpp b/include/nana/std_mutex.hpp
index 38c07aaf..55f486e4 100644
--- a/include/nana/std_mutex.hpp
+++ b/include/nana/std_mutex.hpp
@@ -14,8 +14,12 @@
 #include <cstdio>
 // http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53
 //#define EPROTO          71      /* Protocol error */
+#ifdef _GLIBCXX_HAS_GTHREADS
+#    include <thread>
+#else
 #include <mingw.thread.h>
 #include <mingw.mutex.h>
+#endif
 #else
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
diff --git a/include/nana/std_thread.hpp b/include/nana/std_thread.hpp
index e1df7ef7..87db1e5a 100644
--- a/include/nana/std_thread.hpp
+++ b/include/nana/std_thread.hpp
@@ -6,7 +6,11 @@
 
 #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
 
-#include <mingw.thread.h>
+#ifdef _GLIBCXX_HAS_GTHREADS
+#    include <thread>
+#else
+#    include <mingw.thread.h>
+#endif
 #else
 #include <boost/thread.hpp>
 namespace std