// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//
 // For compilers that support precompilation, includes "wx.h".
-//
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
-#include "wx/string.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"
+#endif
+
 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 
-#include "wx/window.h"
-#include "wx/joystick.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
     // TODO
     return false;
 }
+
 #endif  // wxUSE_JOYSTICK