Include <windows.h> from service.h to make it self-contained

Remove now superfluous includes elsewhere.

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,

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"

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