diff --git a/include/service.h b/include/service.h
index 00c2bb00..49cdfaa3 100644
--- a/include/service.h
+++ b/include/service.h
@@ -34,6 +34,8 @@
 #ifndef SERVICE_H
 #define SERVICE_H
 
+#include <windows.h>
+
 #define DEFAULT_SERVICE_NAME "Empire Server"
 
 extern int install_service(char *program_name, char *service_name,
diff --git a/src/lib/w32/service.c b/src/lib/w32/service.c
index f55d35d5..f80b2eca 100644
--- a/src/lib/w32/service.c
+++ b/src/lib/w32/service.c
@@ -33,13 +33,6 @@
 
 #include <config.h>
 
-/*
- * For WIN32 in empthread.h, winsock2.h is included which interferes
- * with including windows.h, use sys/socket.h instead to prevent a
- * problem
- */
-#include <sys/socket.h>
-
 #include "service.h"
 #include "empthread.h"
 #include "prototypes.h"
diff --git a/src/server/main.c b/src/server/main.c
index d4f5c21d..ca601581 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -46,8 +46,6 @@
 #include <unistd.h>
 
 #if defined(_WIN32)
-#include <winsock2.h>
-#undef NS_ALL
 #include <process.h>
 #include "service.h"
 #endif