X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9506e775853406953c4b3ecd6f57b85abdafdfd..bdb310a72026e7781cda51fd3fc353cbec9151ed:/src/msw/notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 63d108cf32..b8ac425b2e 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -41,15 +41,13 @@
 #include  <windowsx.h>  // for SetWindowFont
 
 #ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-  #include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
+    #ifdef __GNUWIN32_OLD__
+        #include "wx/msw/gnuwin32/extra.h"
+    #endif
 #endif
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-  #include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>
 #endif
 
 // ----------------------------------------------------------------------------