diff --git a/core/shared_ptr.hh b/core/shared_ptr.hh
index 53e6ec1404..032d001775 100644
--- a/core/shared_ptr.hh
+++ b/core/shared_ptr.hh
@@ -69,6 +69,9 @@ lw_shared_ptr<T> make_lw_shared(T& a);
 template <typename T, typename... A>
 shared_ptr<T> make_shared(A&&... a);
 
+template <typename T>
+shared_ptr<T> make_shared(T&& a);
+
 template <typename T, typename U>
 shared_ptr<T> static_pointer_cast(const shared_ptr<U>& p);
 
@@ -375,6 +378,9 @@ public:
     template <typename U, typename... A>
     friend shared_ptr<U> make_shared(A&&... a);
 
+    template <typename U>
+    friend shared_ptr<U> make_shared(U&& a);
+
     template <typename V, typename U>
     friend shared_ptr<V> static_pointer_cast(const shared_ptr<U>& p);
 
@@ -424,6 +430,14 @@ make_shared(A&&... a) {
     return helper::make(std::forward<A>(a)...);
 }
 
+template <typename T>
+inline
+shared_ptr<T>
+make_shared(T&& a) {
+    using helper = shared_ptr_make_helper<T, std::is_base_of<enable_shared_from_this<T>, T>::value>;
+    return helper::make(std::forward<T>(a));
+}
+
 template <typename T, typename U>
 inline
 shared_ptr<T>