diff --git a/src/common/Common.h b/src/common/Common.h
index e16f5035..634c1828 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -1,7 +1,6 @@
 #ifndef _COMMON_H
 #define _COMMON_H
 
-#include <stdint.h>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/common/Crypt/blowfish.h b/src/common/Crypt/blowfish.h
index 8c13144a..81562b33 100644
--- a/src/common/Crypt/blowfish.h
+++ b/src/common/Crypt/blowfish.h
@@ -1,3 +1,5 @@
+#ifndef _BLOWFISH_H
+#define _BLOWFISH_H
 // blowfish.h     interface file for blowfish.cpp
 // _THE BLOWFISH ENCRYPTION ALGORITHM_
 // by Bruce Schneier
@@ -7,7 +9,7 @@
 #define MAXKEYBYTES 	56		// 448 bits max
 #define NPASS           16		// SBox passes
 
-#define DWORD  		uint32_t
+#define DWORD  	uint32_t
 #define WORD  		unsigned short
 #define BYTE  		uint8_t
 
@@ -70,3 +72,4 @@ public:
 	  } w;
 };
 #endif
+#endif
\ No newline at end of file
diff --git a/src/common/Crypt/md5.h b/src/common/Crypt/md5.h
index e10bef53..eada75ed 100644
--- a/src/common/Crypt/md5.h
+++ b/src/common/Crypt/md5.h
@@ -1,7 +1,6 @@
-#include <stdint.h>
-
 #ifndef _MD52_H
 #define _MD52_H
+#include <stdint.h>
 
 namespace Core
 {
diff --git a/src/common/Version.cpp b/src/common/Version.cpp
index e739d043..80a9ba46 100644
--- a/src/common/Version.cpp
+++ b/src/common/Version.cpp
@@ -3,7 +3,7 @@
 namespace Core { 
     namespace Version {
 
-    const std::string GIT_HASH = "32d886675c6f621494001715e6cf9c99217e1b48";
+    const std::string GIT_HASH = "4606e83d151f02fa17e98e832c01b3680987b5f5";
     const std::string VERSION = "-128-NOTFOUND";
 
    } /* Version */
diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/Server_Lobby/GameConnection.cpp
index b5da8dd4..8d9a52a3 100644
--- a/src/servers/Server_Lobby/GameConnection.cpp
+++ b/src/servers/Server_Lobby/GameConnection.cpp
@@ -1,3 +1,5 @@
+#include "GameConnection.h"
+
 #include <common/Common.h>
 #include <common/Network/CommonNetwork.h>
 #include <common/Util/Util.h>
@@ -9,21 +11,11 @@
 #include <common/Crypt/md5.h>
 #include <common/Crypt/blowfish.h>
 
-#include <boost/format.hpp>
-#include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
-#include <boost/foreach.hpp>
-
-#include "GameConnection.h"
 
 #include "ServerLobby.h"
-#include "LobbyPacketContainer.h"
-
 #include "RestConnector.h"
 #include "LobbySession.h"
-#include "Forwards.h"
-
-
 
 extern Core::Logger g_log;
 extern Core::ServerLobby g_serverLobby;