diff --git a/src/tray/windows/SDL_tray.c b/src/tray/windows/SDL_tray.c
index d19c690b5b..2a623db22e 100644
--- a/src/tray/windows/SDL_tray.c
+++ b/src/tray/windows/SDL_tray.c
@@ -21,13 +21,12 @@
 
 #include "SDL_internal.h"
 
-#include "../../video/windows/SDL_surface_utils.h"
-
-#include <windows.h>
+#include "../../core/windows/SDL_windows.h"
 #include <windowsx.h>
 #include <shellapi.h>
+#include <stdlib.h> /* FIXME: for mbstowcs_s, wcslen */
 
-#include <stdlib.h>
+#include "../../video/windows/SDL_surface_utils.h"
 
 #ifndef NOTIFYICON_VERSION_4
 #define NOTIFYICON_VERSION_4 4
diff --git a/src/video/windows/SDL_surface_utils.h b/src/video/windows/SDL_surface_utils.h
index 5c05a4c8d1..ab9a455aac 100644
--- a/src/video/windows/SDL_surface_utils.h
+++ b/src/video/windows/SDL_surface_utils.h
@@ -23,7 +23,7 @@
 #ifndef SDL_surface_utils_h_
 #define SDL_surface_utils_h_
 
-#include <windows.h>
+#include "../../core/windows/SDL_windows.h"
 
 #ifdef __cplusplus
 extern "C" {