diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index efccd153a3..295ea3867d 100644
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -19,8 +19,6 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
-#if defined(__WIN95__)
-
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
 public:
@@ -68,7 +66,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
-#endif
-    // __WIN95__
 #endif
     // _WX_SPINBUTT_H_
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index b5a5bb221c..e2c4fd53d6 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -76,7 +76,7 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"
-#elif defined(__WXMSW__)
+#elif defined(__WXMSW__) && defined(__WIN95__)
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"