Index: common/Common.cpp
===================================================================
--- common/Common.cpp	(revision edfd1d0c4704a1fe5d280e8fb985a4f956ff67d2)
+++ common/Common.cpp	(revision 4c202e03e18521e3e047e3fe3bb4fff4072824a6)
@@ -3,8 +3,8 @@
 void set_nonblock(int sock)
 {
-   #ifdef WIN32
+   #if defined WINDOWS
       unsigned long mode = 1;
       ioctlsocket(sock, FIONBIO, &mode);
-   #else
+   #elif defined LINUX
       int flags;
       flags = fcntl(sock, F_GETFL,0);
Index: common/Common.h
===================================================================
--- common/Common.h	(revision edfd1d0c4704a1fe5d280e8fb985a4f956ff67d2)
+++ common/Common.h	(revision 4c202e03e18521e3e047e3fe3bb4fff4072824a6)
@@ -2,6 +2,13 @@
 #define _COMMON_H
 
-#include <fcntl.h>
-#include <assert.h>
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
+#elif defined LINUX
+   #include <fcntl.h>
+   #include <assert.h>
+#endif
 
 void set_nonblock(int sock);
Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision edfd1d0c4704a1fe5d280e8fb985a4f956ff67d2)
+++ common/Player.cpp	(revision 4c202e03e18521e3e047e3fe3bb4fff4072824a6)
@@ -2,5 +2,4 @@
 
 #include <iostream>
-#include <arpa/inet.h>
 
 using namespace std;
Index: common/Player.h
===================================================================
--- common/Player.h	(revision edfd1d0c4704a1fe5d280e8fb985a4f956ff67d2)
+++ common/Player.h	(revision 4c202e03e18521e3e047e3fe3bb4fff4072824a6)
@@ -2,5 +2,13 @@
 #define _PLAYER_H
 
-#include <netinet/in.h>
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
+#elif defined LINUX
+   #include <netinet/in.h>
+#endif
+
 #include <string>