diff --git a/source/basic_types.cpp b/source/basic_types.cpp
index b49dc0bb..629ab81b 100644
--- a/source/basic_types.cpp
+++ b/source/basic_types.cpp
@@ -18,6 +18,8 @@
 #endif
 #include <algorithm>
 
+#include <stdexcept>
+
 namespace nana
 {
 	//class color
diff --git a/source/gui/notifier.cpp b/source/gui/notifier.cpp
index c0567bc5..9ccc3dd4 100644
--- a/source/gui/notifier.cpp
+++ b/source/gui/notifier.cpp
@@ -1,7 +1,7 @@
 /*
 *	Implementation of Notifier
 *	Nana C++ Library(http://www.nanapro.org)
-*	Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
+*	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
 *
 *	Distributed under the Boost Software License, Version 1.0.
 *	(See accompanying file LICENSE_1_0.txt or copy at
@@ -16,7 +16,12 @@
 
 #include <unordered_map>
 #include <unordered_set>
+
+#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
+#include <nana/std_mutex.hpp>
+#else
 #include <mutex>
+#endif
 
 #if defined(NANA_WINDOWS)
 #include <nana/detail/win32/platform_spec.hpp>