diff --git a/include/nana/c++defines.hpp b/include/nana/c++defines.hpp
index a2cf5e0e..18b15f26 100644
--- a/include/nana/c++defines.hpp
+++ b/include/nana/c++defines.hpp
@@ -38,9 +38,10 @@
 
 #ifndef NANA_CXX_DEFINES_INCLUDED
 #define NANA_CXX_DEFINES_INCLUDED
-
+#define STD_FILESYSTEM_NOT_SUPPORTED
 //C++ language
 #if defined(_MSC_VER)
+#   undef STD_FILESYSTEM_NOT_SUPPORTED
 #	if (_MSC_VER < 1900)
 #		//Nana defines some macros for lack of support of keywords
 #		define _ALLOW_KEYWORD_MACROS
@@ -130,6 +131,10 @@
 		#endif
 	#endif
 
+    #if ((__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3 ) ) )
+		#undef STD_FILESYSTEM_NOT_SUPPORTED
+    #endif
+
 	#if (__GNUC__ == 4)
 		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
 			#define STD_THREAD_NOT_SUPPORTED