diff --git a/server/connection.hpp b/server/connection.hpp
index 791de02..cfac5f6 100644
--- a/server/connection.hpp
+++ b/server/connection.hpp
@@ -34,11 +34,12 @@
 #include "request.hpp"
 #include "request_handler.hpp"
 #include "request_parser.hpp"
+
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+
+#include <memory>
 
 namespace http {
 namespace server {
@@ -46,7 +47,7 @@
 class connection_manager;
 
 /// Represents a single connection from a client.
-class connection : public boost::enable_shared_from_this<connection>, private boost::noncopyable
+class connection : public std::enable_shared_from_this<connection>, private boost::noncopyable
 {
 public:
   /// Construct a connection with the given io_service.
@@ -96,7 +97,7 @@
   reply reply_;
 };
 
-typedef boost::shared_ptr<connection> connection_ptr;
+typedef std::shared_ptr<connection> connection_ptr;
 
 } // namespace server
 } // namespace http