From 578509c326f6bcc25fba7b71ebb439a165808bc5 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Fri, 27 Dec 2024 12:28:02 +0300
Subject: [PATCH] windows/SDL_tray.c, video/windows/SDL_surface_utils.h: use
 SDL_windows.h

---
 src/tray/windows/SDL_tray.c           | 7 +++----
 src/video/windows/SDL_surface_utils.h | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

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" {