From 43c5b45f4a65683168a57353c6dc0add58a46a8f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 12 Dec 2025 17:44:34 +0100
Subject: [PATCH] mingw32: fix winsock2.h include

winsock2.h needs to be included before windows.h

> /usr/share/mingw-w64/include/winsock2.h:15:2: error: #warning Please include winsock2.h before windows.h [-Werror=cpp]
>    15 | #warning Please include winsock2.h before windows.h
>       |  ^~~~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xnest/Keyboard.c           | 1 +
 hw/xwin/winmultiwindowicons.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 3477c2a054..d5df9b7947 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -14,6 +14,7 @@ is" without express or implied warranty.
 #include <dix-config.h>
 
 #ifdef WIN32
+#include <X11/Xwinsock.h>
 #include <X11/Xwindows.h>
 #endif
 
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index f5d7ec73e7..7982fab97e 100644
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -39,8 +39,6 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#include <X11/Xwindows.h>
-#include <winsock2.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_image.h>