diff --git a/include/wx/wx.h b/include/wx/wx.h
index 53ce696f50..44756a0846 100644
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -32,6 +32,7 @@
 #if wxUSE_GUI
 
 #include "wx/window.h"
+#include "wx/containr.h"
 #include "wx/panel.h"
 #include "wx/toplevel.h"
 #include "wx/frame.h"
diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 700d9eb782..020bc20ca1 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -30,10 +30,9 @@
     #include "wx/window.h"
     #include "wx/scrolbar.h"
     #include "wx/radiobut.h"
+    #include "wx/containr.h"
 #endif //WX_PRECOMP
 
-#include "wx/containr.h"
-
 // trace mask for focus messages
 #define TRACE_FOCUS _T("focus")
 
diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 454f5dc1d8..e15d79bf81 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -31,10 +31,9 @@
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/panel.h"
+    #include "wx/containr.h"
 #endif
 
-#include "wx/containr.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index dd73be5b4c..331103395a 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/containr.h"
 #endif
 
-#include "wx/containr.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
@@ -165,7 +165,7 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
     EVT_CHAR(wxComboBoxText::OnChar)
     EVT_KEY_UP(wxComboBoxText::OnKeyUp)
-    EVT_TEXT(-1, wxComboBoxText::OnText)
+    EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
@@ -228,7 +228,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
@@ -676,4 +676,4 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
     return noErr ;
 }
 
-#endif
+#endif // wxUSE_COMBOBOX
diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 9e258d0e54..a4dd944e31 100644
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -12,14 +12,14 @@
 
 #if wxUSE_SPINCTRL
 
-#include "wx/spinbutt.h"
+#include "wx/spinctrl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
+    #include "wx/containr.h"
 #endif
 
-#include "wx/spinctrl.h"
-#include "wx/containr.h"
+#include "wx/spinbutt.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -39,7 +39,7 @@ class wxSpinCtrlText : public wxTextCtrl
 {
 public:
     wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
-        : wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, -1))
+        : wxTextCtrl(spin , wxID_ANY, value, wxDefaultPosition, wxSize(40, wxDefaultCoord))
     {
         m_spin = spin;
 
@@ -92,7 +92,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
-    EVT_TEXT(-1, wxSpinCtrlText::OnTextChange)
+    EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -137,7 +137,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
-    EVT_SPIN(-1, wxSpinCtrlButton::OnSpinButton)
+    EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
@@ -179,7 +179,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     {
-        return FALSE;
+        return false;
     }
 
     // the string value overrides the numeric one (for backwards compatibility
@@ -200,11 +200,11 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
 
-    if ( size.x == -1 ){
+    if ( size.x == wxDefaultCoord ){
         csize.x = m_text->GetSize().x + MARGIN + m_btn->GetSize().x ;
     }
 
-    if ( size.y == -1 ) {
+    if ( size.y == wxDefaultCoord ) {
         csize.y = m_text->GetSize().y + 2 * TEXTBORDER ; //allow for text border highlights
         if ( m_btn->GetSize().y > csize.y )
             csize.y = m_btn->GetSize().y ;
@@ -295,13 +295,13 @@ bool wxSpinCtrl::GetTextValue(int *val) const
     if ( !m_text->GetValue().ToLong(&l) )
     {
         // not a number at all
-        return FALSE;
+        return false;
     }
 
     if ( l < GetMin() || l > GetMax() )
     {
         // out of range
-        return FALSE;
+        return false;
     }
 
     *val = l;