diff --git a/include/SDL_events.h b/include/SDL_events.h
index 3899fada1..ae6612e9d 100644
--- a/include/SDL_events.h
+++ b/include/SDL_events.h
@@ -278,10 +278,11 @@ typedef struct SDL_QuitEvent
  */
 typedef struct SDL_UserEvent
 {
-    Uint8 type;         /**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
-    int code;           /**< User defined event code */
-    void *data1;        /**< User defined data pointer */
-    void *data2;        /**< User defined data pointer */
+    Uint8 type;             /**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
+    int code;               /**< User defined event code */
+    void *data1;            /**< User defined data pointer */
+    void *data2;            /**< User defined data pointer */
+    SDL_WindowID windowID;  /**< The associated window if any*/
 } SDL_UserEvent;
 
 /**
diff --git a/include/SDL_video.h b/include/SDL_video.h
index 0dc0876a4..152b3451e 100644
--- a/include/SDL_video.h
+++ b/include/SDL_video.h
@@ -160,7 +160,7 @@ typedef enum
     SDL_WINDOWEVENT_LEAVE,              /**< The window has lost mouse focus */
     SDL_WINDOWEVENT_FOCUS_GAINED,       /**< The window has gained keyboard focus */
     SDL_WINDOWEVENT_FOCUS_LOST,         /**< The window has lost keyboard focus */
-    SDL_WINDOWEVENT_CLOSE,                              /**< The window manager requests that the window be closed */
+    SDL_WINDOWEVENT_CLOSE,              /**< The window manager requests that the window be closed */
 } SDL_WindowEventID;
 
 /**