diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 2fcef5de82..fe1facb7d5 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>