+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/joystick.h
+// Purpose: wxJoystick base header
+// Author: wxWidgets Team
+// Modified by:
+// Created:
+// Copyright: (c) wxWidgets Team
+// RCS-ID: $Id$
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
#ifndef _WX_JOYSTICK_H_BASE_
#define _WX_JOYSTICK_H_BASE_
+#include "wx/defs.h"
+
#if wxUSE_JOYSTICK
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
#include "wx/msw/joystick.h"
#elif defined(__WXMOTIF__)
#include "wx/unix/joystick.h"
#elif defined(__WXX11__)
#include "wx/unix/joystick.h"
#elif defined(__DARWIN__)
-#include "wx/mac/corefoundation/joystick.h"
+#include "wx/osx/core/joystick.h"
#elif defined(__WXMAC__)
-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"
#elif defined(__WXPM__)
#include "wx/os2/joystick.h"
#endif