diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
index 7de09a653..f53e3271c 100644
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
+++ b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
@@ -39,7 +39,7 @@
 
   @ingroup beast_concurrent
 */
-class BEAST_API FifoFreeStoreWithTLS
+class BEAST_API FifoFreeStoreWithTLS : public LeakChecked <FifoFreeStoreWithTLS>
 {
 public:
     FifoFreeStoreWithTLS ();
diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
index 85a4334cf..2b9fc9da6 100644
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
+++ b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
@@ -38,7 +38,7 @@
 
   @ingroup beast_concurrent
 */
-class BEAST_API FifoFreeStoreWithoutTLS
+class BEAST_API FifoFreeStoreWithoutTLS : LeakChecked <FifoFreeStoreWithoutTLS>
 {
 public:
     explicit FifoFreeStoreWithoutTLS ();
diff --git a/modules/beast_core/thread/beast_DeadlineTimer.cpp b/modules/beast_core/thread/beast_DeadlineTimer.cpp
index 6d8d1bba0..309fc476b 100644
--- a/modules/beast_core/thread/beast_DeadlineTimer.cpp
+++ b/modules/beast_core/thread/beast_DeadlineTimer.cpp
@@ -17,7 +17,9 @@
 */
 //==============================================================================
 
-class DeadlineTimer::Manager : protected Thread
+class DeadlineTimer::Manager
+    : public LeakChecked <Manager>
+    , protected Thread
 {
 private:
     typedef CriticalSection LockType;
@@ -203,8 +205,7 @@ private:
 
 DeadlineTimer::DeadlineTimer (Listener* listener)
     : m_listener (listener)
-    , m_manager (SharedSingleton <Manager>::getInstance (
-        SingletonLifetime::persistAfterCreation))
+    , m_manager (SharedSingleton <Manager>::getInstance ())
     , m_isActive (false)
 {
 }