diff --git a/freeglut/freeglut/src/Common/freeglut_internal.h b/freeglut/freeglut/src/Common/freeglut_internal.h
index 68466c4..7199da7 100644
--- a/freeglut/freeglut/src/Common/freeglut_internal.h
+++ b/freeglut/freeglut/src/Common/freeglut_internal.h
@@ -813,17 +813,6 @@ struct tagSFG_PlatformJoystick
 };
 #endif
 
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    define _JS_MAX_AXES  8
-typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
-struct tagSFG_PlatformJoystick
-{
-    JOYCAPS     jsCaps;
-    JOYINFOEX   js;
-    UINT        js_id;
-};
-#endif
-
 #if TARGET_HOST_POSIX_X11
 #    define _JS_MAX_AXES 16
 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
diff --git a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
index c83f231..4f8aaba 100644
--- a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
+++ b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
@@ -49,6 +49,20 @@ struct tagSFG_PlatformContext
 };
 
 
+/* Joystick-Specific Definitions */
+#if !defined(_WIN32_WCE)
+#    define _JS_MAX_AXES  8
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
+    JOYCAPS     jsCaps;
+    JOYINFOEX   js;
+    UINT        js_id;
+};
+#endif
+
+
+
 /* Function to be called on exit */
 extern void (__cdecl *__glutExitFunc)( int return_value );