diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index a38fa3c585..7653e09b36 100644
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -20,6 +20,8 @@
 #include "wx/string.h"
 #include "wx/hashmap.h"
 
+#if wxABI_VERSION >= 20602
+
 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,
@@ -88,6 +90,8 @@ private:
     wxShadowObjectFields    m_fields;
 };
 
+#endif // wxABI_VERSION
+
 // ----------------------------------------------------------------------------
 
 // what kind of client data do we have?
diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index ee6185750a..e6f4f5faac 100644
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -86,7 +86,9 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
+#if wxABI_VERSION >= 20602
 protected:
+#endif
     void FinishLayout();
 
 private: