diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index 1ef9bfe70a..bbfcc893ba 100644
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -15,6 +15,7 @@
 /*!
  * Includes
  */
+#include "wx/spinbutt.h"        // for wxSpinEvent
 
 /*!
  * Forward declarations
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 0ff7c9373a..0ffef62ce3 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -394,7 +394,7 @@ public:
     virtual void SetToolDisabledBitmap(int WXUNUSED(id),
                                        const wxBitmap& WXUNUSED(bitmap)) {}
 
-    
+
     // margins/packing/separation
     // --------------------------
 
@@ -443,7 +443,7 @@ public:
     wxToolBarToolBase *FindById(int toolid) const;
 
     // return true if this is a vertical toolbar, otherwise false
-    bool IsVertical() const { return HasFlag(wxTB_LEFT | wxTB_RIGHT); }
+    bool IsVertical() const;
 
 
     // the old versions of the various methods kept for compatibility
diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 071dac26d3..abb467f5ca 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -125,6 +125,7 @@ void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu)
     m_dropdownMenu = menu;
 }
 
+
 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------
@@ -596,6 +597,12 @@ void wxToolBarBase::SetRows(int WXUNUSED(nRows))
     // nothing
 }
 
+bool wxToolBarBase::IsVertical() const
+{
+    return HasFlag(wxTB_LEFT | wxTB_RIGHT);
+}
+
+
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------