diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 3acc1811a9..5e2fa12938 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -29,6 +29,8 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
+#include "wx/arrstr.h"
+
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 15825ddc96..988d7bcf87 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -191,7 +191,7 @@ wxSize wxWizardSizer::GetMaxChildSize()
 #endif
 
     wxSize maxOfMin;
-    wxSizerItemList::Node *childNode;
+    wxSizerItemList::compatibility_iterator childNode;
 
     for(childNode = m_children.GetFirst(); childNode;
         childNode = childNode->GetNext())