Index: code/trunk/src/network/packet/Chat.cc
===================================================================
--- code/trunk/src/network/packet/Chat.cc	(revision 2759)
+++ code/trunk/src/network/packet/Chat.cc	(revision 2773)
@@ -28,5 +28,7 @@
 
 #include "Chat.h"
-#include <assert.h>
+
+#include <enet/enet.h>
+#include <cassert>
 #include "network/Host.h"
 
Index: code/trunk/src/network/packet/ClassID.cc
===================================================================
--- code/trunk/src/network/packet/ClassID.cc	(revision 2759)
+++ code/trunk/src/network/packet/ClassID.cc	(revision 2773)
@@ -30,9 +30,10 @@
 
 #include "ClassID.h"
+#include <enet/enet.h>
 #include "core/CoreIncludes.h"
 #include "core/Factory.h"
 #include <cstring>
 #include <string>
-#include <assert.h>
+#include <cassert>
 #include <map>
 #include <queue>
Index: code/trunk/src/network/packet/DeleteObjects.cc
===================================================================
--- code/trunk/src/network/packet/DeleteObjects.cc	(revision 2759)
+++ code/trunk/src/network/packet/DeleteObjects.cc	(revision 2773)
@@ -29,12 +29,8 @@
 
 #include "DeleteObjects.h"
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include "network/synchronisable/Synchronisable.h"
 #include "core/CoreIncludes.h"
-#include <assert.h>
+#include <cassert>
 
 namespace orxonox {
Index: code/trunk/src/network/packet/Gamestate.cc
===================================================================
--- code/trunk/src/network/packet/Gamestate.cc	(revision 2759)
+++ code/trunk/src/network/packet/Gamestate.cc	(revision 2773)
@@ -28,4 +28,7 @@
 
 #include "Gamestate.h"
+#include <enet/enet.h>
+#include <zlib.h>
+#include <cassert>
 #include "../GamestateHandler.h"
 #include "../synchronisable/Synchronisable.h"
@@ -35,6 +38,4 @@
 #include "core/Iterator.h"
 
-#include <zlib.h>
-#include <cassert>
 
 
Index: code/trunk/src/network/packet/Packet.cc
===================================================================
--- code/trunk/src/network/packet/Packet.cc	(revision 2759)
+++ code/trunk/src/network/packet/Packet.cc	(revision 2773)
@@ -31,10 +31,7 @@
 
 #include <cassert>
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/bind.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "network/ConnectionManager.h"
@@ -58,5 +55,6 @@
 
 std::map<size_t, Packet *> Packet::packetMap_;
-boost::recursive_mutex Packet::packetMap_mutex;
+//! Static mutex for any packetMap_ access
+static boost::recursive_mutex packetMap_mutex_g;
 
 Packet::Packet(){
@@ -142,5 +140,5 @@
       // Assures we don't create a packet and destroy it right after in another thread
       // without having a reference in the packetMap_
-      boost::recursive_mutex::scoped_lock lock(Packet::packetMap_mutex);
+      boost::recursive_mutex::scoped_lock lock(packetMap_mutex_g);
       packetMap_[(size_t)(void*)enetPacket_] = this;
     }
@@ -217,5 +215,5 @@
 */
 void Packet::deletePacket(ENetPacket *enetPacket){
-  boost::recursive_mutex::scoped_lock lock(Packet::packetMap_mutex);
+  boost::recursive_mutex::scoped_lock lock(packetMap_mutex_g);
   // Get our Packet from a gloabal map with all Packets created in the send() method of Packet.
   std::map<size_t, Packet*>::iterator it = packetMap_.find((size_t)enetPacket);
Index: code/trunk/src/network/packet/Packet.h
===================================================================
--- code/trunk/src/network/packet/Packet.h	(revision 2759)
+++ code/trunk/src/network/packet/Packet.h	(revision 2773)
@@ -32,10 +32,4 @@
 
 #include <map>
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-#define NOMINMAX // required to stop windows.h screwing up std::min definition
-#include <enet/enet.h>
-#include <boost/thread/recursive_mutex.hpp>
 
 namespace orxonox {
@@ -72,5 +66,5 @@
     virtual unsigned int getSize() const =0;
     virtual bool process()=0;
-    enet_uint32 getFlags()
+    uint32_t getFlags()
       { return flags_; }
     int getClientID()
@@ -84,5 +78,5 @@
     Packet(uint8_t *data, unsigned int clientID);
 //    Packet(ENetPacket *packet, ENetPeer *peer);
-    enet_uint32 flags_;
+    uint32_t flags_;
     unsigned int clientID_;
     ENUM::Direction packetDirection_;
@@ -96,6 +90,4 @@
   private:
     static std::map<size_t, Packet *> packetMap_;
-    //! Static mutex for any packetMap_ access
-    static boost::recursive_mutex packetMap_mutex;
     ENetPacket *enetPacket_;
 };
Index: code/trunk/src/network/packet/Welcome.cc
===================================================================
--- code/trunk/src/network/packet/Welcome.cc	(revision 2759)
+++ code/trunk/src/network/packet/Welcome.cc	(revision 2773)
@@ -31,8 +31,9 @@
 
 #include "Welcome.h"
+#include <enet/enet.h>
+#include <cassert>
 #include "network/Host.h"
 #include "network/synchronisable/Synchronisable.h"
 #include "core/CoreIncludes.h"
-#include <assert.h>
 
 namespace orxonox {
