diff --git a/include/wx/containr.h b/include/wx/containr.h
index 6eaa5d7e32..551c7c63f1 100644
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -13,6 +13,8 @@
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 
+#include "wx/defs.h"
+
 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 #define WX_DECLARE_CONTROL_CONTAINER() \
diff --git a/include/wx/features.h b/include/wx/features.h
index 637a50e77c..13fb102e92 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -66,5 +66,11 @@
     #define wxHAS_UTF8_FONTS
 #endif
 
+/* This is defined when the underlying toolkit handles tab traversal natively.
+   Otherwise we implement it ourselves in wxControlContainer. */
+#ifdef __WXGTK20__
+    #define wxHAS_NATIVE_TAB_TRAVERSAL
+#endif
+
 #endif /*  _WX_FEATURES_H_ */
 
diff --git a/include/wx/window.h b/include/wx/window.h
index 0a704011a7..2dde62f41f 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -62,12 +62,6 @@
     #define wxHAS_NATIVE_ENABLED_MANAGEMENT
 #endif
 
-// This is defined when the underlying toolkit handles tab traversal natively
-// (currently this only works under GTK+ 2)
-#ifdef __WXGTK20__
-    #define wxHAS_NATIVE_TAB_TRAVERSAL
-#endif
-
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------