diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16458fd0..910241d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,23 +10,12 @@ set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin )
 
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
 
-##########################################################################
-# Boost stuff
-
-# set(Boost_DEBUG 1)
-
-if( NOT SAPPHIRE_BOOST_VER )
-    set( SAPPHIRE_BOOST_VER 1.63.0 )
-endif()
-set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 )
-
 ##########################################################################
 # Common and library path
 set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
 
 ##########################################################################
 # Dependencies and compiler settings
-include( "cmake/boost.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
 include( "cmake/cotire.cmake" )
diff --git a/src/servers/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt
index 314f33f9..ceb6fadb 100644
--- a/src/servers/Scripts/CMakeLists.txt
+++ b/src/servers/Scripts/CMakeLists.txt
@@ -39,7 +39,6 @@ foreach(_scriptDir ${children})
         target_link_libraries( "script_${_name}" sapphire_zone )
 
         if(MSVC)
-            #target_link_libraries( "script_${_name}" ${Boost_LIBRARIES})
             set_target_properties( "script_${_name}" PROPERTIES
                 CXX_STANDARD 17
                 CXX_STANDARD_REQUIRED ON
diff --git a/src/servers/sapphire_zone/ForwardsZone.h b/src/servers/sapphire_zone/ForwardsZone.h
index 95c22a84..2ab1ede2 100644
--- a/src/servers/sapphire_zone/ForwardsZone.h
+++ b/src/servers/sapphire_zone/ForwardsZone.h
@@ -4,6 +4,7 @@
 #include <utility>
 #include <memory>
 #include <vector>
+#include <functional>
 #include "Common.h"
 
 #define TYPE_FORWARD( x ) \
diff --git a/src/servers/sapphire_zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Zone/CellHandler.h
index d12e399b..7bf7009b 100644
--- a/src/servers/sapphire_zone/Zone/CellHandler.h
+++ b/src/servers/sapphire_zone/Zone/CellHandler.h
@@ -1,5 +1,6 @@
 #ifndef _CELLHANDLER_H
 #define _CELLHANDLER_H
+#include <cassert>
 
 #define TilesCount 32
 #define TileSize 250.0f