Index: common/Common.cpp
===================================================================
--- common/Common.cpp	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Common.cpp	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -3,9 +3,4 @@
 #include <sstream>
 #include <cmath>
-
-#if defined WINDOWS
-   #include <Windows.h>
-#endif
-
 #include <ctime>
 
Index: common/Common.h
===================================================================
--- common/Common.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Common.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -6,5 +6,5 @@
 #if defined WINDOWS
    #include <winsock2.h>
-   #include <WS2tcpip.h>
+   #include <ws2tcpip.h>
 #elif defined LINUX
    #include <fcntl.h>
Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Game.cpp	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -2,6 +2,4 @@
 
 #include <allegro5/allegro_primitives.h>
-
-#include "Common.h"
 
 using namespace std;
@@ -78,60 +76,2 @@
    this->blueScore = score;
 }
-
-void Game::drawPlayers(ALLEGRO_FONT* font, unsigned int curPlayerId) {
-   map<unsigned int, Player*>::iterator it;
-
-   Player* p;
-   POSITION pos;
-   ALLEGRO_COLOR color;
-
-   for(it = players.begin(); it != players.end(); it++)
-   {
-      p = it->second;
-
-      if (p->isDead)
-         continue;
-
-      pos = mapToScreen(p->pos.toInt());
-
-      if (p->id == curPlayerId)
-         al_draw_filled_circle(pos.x, pos.y, 14, al_map_rgb(0, 0, 0));
-      
-      if (p->team == 0)
-         color = al_map_rgb(0, 0, 255);
-      else if (p->team == 1)
-         color = al_map_rgb(255, 0, 0);
-      
-      al_draw_filled_circle(pos.x, pos.y, 12, color);
-
-      // draw player class
-      int fontHeight = al_get_font_line_height(font);
-
-      string strClass;
-      switch (p->playerClass) {
-      case Player::CLASS_WARRIOR:
-         strClass = "W";
-         break;
-      case Player::CLASS_RANGER:
-         strClass = "R";
-         break;
-      case Player::CLASS_NONE:
-         strClass = "";
-         break;
-      default:
-         strClass = "";
-         break;
-      }
-      al_draw_text(font, al_map_rgb(0, 0, 0), pos.x, pos.y-fontHeight/2, ALLEGRO_ALIGN_CENTRE, strClass.c_str());
-
-      // draw player health
-      al_draw_filled_rectangle(pos.x-12, pos.y-24, pos.x+12, pos.y-16, al_map_rgb(0, 0, 0));
-      if (p->maxHealth != 0)
-         al_draw_filled_rectangle(pos.x-11, pos.y-23, pos.x-11+(22*p->health)/p->maxHealth, pos.y-17, al_map_rgb(255, 0, 0));
-
-      if (p->hasBlueFlag)
-         al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(0, 0, 255));
-      else if (p->hasRedFlag)
-         al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(255, 0, 0));
-   }
-}
Index: common/Game.h
===================================================================
--- common/Game.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Game.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -4,13 +4,10 @@
 #include "Compiler.h"
 
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <netinet/in.h>
-#endif
-
 #include <string>
 #include <map>
+
+#ifdef WINDOWS
+   #define WIN32_LEAN_AND_MEAN
+#endif
 
 #include <allegro5/allegro_font.h>
@@ -48,6 +45,4 @@
    void setBlueScore(int score);
    void setRedScore(int score);
-
-   void drawPlayers(ALLEGRO_FONT* font, unsigned int curPlayerId);
 };
 
Index: common/MessageContainer.cpp
===================================================================
--- common/MessageContainer.cpp	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/MessageContainer.cpp	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -2,6 +2,4 @@
 
 #include <iostream>
-
-#include "Compiler.h"
 
 using namespace std;
Index: common/MessageContainer.h
===================================================================
--- common/MessageContainer.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/MessageContainer.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -2,14 +2,7 @@
 #define _MESSAGE_CONTAINER_H
 
-#include "Compiler.h"
-
 #include <string>
 
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <netinet/in.h>
-#endif
+#include "Common.h"
 
 using namespace std;
Index: common/MessageProcessor.cpp
===================================================================
--- common/MessageProcessor.cpp	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/MessageProcessor.cpp	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -3,6 +3,4 @@
 #include <iostream>
 #include <fstream>
-
-#include "Common.h"
 
 MessageProcessor::MessageProcessor() {
Index: common/Player.h
===================================================================
--- common/Player.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Player.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -1,13 +1,4 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H
-
-#include "Compiler.h"
-
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <netinet/in.h>
-#endif
 
 #include <string>
Index: common/Projectile.h
===================================================================
--- common/Projectile.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/Projectile.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -1,6 +1,4 @@
 #ifndef _PROJECTILE_H
 #define _PROJECTILE_H
-
-#include "Compiler.h"
 
 #include <string>
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision 0693e2599655a2993d6f13aab9e37a08c4d2e0ac)
+++ common/WorldMap.h	(revision 6319311052eaa6c0398a2f630339cacad808c9af)
@@ -3,5 +3,4 @@
 
 #include <string>
-
 #include <vector>