diff --git a/include/nana/std_condition_variable.hpp b/include/nana/std_condition_variable.hpp
index 72399b59..0c9813fc 100644
--- a/include/nana/std_condition_variable.hpp
+++ b/include/nana/std_condition_variable.hpp
@@ -3,10 +3,14 @@
 #include <nana/config.hpp>
 
 #if defined(STD_THREAD_NOT_SUPPORTED)
+#if defined(USE_github_com_meganz_mingw_std_threads)
+    #include <mingw.condition_variable.h>
+#else
 #include <boost/thread/condition_variable.hpp>
 namespace std
 {
     typedef boost::condition_variable condition_variable;
 }
-#endif
+#endif  // (USE_github_com_meganz_mingw_std_threads)
+#endif // (STD_THREAD_NOT_SUPPORTED)
 #endif // NANA_STD_CONDITION_VARIABLE_HPP
diff --git a/include/nana/std_mutex.hpp b/include/nana/std_mutex.hpp
index 9fdebfc6..5eb6528a 100644
--- a/include/nana/std_mutex.hpp
+++ b/include/nana/std_mutex.hpp
@@ -3,6 +3,20 @@
 #include <nana/config.hpp>
 
 #if defined(STD_THREAD_NOT_SUPPORTED)
+
+#if defined(USE_github_com_meganz_mingw_std_threads)
+#include <windows.h>
+#include <mutex>
+#include <condition_variable>
+#include <thread>
+#include <pthread.h>
+#include <errno.h>
+#include <cstdio>
+// http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53
+#define EPROTO          71      /* Protocol error */
+#include <mingw.thread.h>
+#include <mingw.mutex.h>
+#else
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/locks.hpp>
@@ -18,5 +32,6 @@ namespace std
     typedef boost::mutex mutex;
     typedef boost::recursive_mutex recursive_mutex;
 }
-#endif
+#endif  // (USE_github_com_meganz_mingw_std_threads)
+#endif // (STD_THREAD_NOT_SUPPORTED)
 #endif // NANA_STD_MUTEX_HPP
diff --git a/include/nana/std_thread.hpp b/include/nana/std_thread.hpp
index 572193ac..321b3728 100644
--- a/include/nana/std_thread.hpp
+++ b/include/nana/std_thread.hpp
@@ -3,11 +3,15 @@
 #include <nana/config.hpp>
 
 #if defined(STD_THREAD_NOT_SUPPORTED)
+
+#if defined(USE_github_com_meganz_mingw_std_threads)
+#include <mingw.thread.h>
+#else
 #include <boost/thread.hpp>
 namespace std
 {
     typedef boost::thread thread;
 }
-#endif
-
+#endif  // (USE_github_com_meganz_mingw_std_threads)
+#endif // (STD_THREAD_NOT_SUPPORTED)
 #endif // NANA_STD_THREAD_HPP
diff --git a/source/internationalization.cpp b/source/internationalization.cpp
index 56bc327e..c2e47e5d 100644
--- a/source/internationalization.cpp
+++ b/source/internationalization.cpp
@@ -14,9 +14,16 @@
 #include <nana/gui/widgets/widget.hpp>
 #include <unordered_map>
 #include <fstream>
-#include <sstream>
-#include <memory>
+#include <sstream>   // Warning:(17, 1) [unused] Unused import statement
+#include <memory>    // Warning:(17, 1) [unused] Unused import statement
+
+#if defined(STD_THREAD_NOT_SUPPORTED)
+#include <nana/std_mutex.hpp>
+#else
 #include <mutex>
+#endif
+
+
 #include <map>
 
 namespace nana
@@ -68,7 +75,7 @@ namespace nana
 						bool escape = false;
 						for (auto i = read_ptr_ + 1; i != end_ptr_; ++i)
 						{
-							if (escape)
+							if (escape)  // Warning:(78, 12) Condition is always false
 							{
 								escape = false;
 								continue;
@@ -261,8 +268,9 @@ namespace nana
 			{
 				auto result = mgr.table.emplace(wd, std::move(eval));
 				result.first->second.destroy = nana::API::events(wd).destroy([wd]{
-					auto & mgr = get_eval_manager();
-					std::lock_guard<std::recursive_mutex> lock(mgr.mutex);
+					auto & mgr = get_eval_manager();  // Warning:(271, 13) Local 'mgr' hides previous declaration
+					std::lock_guard<std::recursive_mutex> lock(mgr.mutex); // Local 'lock' hides previous
+
 					mgr.table.erase(wd);
 				});
 			}
diff --git a/source/threads/pool.cpp b/source/threads/pool.cpp
index aa9bd461..d15180d5 100644
--- a/source/threads/pool.cpp
+++ b/source/threads/pool.cpp
@@ -17,8 +17,9 @@
 #include <vector>
 
 #if defined(STD_THREAD_NOT_SUPPORTED)
-    #include <nana/std_condition_variable.hpp>
     #include <nana/std_mutex.hpp>
+    #include <nana/std_condition_variable.hpp>
+
 #else
     #include <condition_variable>
     #include <mutex>