diff --git a/input/input_driver.c b/input/input_driver.c
index f663ae9fe4..03767c49d2 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -62,9 +62,6 @@
 #include "../verbosity.h"
 
 #include "../ai/game_ai.h"
-#if defined(_WIN32)
-#include <winsock2.h>
-#endif
 
 #define HOLD_BTN_DELAY_SEC 2
 
diff --git a/input/input_driver.h b/input/input_driver.h
index 01df42819c..8835a96505 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -32,6 +32,10 @@
 #include "../config.h"
 #endif /* HAVE_CONFIG_H */
 
+#if defined(_WIN32) && !defined(SOCKET)
+#include <winsock2.h>
+#endif
+
 #include "input_defines.h"
 #include "input_types.h"
 #ifdef HAVE_OVERLAY
@@ -284,7 +288,11 @@ struct remote_message
 struct input_remote
 {
 #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD)
+#ifdef _WIN32
+   SOCKET net_fd[MAX_USERS];
+#else
    int net_fd[MAX_USERS];
+#endif
 #endif
    bool state[RARCH_BIND_LIST_END];
 };