diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/servers/sapphire_zone/Actor/BNpc.h
index c1679887..e670f21f 100644
--- a/src/servers/sapphire_zone/Actor/BNpc.h
+++ b/src/servers/sapphire_zone/Actor/BNpc.h
@@ -2,7 +2,6 @@
 #define _BNPC_H_
 
 #include <Common.h>
-#include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
 #include "Chara.h"
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h
index 961b0e07..7f6ab960 100644
--- a/src/servers/sapphire_zone/Actor/Chara.h
+++ b/src/servers/sapphire_zone/Actor/Chara.h
@@ -2,7 +2,6 @@
 #define _CHARA_H_
 
 #include <Common.h>
-#include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
 #include "Actor.h"
@@ -18,8 +17,7 @@ namespace Entity {
 \brief Base class for all animate actors
 
 */
-class Chara :
-  public Actor
+class Chara : public Actor
 {
 public:
   struct ActorStats
diff --git a/src/servers/sapphire_zone/Actor/Npc.h b/src/servers/sapphire_zone/Actor/Npc.h
index 7eaa5973..4dac91dc 100644
--- a/src/servers/sapphire_zone/Actor/Npc.h
+++ b/src/servers/sapphire_zone/Actor/Npc.h
@@ -2,7 +2,6 @@
 #define _NPC_H_
 
 #include <Common.h>
-#include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
 #include "Chara.h"
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index f43be36e..3c0f6bef 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1,5 +1,3 @@
-#include <boost/make_shared.hpp>
-
 #include <Common.h>
 #include <Util/Util.h>
 #include <Util/UtilMath.h>
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 30455f68..2ffd6d27 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -1,5 +1,3 @@
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/format.hpp>
 #include <cinttypes>
 
diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
index 10882952..535acc6f 100644
--- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
+++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
@@ -1,5 +1,3 @@
-#include <boost/make_shared.hpp>
-
 #include <Logging/Logger.h>
 #include <Database/DatabaseDef.h>
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
index 2f39a3a7..ac7a1f7f 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
@@ -1,5 +1,4 @@
 #include "NativeScriptMgr.h"
-#include <boost/filesystem.hpp>
 
 #include <Crypt/md5.h>
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.h b/src/servers/sapphire_zone/Script/NativeScriptMgr.h
index 9652ff8f..aac29439 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptMgr.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.h
@@ -5,9 +5,6 @@
 #include <set>
 #include <queue>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-
 #include "ScriptLoader.h"
 
 namespace Core {
@@ -125,7 +122,7 @@ public:
 /*!
  * @brief Creates an instance of NativeScriptMgr
  *
- * @return a boost::shared_ptr to NativeScriptMgr
+ * @return a std::shared_ptr to NativeScriptMgr
  */
 std::shared_ptr< NativeScriptMgr > createNativeScriptMgr();
 }
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index cf72171d..1f4417c4 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -1,9 +1,3 @@
-#include <boost/lexical_cast.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/format.hpp>
-#include <boost/foreach.hpp>
-
 #include <Logging/Logger.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Config/ConfigMgr.h>
@@ -141,13 +135,12 @@ bool Core::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set<
   fs::path targetDir( dirname );
 
   fs::directory_iterator iter( targetDir );
-  fs::directory_iterator eod;
 
-  BOOST_FOREACH( fs::path const& i, std::make_pair( iter, eod ) )
+  for( const auto& i : iter )
   {
-    if( fs::is_regular_file( i ) && fs::path( i.string() ).extension() == ext )
+    if( fs::is_regular_file( i ) && fs::path( i ).extension() == ext )
     {
-      files.insert( i.string() );
+      files.insert( fs::path( i ) );
     }
   }
 
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index fcb60c51..643a3343 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -28,7 +28,6 @@
 
 #include "ForwardsZone.h"
 
-#include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <thread>
diff --git a/src/servers/sapphire_zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
index d92c1a9e..28a0d858 100644
--- a/src/servers/sapphire_zone/ServerZone.h
+++ b/src/servers/sapphire_zone/ServerZone.h
@@ -3,7 +3,6 @@
 
 #include <Common.h>
 
-#include <boost/shared_ptr.hpp>
 #include <mutex>
 #include <map>
 
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
index b0cda26f..ce5fbee5 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
@@ -1,8 +1,6 @@
 #ifndef _STATUSEFFECT_H_
 #define _STATUSEFFECT_H_
 
-#include <boost/shared_ptr.hpp>
-
 #include "Forwards.h"
 
 namespace Core {