diff --git a/build/codeblocks/nana.layout b/build/codeblocks/nana.layout
index 57a19817..805917bc 100644
--- a/build/codeblocks/nana.layout
+++ b/build/codeblocks/nana.layout
@@ -1,24 +1,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -26,99 +11,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -131,9 +31,9 @@
-
+
-
+
@@ -141,14 +41,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp
index f13f5b94..3607767c 100644
--- a/include/nana/deploy.hpp
+++ b/include/nana/deploy.hpp
@@ -24,7 +24,7 @@
#endif
//Implement workarounds for MinGW
-#if defined(NANA_MINGW) && __GNUC_MINOR__ < 8
+#if defined(NANA_MINGW) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 8)
namespace std
{
//Workaround for no implemenation of std::stoi in MinGW.
diff --git a/source/deploy.cpp b/source/deploy.cpp
index b251b5db..2efd2ac2 100644
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -23,7 +23,7 @@
#include PLATFORM_SPEC_HPP
#endif
-#if defined(NANA_MINGW) && __GNUC_MINOR__ < 8
+#if defined(NANA_MINGW) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 8)
#include
namespace std
{