diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 9b8f2dca23..5df97b19ae 100644
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/os2/gauge.h
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
@@ -12,9 +12,7 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
-#include "wx/control.h"
-
-class WXDLLEXPORT wxGauge: public wxControl
+class WXDLLEXPORT wxGauge: public wxGaugeBase
 {
 public:
     inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }
@@ -78,4 +76,3 @@ private:
 }; // end of CLASS wxGauge
 
 #endif // _WX_GAUGE_H_
-
diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index f0dda60e50..9c95081918 100644
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -27,7 +27,7 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxGaugeBase)
 
 MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
                                  UINT uMessage,