YT-18571: Drop yt/yt/core/misc/singleton.h

[nodiff:caesar]
commit_hash:152409763d3e87b9199a34fb0854b1084817f82a

36 files changed, 45 insertions, 52 deletions

diff --git a/yt/yql/providers/yt/comp_nodes/dq/dq_yt_block_reader.cpp b/yt/yql/providers/yt/comp_nodes/dq/dq_yt_block_reader.cpp
index abdcb46ead..c8c2b61607 100644
--- a/yt/yql/providers/yt/comp_nodes/dq/dq_yt_block_reader.cpp
+++ b/yt/yql/providers/yt/comp_nodes/dq/dq_yt_block_reader.cpp
@@ -44,6 +44,8 @@
 #include <util/generic/size_literals.h>
 #include <util/stream/output.h>
 
+#include <mutex>
+
 namespace NYql::NDqs {
 
 using namespace NKikimr::NMiniKQL;
@@ -284,7 +286,7 @@ public:
         , std::shared_ptr<std::vector<TType*>> columnTypes
         , std::shared_ptr<std::vector<std::shared_ptr<arrow::DataType>>> arrowTypes
         , arrow::MemoryPool& pool, const NUdf::IPgBuilder* pgBuilder
-        , bool isNative, NKikimr::NMiniKQL::IStatsRegistry* jobStats) 
+        , bool isNative, NKikimr::NMiniKQL::IStatsRegistry* jobStats)
         : Consumer_(consumer)
         , ColumnTypes_(columnTypes)
         , JobStats_(jobStats)
@@ -561,7 +563,7 @@ public:
         , Result_(width)
     {
     }
-    
+
     NUdf::EFetchStatus WideFetch(NUdf::TUnboxedValue* output, ui32 width) {
         if (GotFinish_) {
             return NUdf::EFetchStatus::Finish;
@@ -574,7 +576,7 @@ public:
                 Source_->Finish();
                 return NUdf::EFetchStatus::Finish;
             }
-            
+
             for (size_t i = 0; i < Width_; ++i) {
                 YQL_ENSURE(batch->Columns[i].type()->Equals(Types_->at(i)));
                 output[i] = Source_->HolderFactory.CreateArrowBlock(std::move(batch->Columns[i]));
@@ -663,7 +665,7 @@ IComputationNode* CreateDqYtReadBlockWrapper(const TComputationNodeFactoryContex
         const TString& token, const NYT::TNode& inputSpec, const NYT::TNode& samplingSpec,
         const TVector<ui32>& inputGroups,
         TType* itemType, const TVector<TString>& tableNames, TVector<std::pair<NYT::TRichYPath, NYT::TFormat>>&& tables,
-        NKikimr::NMiniKQL::IStatsRegistry* jobStats, size_t inflight, size_t timeout, const TVector<ui64>& tableOffsets) 
+        NKikimr::NMiniKQL::IStatsRegistry* jobStats, size_t inflight, size_t timeout, const TVector<ui64>& tableOffsets)
 {
     return new TDqYtReadBlockWrapper(ctx, clusterName, token, inputSpec, samplingSpec, inputGroups, itemType,
                                                 tableNames, std::move(tables), jobStats, inflight, timeout, tableOffsets);
diff --git a/yt/yt/client/logging/dynamic_table_log_writer.cpp b/yt/yt/client/logging/dynamic_table_log_writer.cpp
index bb5cf06375..ebda01662d 100644
--- a/yt/yt/client/logging/dynamic_table_log_writer.cpp
+++ b/yt/yt/client/logging/dynamic_table_log_writer.cpp
@@ -27,6 +27,7 @@
 #include <yt/yt/core/misc/proc.h>
 
 #include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
 
 #include <library/cpp/yt/threading/atomic_object.h>
 
diff --git a/yt/yt/client/table_client/config.cpp b/yt/yt/client/table_client/config.cpp
index 6bfd4b410c..78131f6360 100644
--- a/yt/yt/client/table_client/config.cpp
+++ b/yt/yt/client/table_client/config.cpp
@@ -10,10 +10,10 @@
 
 #include <yt/yt/core/ytree/convert.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/library/quantile_digest/config.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 namespace NYT::NTableClient {
 
 using namespace NChunkClient;
diff --git a/yt/yt/core/actions/invoker_util.cpp b/yt/yt/core/actions/invoker_util.cpp
index 5428053eaa..a50fb6a1c4 100644
--- a/yt/yt/core/actions/invoker_util.cpp
+++ b/yt/yt/core/actions/invoker_util.cpp
@@ -9,9 +9,10 @@
 #include <yt/yt/core/concurrency/system_invokers.h>
 
 #include <yt/yt/core/misc/lazy_ptr.h>
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/ring_queue.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <stack>
 
 namespace NYT {
diff --git a/yt/yt/core/bus/tcp/dispatcher.h b/yt/yt/core/bus/tcp/dispatcher.h
index 5efd5024e9..b39b015c88 100644
--- a/yt/yt/core/bus/tcp/dispatcher.h
+++ b/yt/yt/core/bus/tcp/dispatcher.h
@@ -2,8 +2,6 @@
 
 #include "public.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/concurrency/public.h>
 
 #include <yt/yt/core/net/public.h>
@@ -14,6 +12,8 @@
 
 #include <library/cpp/yt/containers/enum_indexed_array.h>
 
+#include <library/cpp/yt/memory/leaky_singleton.h>
+
 namespace NYT::NBus {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/bus/tcp/ssl_context.cpp b/yt/yt/core/bus/tcp/ssl_context.cpp
index 786503e980..8084b641c8 100644
--- a/yt/yt/core/bus/tcp/ssl_context.cpp
+++ b/yt/yt/core/bus/tcp/ssl_context.cpp
@@ -2,12 +2,13 @@
 #include "ssl_helpers.h"
 
 #include <yt/yt/core/misc/error.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <library/cpp/openssl/init/init.h>
 
 #include <library/cpp/yt/threading/spin_lock.h>
 
+#include <library/cpp/yt/memory/leaky_singleton.h>
+
 #include <util/system/mutex.h>
 
 #include <openssl/err.h>
diff --git a/yt/yt/core/concurrency/delayed_executor.cpp b/yt/yt/core/concurrency/delayed_executor.cpp
index 4b4b7741d7..453c88b36f 100644
--- a/yt/yt/core/concurrency/delayed_executor.cpp
+++ b/yt/yt/core/concurrency/delayed_executor.cpp
@@ -4,8 +4,8 @@
 #include "private.h"
 
 #include <yt/yt/core/actions/invoker_util.h>
+
 #include <yt/yt/core/misc/relaxed_mpsc_queue.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <yt/yt/core/threading/thread.h>
 
diff --git a/yt/yt/core/concurrency/fiber.cpp b/yt/yt/core/concurrency/fiber.cpp
index b9bc55c9c3..62e057b650 100644
--- a/yt/yt/core/concurrency/fiber.cpp
+++ b/yt/yt/core/concurrency/fiber.cpp
@@ -5,7 +5,6 @@
 #include <yt/yt/core/profiling/timing.h>
 
 #include <yt/yt/core/misc/intrusive_mpsc_stack.h>
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/shutdown.h>
 #include <yt/yt/core/misc/finally.h>
 
@@ -13,6 +12,8 @@
 
 #include <library/cpp/yt/threading/fork_aware_spin_lock.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <util/system/yield.h>
 
 #include <util/random/random.h>
diff --git a/yt/yt/core/concurrency/fiber_scheduler_thread.cpp b/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
index 510c418188..1e83417e11 100644
--- a/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
+++ b/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
@@ -11,7 +11,6 @@
 
 #include <yt/yt/core/misc/finally.h>
 #include <yt/yt/core/misc/shutdown.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <library/cpp/yt/threading/spin_lock_count.h>
 
diff --git a/yt/yt/core/concurrency/throughput_throttler.cpp b/yt/yt/core/concurrency/throughput_throttler.cpp
index 9cacc0331c..c5a4e34ce6 100644
--- a/yt/yt/core/concurrency/throughput_throttler.cpp
+++ b/yt/yt/core/concurrency/throughput_throttler.cpp
@@ -3,12 +3,12 @@
 
 #include <yt/yt/core/concurrency/thread_affinity.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/profiling/timing.h>
 
 #include <yt/yt/core/tracing/trace_context.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <queue>
 
 namespace NYT::NConcurrency {
diff --git a/yt/yt/core/logging/log_manager.h b/yt/yt/core/logging/log_manager.h
index e4309e3264..37a7073cee 100644
--- a/yt/yt/core/logging/log_manager.h
+++ b/yt/yt/core/logging/log_manager.h
@@ -2,8 +2,6 @@
 
 #include "log.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/tracing/public.h>
 
 #include <yt/yt/core/ytree/public.h>
diff --git a/yt/yt/core/misc/error_code.cpp b/yt/yt/core/misc/error_code.cpp
index c5f0c391da..666db885f0 100644
--- a/yt/yt/core/misc/error_code.cpp
+++ b/yt/yt/core/misc/error_code.cpp
@@ -2,8 +2,6 @@
 
 #include <yt/yt/core/logging/log.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <library/cpp/yt/misc/global.h>
 
 #include <util/string/split.h>
diff --git a/yt/yt/core/misc/hazard_ptr.cpp b/yt/yt/core/misc/hazard_ptr.cpp
index ec288eddd9..c7e3ec9f53 100644
--- a/yt/yt/core/misc/hazard_ptr.cpp
+++ b/yt/yt/core/misc/hazard_ptr.cpp
@@ -1,6 +1,5 @@
 #include "hazard_ptr.h"
 
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/proc.h>
 #include <yt/yt/core/misc/ring_queue.h>
 #include <yt/yt/core/misc/shutdown.h>
@@ -14,6 +13,7 @@
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
 #include <library/cpp/yt/memory/free_list.h>
+#include <library/cpp/yt/memory/leaky_singleton.h>
 
 #include <library/cpp/yt/misc/tls.h>
 
diff --git a/yt/yt/core/misc/memory_usage_tracker.cpp b/yt/yt/core/misc/memory_usage_tracker.cpp
index 269632e4fe..e9d0e855aa 100644
--- a/yt/yt/core/misc/memory_usage_tracker.cpp
+++ b/yt/yt/core/misc/memory_usage_tracker.cpp
@@ -1,5 +1,6 @@
 #include "memory_usage_tracker.h"
-#include "singleton.h"
+
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
 
 namespace NYT {
 
diff --git a/yt/yt/core/misc/protobuf_helpers.cpp b/yt/yt/core/misc/protobuf_helpers.cpp
index 4e068817a6..c41e621af1 100644
--- a/yt/yt/core/misc/protobuf_helpers.cpp
+++ b/yt/yt/core/misc/protobuf_helpers.cpp
@@ -1,8 +1,6 @@
 #include "protobuf_helpers.h"
 #include "mpl.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/compression/codec.h>
 
 #include <yt/yt/core/logging/log.h>
diff --git a/yt/yt/core/misc/ref_counted_tracker.h b/yt/yt/core/misc/ref_counted_tracker.h
index 1c4df568a3..0a3a0de8a4 100644
--- a/yt/yt/core/misc/ref_counted_tracker.h
+++ b/yt/yt/core/misc/ref_counted_tracker.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include "public.h"
-#include "singleton.h"
 
 #include <library/cpp/yt/threading/fork_aware_spin_lock.h>
 
 #include <library/cpp/yt/misc/tls.h>
 #include <library/cpp/yt/misc/source_location.h>
 
+#include <library/cpp/yt/memory/leaky_singleton.h>
+
 namespace NYT {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/misc/ref_counted_tracker_profiler.cpp b/yt/yt/core/misc/ref_counted_tracker_profiler.cpp
index 5e06bc6910..cee7477cdf 100644
--- a/yt/yt/core/misc/ref_counted_tracker_profiler.cpp
+++ b/yt/yt/core/misc/ref_counted_tracker_profiler.cpp
@@ -1,9 +1,10 @@
 #include "ref_counted_tracker_profiler.h"
 #include "ref_counted_tracker.h"
-#include "singleton.h"
 
 #include <yt/yt/library/profiling/producer.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 namespace NYT {
 
 using namespace NProfiling;
diff --git a/yt/yt/core/misc/shutdown.cpp b/yt/yt/core/misc/shutdown.cpp
index fb4e44feba..5ec0a64a16 100644
--- a/yt/yt/core/misc/shutdown.cpp
+++ b/yt/yt/core/misc/shutdown.cpp
@@ -4,7 +4,6 @@
 
 #include <yt/yt/core/misc/collection_helpers.h>
 #include <yt/yt/core/misc/proc.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <library/cpp/yt/cpu_clock/clock.h>
 
@@ -15,6 +14,8 @@
 
 #include <library/cpp/yt/system/exit.h>
 
+#include <library/cpp/yt/memory/leaky_singleton.h>
+
 #include <util/generic/algorithm.h>
 
 #include <util/system/env.h>
diff --git a/yt/yt/core/misc/singleton.h b/yt/yt/core/misc/singleton.h
deleted file mode 100644
index ea9fe85aac..0000000000
--- a/yt/yt/core/misc/singleton.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
-#include <library/cpp/yt/memory/leaky_singleton.h>
diff --git a/yt/yt/core/net/address.h b/yt/yt/core/net/address.h
index 99e7869f9e..f770a4f892 100644
--- a/yt/yt/core/net/address.h
+++ b/yt/yt/core/net/address.h
@@ -3,12 +3,13 @@
 #include "public.h"
 
 #include <yt/yt/core/misc/error.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <yt/yt/core/dns/public.h>
 
 #include <yt/yt/core/actions/future.h>
 
+#include <library/cpp/yt/memory/leaky_singleton.h>
+
 #include <util/generic/hash.h>
 
 #ifdef _WIN32
diff --git a/yt/yt/core/rpc/dispatcher.cpp b/yt/yt/core/rpc/dispatcher.cpp
index 13749b5940..c0dcd5552f 100644
--- a/yt/yt/core/rpc/dispatcher.cpp
+++ b/yt/yt/core/rpc/dispatcher.cpp
@@ -6,7 +6,6 @@
 #include <yt/yt/core/concurrency/fair_share_thread_pool.h>
 
 #include <yt/yt/core/misc/lazy_ptr.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
 
diff --git a/yt/yt/core/rpc/grpc/channel.cpp b/yt/yt/core/rpc/grpc/channel.cpp
index f8b04fe147..ed6ed3b034 100644
--- a/yt/yt/core/rpc/grpc/channel.cpp
+++ b/yt/yt/core/rpc/grpc/channel.cpp
@@ -3,7 +3,6 @@
 #include "dispatcher.h"
 #include "helpers.h"
 
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/finally.h>
 
 #include <yt/yt/core/rpc/channel.h>
@@ -20,6 +19,8 @@
 #include <library/cpp/yt/threading/rw_spin_lock.h>
 #include <library/cpp/yt/threading/spin_lock.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <array>
 
 namespace NYT::NRpc::NGrpc {
diff --git a/yt/yt/core/rpc/grpc/dispatcher.h b/yt/yt/core/rpc/grpc/dispatcher.h
index 34ddb9f6ad..afa0ac0a39 100644
--- a/yt/yt/core/rpc/grpc/dispatcher.h
+++ b/yt/yt/core/rpc/grpc/dispatcher.h
@@ -3,8 +3,6 @@
 #include "helpers.h"
 #include "private.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 namespace NYT::NRpc::NGrpc {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/rpc/null_channel.cpp b/yt/yt/core/rpc/null_channel.cpp
index a381ab88d1..f826ca96dc 100644
--- a/yt/yt/core/rpc/null_channel.cpp
+++ b/yt/yt/core/rpc/null_channel.cpp
@@ -5,7 +5,8 @@
 #include <yt/yt/core/ytree/helpers.h>
 
 #include <yt/yt/core/misc/memory_usage_tracker.h>
-#include <yt/yt/core/misc/singleton.h>
+
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
 
 namespace NYT::NRpc {
 
diff --git a/yt/yt/core/tracing/trace_context.cpp b/yt/yt/core/tracing/trace_context.cpp
index 3602a9c528..93a3408933 100644
--- a/yt/yt/core/tracing/trace_context.cpp
+++ b/yt/yt/core/tracing/trace_context.cpp
@@ -8,7 +8,6 @@
 #include <yt/yt/core/profiling/timing.h>
 
 #include <yt/yt/core/misc/protobuf_helpers.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <yt/yt/core/ytree/convert.h>
 
diff --git a/yt/yt/core/ytalloc/bindings.cpp b/yt/yt/core/ytalloc/bindings.cpp
index 72b866114d..c68e2bd8e2 100644
--- a/yt/yt/core/ytalloc/bindings.cpp
+++ b/yt/yt/core/ytalloc/bindings.cpp
@@ -6,13 +6,14 @@
 #include <yt/yt/library/profiling/sensor.h>
 #include <yt/yt/library/profiling/producer.h>
 
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/string_builder.h>
 
 #include <library/cpp/ytalloc/api/ytalloc.h>
 
 #include <library/cpp/yt/yson_string/string.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <util/system/env.h>
 
 #include <cstdio>
diff --git a/yt/yt/core/ytree/ephemeral_node_factory.cpp b/yt/yt/core/ytree/ephemeral_node_factory.cpp
index 789fa6ace4..ede85287a8 100644
--- a/yt/yt/core/ytree/ephemeral_node_factory.cpp
+++ b/yt/yt/core/ytree/ephemeral_node_factory.cpp
@@ -4,8 +4,6 @@
 #include "ypath_client.h"
 #include "ypath_detail.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/yson/async_consumer.h>
 #include <yt/yt/core/yson/attribute_consumer.h>
 
diff --git a/yt/yt/core/ytree/helpers.cpp b/yt/yt/core/ytree/helpers.cpp
index 348cfc32fc..4de298fcb6 100644
--- a/yt/yt/core/ytree/helpers.cpp
+++ b/yt/yt/core/ytree/helpers.cpp
@@ -5,8 +5,6 @@
 
 #include <yt/yt/core/misc/error.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 namespace NYT::NYTree {
 
 using namespace NYson;
diff --git a/yt/yt/core/ytree/node_detail.cpp b/yt/yt/core/ytree/node_detail.cpp
index 4c31986074..84746bc999 100644
--- a/yt/yt/core/ytree/node_detail.cpp
+++ b/yt/yt/core/ytree/node_detail.cpp
@@ -3,14 +3,14 @@
 #include "exception_helpers.h"
 #include "attribute_filter.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/core/ypath/token.h>
 #include <yt/yt/core/ypath/tokenizer.h>
 
 #include <yt/yt/core/yson/tokenizer.h>
 #include <yt/yt/core/yson/async_writer.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 namespace NYT::NYTree {
 
 using namespace NRpc;
diff --git a/yt/yt/core/ytree/yson_struct-inl.h b/yt/yt/core/ytree/yson_struct-inl.h
index 34103976da..aad0bd1fd0 100644
--- a/yt/yt/core/ytree/yson_struct-inl.h
+++ b/yt/yt/core/ytree/yson_struct-inl.h
@@ -15,7 +15,6 @@
 
 #include <yt/yt/core/misc/guid.h>
 #include <yt/yt/core/misc/serialize.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <yt/yt/core/ypath/token.h>
 
diff --git a/yt/yt/core/ytree/yson_struct.cpp b/yt/yt/core/ytree/yson_struct.cpp
index 717bffc099..b4481ea422 100644
--- a/yt/yt/core/ytree/yson_struct.cpp
+++ b/yt/yt/core/ytree/yson_struct.cpp
@@ -5,8 +5,6 @@
 #include <yt/yt/core/ytree/node.h>
 #include <yt/yt/core/ytree/ypath_detail.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <util/generic/algorithm.h>
 
 namespace NYT::NYTree {
diff --git a/yt/yt/library/process/io_dispatcher.cpp b/yt/yt/library/process/io_dispatcher.cpp
index 0619243182..457a588b95 100644
--- a/yt/yt/library/process/io_dispatcher.cpp
+++ b/yt/yt/library/process/io_dispatcher.cpp
@@ -3,8 +3,6 @@
 #include <yt/yt/core/concurrency/thread_pool_poller.h>
 #include <yt/yt/core/concurrency/poller.h>
 
-#include <yt/yt/core/misc/singleton.h>
-
 namespace NYT::NPipes {
 
 using namespace NConcurrency;
diff --git a/yt/yt/library/profiling/perf/counters.cpp b/yt/yt/library/profiling/perf/counters.cpp
index ee9af81387..e5e90d4ee8 100644
--- a/yt/yt/library/profiling/perf/counters.cpp
+++ b/yt/yt/library/profiling/perf/counters.cpp
@@ -2,7 +2,6 @@
 
 #include <yt/yt/core/misc/proc.h>
 #include <yt/yt/core/misc/error.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <yt/yt/library/profiling/sensor.h>
 
@@ -10,6 +9,8 @@
 
 #include <library/cpp/yt/system/handle_eintr.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <linux/perf_event.h>
 
 #include <sys/syscall.h>
diff --git a/yt/yt/library/profiling/resource_tracker/resource_tracker.cpp b/yt/yt/library/profiling/resource_tracker/resource_tracker.cpp
index 4f0a867a94..1c45abfbbb 100644
--- a/yt/yt/library/profiling/resource_tracker/resource_tracker.cpp
+++ b/yt/yt/library/profiling/resource_tracker/resource_tracker.cpp
@@ -5,7 +5,6 @@
 #include <yt/yt/core/logging/log.h>
 
 #include <yt/yt/core/misc/fs.h>
-#include <yt/yt/core/misc/singleton.h>
 #include <yt/yt/core/misc/proc.h>
 
 #include <yt/yt/core/ypath/token.h>
diff --git a/yt/yt/library/profiling/solomon/registry.cpp b/yt/yt/library/profiling/solomon/registry.cpp
index 0aa629516f..9fe71af15a 100644
--- a/yt/yt/library/profiling/solomon/registry.cpp
+++ b/yt/yt/library/profiling/solomon/registry.cpp
@@ -4,13 +4,14 @@
 #include "percpu.h"
 
 #include <yt/yt/core/misc/protobuf_helpers.h>
-#include <yt/yt/core/misc/singleton.h>
 
 #include <library/cpp/yt/assert/assert.h>
 
 #include <yt/yt/library/profiling/impl.h>
 #include <yt/yt/library/profiling/sensor.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 namespace NYT::NProfiling {
 
 using namespace NYTree;
diff --git a/yt/yt/library/profiling/tcmalloc/profiler.cpp b/yt/yt/library/profiling/tcmalloc/profiler.cpp
index 834af5b417..bcabef9e9f 100644
--- a/yt/yt/library/profiling/tcmalloc/profiler.cpp
+++ b/yt/yt/library/profiling/tcmalloc/profiler.cpp
@@ -1,9 +1,9 @@
 #include "profiler.h"
 
-#include <yt/yt/core/misc/singleton.h>
-
 #include <yt/yt/library/profiling/producer.h>
 
+#include <library/cpp/yt/memory/leaky_ref_counted_singleton.h>
+
 #include <tcmalloc/malloc_extension.h>
 
 namespace NYT::NProfiling {