diff --git a/core/shared_ptr.hh b/core/shared_ptr.hh
index 032d001775..a5f9c24dba 100644
--- a/core/shared_ptr.hh
+++ b/core/shared_ptr.hh
@@ -274,6 +274,9 @@ public:
 
     template <typename U>
     friend class shared_ptr;
+
+    template <typename U, bool esft>
+    friend struct shared_ptr_make_helper;
 };
 
 template <typename T>
@@ -418,7 +421,8 @@ template <typename T>
 struct shared_ptr_make_helper<T, true> {
     template <typename... A>
     static shared_ptr<T> make(A&&... a) {
-        return shared_ptr<T>(new T(std::forward<A>(a)...));
+        auto p = new T(std::forward<A>(a)...);
+        return shared_ptr<T>(p, p);
     }
 };
 
@@ -426,7 +430,7 @@ template <typename T, typename... A>
 inline
 shared_ptr<T>
 make_shared(A&&... a) {
-    using helper = shared_ptr_make_helper<T, std::is_base_of<enable_shared_from_this<T>, T>::value>;
+    using helper = shared_ptr_make_helper<T, std::is_base_of<shared_ptr_count_base, T>::value>;
     return helper::make(std::forward<A>(a)...);
 }
 
@@ -434,7 +438,7 @@ 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>;
+    using helper = shared_ptr_make_helper<T, std::is_base_of<shared_ptr_count_base, T>::value>;
     return helper::make(std::forward<T>(a));
 }