diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
index bf88c95..3b6981d 100644
--- a/websocketpp/impl/connection_impl.hpp
+++ b/websocketpp/impl/connection_impl.hpp
@@ -2177,7 +2177,7 @@ connection<config>::get_processor(int version) const {
                 transport_con_type::is_secure(),
                 m_is_server,
                 m_msg_manager,
-                lib::ref(m_rng)
+                m_rng
             );
             break;
         case 8:
@@ -2185,7 +2185,7 @@ connection<config>::get_processor(int version) const {
                 transport_con_type::is_secure(),
                 m_is_server,
                 m_msg_manager,
-                lib::ref(m_rng)
+                m_rng
             );
             break;
         case 13:
@@ -2193,7 +2193,7 @@ connection<config>::get_processor(int version) const {
                 transport_con_type::is_secure(),
                 m_is_server,
                 m_msg_manager,
-                lib::ref(m_rng)
+                m_rng
             );
             break;
         default:
diff --git a/websocketpp/impl/endpoint_impl.hpp b/websocketpp/impl/endpoint_impl.hpp
index 2aac1d9..a343136 100644
--- a/websocketpp/impl/endpoint_impl.hpp
+++ b/websocketpp/impl/endpoint_impl.hpp
@@ -45,7 +45,7 @@ endpoint<connection,config>::create_connection() {
     //scoped_lock_type guard(m_mutex);
     // Create a connection on the heap and manage it using a shared pointer
     connection_ptr con = lib::make_shared<connection_type>(m_is_server,
-        m_user_agent, m_alog, m_elog, lib::ref(m_rng));
+        m_user_agent, m_alog, m_elog, m_rng);
 
     connection_weak_ptr w(con);
 
diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
index 60f88a7..5c3640e 100644
--- a/websocketpp/transport/asio/connection.hpp
+++ b/websocketpp/transport/asio/connection.hpp
@@ -312,7 +312,7 @@ public:
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
         timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            lib::ref(*m_io_service),
+            *m_io_service,
             lib::asio::milliseconds(duration)
         );
 
@@ -462,7 +462,7 @@ protected:
 
         if (config::enable_multithreading) {
             m_strand = lib::make_shared<lib::asio::io_service::strand>(
-                lib::ref(*io_service));
+                *io_service);
         }
 
         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
index ddab2c7..8ebceaf 100644
--- a/websocketpp/transport/asio/endpoint.hpp
+++ b/websocketpp/transport/asio/endpoint.hpp
@@ -196,7 +196,7 @@ public:
         m_io_service = ptr;
         m_external_io_service = true;
         m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+            *m_io_service);
 
         m_state = READY;
         ec = lib::error_code();
@@ -689,7 +689,7 @@ public:
      */
     void start_perpetual() {
         m_work = lib::make_shared<lib::asio::io_service::work>(
-            lib::ref(*m_io_service)
+            *m_io_service
         );
     }
 
@@ -855,7 +855,7 @@ protected:
         // Create a resolver
         if (!m_resolver) {
             m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+                *m_io_service);
         }
 
         tcon->set_uri(u);
diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
index 5c8293d..6ada3bd 100644
--- a/websocketpp/transport/asio/security/none.hpp
+++ b/websocketpp/transport/asio/security/none.hpp
@@ -169,7 +169,7 @@ protected:
         }
 
         m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-            lib::ref(*service));
+            *service);
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, *m_socket);
diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
index c76fd9a..5d9aebb 100644
--- a/websocketpp/transport/asio/security/tls.hpp
+++ b/websocketpp/transport/asio/security/tls.hpp
@@ -194,7 +194,7 @@ protected:
             return socket::make_error_code(socket::error::invalid_tls_context);
         }
         m_socket = lib::make_shared<socket_type>(
-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+            _WEBSOCKETPP_REF(*service),*m_context);
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, get_socket());