diff --git a/base/base.cpp b/base/base.cpp
index 00b7b024db..c15568cbe5 100644
--- a/base/base.cpp
+++ b/base/base.cpp
@@ -2,6 +2,7 @@
 
 #include "base/assert.hpp"
 #include "base/exception.hpp"
+#include "base/logging.hpp"
 #include "base/src_point.hpp"
 
 #include "std/target_os.hpp"
@@ -12,7 +13,9 @@ namespace base
 {
 bool OnAssertFailedDefault(SrcPoint const & srcPoint, std::string const & msg)
 {
-  std::cerr << "ASSERT FAILED" << std::endl
+  auto & logger = LogHelper::Instance();
+
+  std::cerr << "TID(" << logger.GetThreadID() << ") ASSERT FAILED" << std::endl
             << srcPoint.FileName() << ":" << srcPoint.Line() << std::endl
             << msg << std::endl;
   return true;
diff --git a/base/logging.cpp b/base/logging.cpp
index 50be16e450..9ae4e7c8c1 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -1,11 +1,7 @@
 #include "base/logging.hpp"
 
 #include "base/assert.hpp"
-#include "base/macros.hpp"
 #include "base/thread.hpp"
-#include "base/timer.hpp"
-
-#include "std/target_os.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -13,7 +9,6 @@
 #include <iomanip>
 #include <iostream>
 #include <iterator>
-#include <map>
 #include <mutex>
 #include <sstream>
 
@@ -52,52 +47,47 @@ array<char const *, NUM_LOG_LEVELS> const & GetLogLevelNames()
   return kNames;
 }
 
-class LogHelper
+// static
+LogHelper & LogHelper::Instance()
 {
-  int m_threadsCount;
-  map<threads::ThreadID, int> m_threadID;
+  static LogHelper instance;
+  return instance;
+}
 
-  int GetThreadID()
-  {
-    int & id = m_threadID[threads::GetCurrentThreadID()];
-    if (id == 0)
-      id = ++m_threadsCount;
-    return id;
-  }
+LogHelper::LogHelper() : m_threadsCount(0)
+{
+  // This code highly depends on the fact that GetLogLevelNames()
+  // always returns the same constant array of strings.
 
-  base::Timer m_timer;
+  m_names = GetLogLevelNames();
+  for (size_t i = 0; i < m_lens.size(); ++i)
+    m_lens[i] = strlen(m_names[i]);
+}
 
-  array<char const *, NUM_LOG_LEVELS> m_names;
-  array<size_t, NUM_LOG_LEVELS> m_lens;
+int LogHelper::GetThreadID()
+{
+  int & id = m_threadID[threads::GetCurrentThreadID()];
+  if (id == 0)
+    id = ++m_threadsCount;
+  return id;
+}
 
-public:
-  LogHelper() : m_threadsCount(0)
-  {
-    // This code highly depends on the fact that GetLogLevelNames()
-    // always returns the same constant array of strings.
+void LogHelper::WriteProlog(ostream & s, LogLevel level)
+{
+  s << "LOG";
 
-    m_names = GetLogLevelNames();
-    for (size_t i = 0; i < m_lens.size(); ++i)
-      m_lens[i] = strlen(m_names[i]);
-  }
+  s << " TID(" << GetThreadID() << ")";
+  s << " " << m_names[level];
 
-  void WriteProlog(ostream & s, LogLevel level)
-  {
-    s << "LOG";
-
-    s << " TID(" << GetThreadID() << ")";
-    s << " " << m_names[level];
-
-    double const sec = m_timer.ElapsedSeconds();
-    s << " " << setfill(' ') << setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
-  }
-};
+  double const sec = m_timer.ElapsedSeconds();
+  s << " " << setfill(' ') << setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
+}
 
 void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg)
 {
   lock_guard<mutex> lock(g_logMutex);
 
-  static LogHelper logger;
+  auto & logger = LogHelper::Instance();
 
   ostringstream out;
   logger.WriteProlog(out, level);
diff --git a/base/logging.hpp b/base/logging.hpp
index a5d055448d..08d0d47539 100644
--- a/base/logging.hpp
+++ b/base/logging.hpp
@@ -3,9 +3,12 @@
 #include "base/base.hpp"
 #include "base/internal/message.hpp"
 #include "base/src_point.hpp"
+#include "base/thread.hpp"
+#include "base/timer.hpp"
 
 #include <array>
 #include <atomic>
+#include <map>
 #include <string>
 
 namespace base
@@ -21,6 +24,26 @@ enum LogLevel
   NUM_LOG_LEVELS
 };
 
+class LogHelper
+{
+public:
+  static LogHelper & Instance();
+
+  LogHelper();
+
+  int GetThreadID();
+  void WriteProlog(std::ostream & s, LogLevel level);
+
+private:
+  int m_threadsCount;
+  std::map<threads::ThreadID, int> m_threadID;
+
+  base::Timer m_timer;
+
+  std::array<char const *, NUM_LOG_LEVELS> m_names;
+  std::array<size_t, NUM_LOG_LEVELS> m_lens;
+};
+
 std::string ToString(LogLevel level);
 bool FromString(std::string const & s, LogLevel & level);
 std::array<char const *, NUM_LOG_LEVELS> const & GetLogLevelNames();