X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..85f3749fd2c61a7cdf18b41a8feb616ba6b5e07c:/src/msw/joystick.cpp?ds=sidebyside

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 5fa69fd9ce..58b7631915 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -20,9 +20,11 @@
 #pragma hdrstop
 #endif
 
-#include <windows.h>
+#include "wx/string.h"
+#include "wx/window.h"
+#include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
@@ -32,9 +34,11 @@ typedef UINT MMRESULT;
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #endif
+#endif
 
 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)