diff --git a/CMakeLists.txt b/CMakeLists.txt
index 055e39b3..8fb79881 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # set(Boost_DEBUG 1)
 
-if(NOT SAPPHIRE_BOOST_VER)
-    set(SAPPHIRE_BOOST_VER 1.60.0)
+if( NOT SAPPHIRE_BOOST_VER )
+    set( SAPPHIRE_BOOST_VER 1.63.0 )
 endif()
-set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
+set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 )
 
 ##########################################################################
 # Common and library path
-set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries")
+set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
 
 ##########################################################################
 # Dependencies and compiler settings
@@ -34,22 +34,22 @@ include( "cmake/cotire.cmake" )
 ##############################
 #             Git            #
 ##############################
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-git_describe(VERSION --all --dirty=-d)
-configure_file("src/common/Version.cpp.in"
-               "src/common/Version.cpp" @ONLY)
+include( GetGitRevisionDescription )
+get_git_head_revision( GIT_REFSPEC GIT_SHA1 )
+git_describe( VERSION --all --dirty=-d )
+configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp.in"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp" @ONLY )
 
 ##########################################################################
-add_subdirectory("src/libraries/sapphire/datReader")
-add_subdirectory("src/libraries/sapphire/mysqlConnector")
-add_subdirectory("src/common")
+add_subdirectory( "src/libraries/sapphire/datReader" )
+add_subdirectory( "src/libraries/sapphire/mysqlConnector" )
+add_subdirectory( "src/common" )
 
-add_subdirectory("src/servers")
+add_subdirectory( "src/servers" )
 
-add_subdirectory("src/tools/exd_common_gen")
-add_subdirectory("src/tools/exd_struct_gen")
-add_subdirectory("src/tools/exd_struct_test")
-add_subdirectory("src/tools/quest_parser")
+add_subdirectory( "src/tools/exd_common_gen" )
+add_subdirectory( "src/tools/exd_struct_gen" )
+add_subdirectory( "src/tools/exd_struct_test" )
+add_subdirectory( "src/tools/quest_parser" )
 #add_subdirectory("src/tools/pcb_reader")
 #add_subdirectory("src/tools/event_object_parser")
diff --git a/src/common/Version.cpp.in b/src/common/Version.cpp.in
index 4a7bacda..b2de470a 100644
--- a/src/common/Version.cpp.in
+++ b/src/common/Version.cpp.in
@@ -1,10 +1,10 @@
 #include "Version.h"
 
 namespace Core { 
-    namespace Version {
+namespace Version {
 
-    const std::string GIT_HASH = "@GIT_SHA1@";
-    const std::string VERSION = "@VERSION@";
+const std::string GIT_HASH = "@GIT_SHA1@";
+const std::string VERSION = "@VERSION@";
 
-   } /* Version */
+} /* Version */
 } /* Core */
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index a68c2723..82693b12 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -16,6 +16,8 @@
 
 #include "GameConnection.h"
 #include "RestConnector.h"
+#include "Forwards.h"
+#include <Forwards.h>
 
 #include <thread>
 #include <boost/thread.hpp>