diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index 5ef4ae4e..f3c99762 100644
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -55,6 +55,7 @@
 #include "prototypes.h"
 
 #if defined(_WIN32) && defined(_EMPTH_WIN32)
+#include <winsock2.h>
 #include <windows.h>
 #include <process.h>
 
diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index 7962466a..fe97149e 100644
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -52,7 +52,7 @@
 #include <stdlib.h>		/* malloc calloc free */
 
 #if defined(_WIN32)
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #include "misc.h"
diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index ba2ca2e9..228c0ce4 100644
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -53,7 +53,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #else
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 #include <signal.h>
 #include <errno.h>
diff --git a/src/server/Makefile b/src/server/Makefile
index c12388dd..7b1f2775 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -82,7 +82,7 @@ emp_server.exe: $(NTOBJS) $(NTLIBS)
         /NOD /DEBUG:full /DEBUGTYPE:cv /MACHINE:IX86 /NOLOGO \
         $(NTOBJS) $(NTLIBS) \
         kernel32.lib \
-        wsock32.lib \
+        ws2_32.lib \
         libcmt.lib \
         oldnames.lib \
         advapi32.lib
diff --git a/src/server/main.c b/src/server/main.c
index 4acc8dd6..44ab031e 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -46,7 +46,7 @@
 #include <string.h>
 
 #if defined(_WIN32)
-#include <winsock.h>
+#include <winsock2.h>
 #include <process.h>
 #include "../lib/gen/getopt.h"
 #include "service.h"