diff --git a/include/wx/defs.h b/include/wx/defs.h
index e418ef41cd..b83a43bd7a 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -350,10 +350,43 @@ typedef short int WXTYPE;
     #endif
 #endif
 
+#ifndef HAVE_TYPE_TRAITS
+    #if defined(__has_include) && __has_include(<type_traits>)
+        #define HAVE_TYPE_TRAITS
+    #endif
+#endif
+
 #ifndef HAVE_TR1_TYPE_TRAITS
-    #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+    #if defined(__has_include) && __has_include(<tr1/type_traits>)
         #define HAVE_TR1_TYPE_TRAITS
     #endif
+    #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+        #define HAVE_TR1_TYPE_TRAITS
+    #endif
+#endif
+
+#ifndef HAVE_STD_UNORDERED_MAP
+    #if defined(__has_include) && __has_include(<unordered_map>)
+        #define HAVE_STD_UNORDERED_MAP
+    #endif
+#endif
+
+#ifndef HAVE_TR1_UNORDERED_MAP
+    #if defined(__has_include) && __has_include(<tr1/unordered_map>)
+        #define HAVE_TR1_UNORDERED_MAP
+    #endif
+#endif
+
+#ifndef HAVE_STD_UNORDERED_SET
+    #if defined(__has_include) && __has_include(<unordered_set>)
+        #define HAVE_STD_UNORDERED_SET
+    #endif
+#endif
+
+#ifndef HAVE_TR1_UNORDERED_SET
+    #if defined(__has_include) && __has_include(<tr1/unordered_set>)
+        #define HAVE_TR1_UNORDERED_SET
+    #endif
 #endif
 
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */