diff --git a/Server/Connection.cpp b/Server/Connection.cpp
index 089525fad..29f46ebcf 100644
--- a/Server/Connection.cpp
+++ b/Server/Connection.cpp
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 
diff --git a/Server/Connection.h b/Server/Connection.h
index 5e4c2e01a..174077ccc 100644
--- a/Server/Connection.h
+++ b/Server/Connection.h
@@ -35,8 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
-#include <boost/enable_shared_from_this.hpp>
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -48,7 +48,7 @@ namespace http
 class RequestParser;
 
 /// Represents a single connection from a client.
-class Connection : public boost::enable_shared_from_this<Connection>
+class Connection : public std::enable_shared_from_this<Connection>
 {
   public:
     explicit Connection(boost::asio::io_service &io_service, RequestHandler &handler);
diff --git a/Server/Server.h b/Server/Server.h
index 5e6738562..4a6882384 100644
--- a/Server/Server.h
+++ b/Server/Server.h
@@ -33,10 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <functional>
+#include <memory>
 #include <vector>
 
 class Server
@@ -63,10 +63,10 @@ class Server
 
     void Run()
     {
-        std::vector<boost::shared_ptr<boost::thread>> threads;
+        std::vector<std::shared_ptr<boost::thread>> threads;
         for (unsigned i = 0; i < thread_pool_size; ++i)
         {
-            boost::shared_ptr<boost::thread> thread = boost::make_shared<boost::thread>(
+            std::shared_ptr<boost::thread> thread = std::make_shared<boost::thread>(
                 boost::bind(&boost::asio::io_service::run, &io_service));
             threads.push_back(thread);
         }
@@ -94,7 +94,7 @@ class Server
     unsigned thread_pool_size;
     boost::asio::io_service io_service;
     boost::asio::ip::tcp::acceptor acceptor;
-    boost::shared_ptr<http::Connection> new_connection;
+    std::shared_ptr<http::Connection> new_connection;
     RequestHandler request_handler;
 };