refactor dependencies: remove include to services in core/base

refactor dependencies: remove include to services in core/base

refactor dependencices

65 files changed, 79 insertions, 2 deletions

diff --git a/ydb/core/base/defs.h b/ydb/core/base/defs.h
index 6b2394e4c43..6751ad3baeb 100644
--- a/ydb/core/base/defs.h
+++ b/ydb/core/base/defs.h
@@ -4,7 +4,6 @@
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/core/event.h>
 #include <library/cpp/actors/core/actorid.h>
-#include <ydb/library/services/services.pb.h>
 #include <ydb/core/debug/valgrind_check.h>
 #include <util/generic/array_ref.h>
 #include <util/generic/string.h>
diff --git a/ydb/core/cms/CMakeLists.darwin-x86_64.txt b/ydb/core/cms/CMakeLists.darwin-x86_64.txt
index 5af4c829e07..32032ae42f1 100644
--- a/ydb/core/cms/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/cms/CMakeLists.darwin-x86_64.txt
@@ -48,6 +48,7 @@ target_link_libraries(ydb-core-cms PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms PRIVATE
@@ -115,6 +116,7 @@ target_link_libraries(ydb-core-cms.global PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms.global PRIVATE
diff --git a/ydb/core/cms/CMakeLists.linux-aarch64.txt b/ydb/core/cms/CMakeLists.linux-aarch64.txt
index 3b403d7d220..e30630afd4c 100644
--- a/ydb/core/cms/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/cms/CMakeLists.linux-aarch64.txt
@@ -49,6 +49,7 @@ target_link_libraries(ydb-core-cms PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms PRIVATE
@@ -117,6 +118,7 @@ target_link_libraries(ydb-core-cms.global PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms.global PRIVATE
diff --git a/ydb/core/cms/CMakeLists.linux-x86_64.txt b/ydb/core/cms/CMakeLists.linux-x86_64.txt
index 3b403d7d220..e30630afd4c 100644
--- a/ydb/core/cms/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/cms/CMakeLists.linux-x86_64.txt
@@ -49,6 +49,7 @@ target_link_libraries(ydb-core-cms PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms PRIVATE
@@ -117,6 +118,7 @@ target_link_libraries(ydb-core-cms.global PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms.global PRIVATE
diff --git a/ydb/core/cms/CMakeLists.windows-x86_64.txt b/ydb/core/cms/CMakeLists.windows-x86_64.txt
index 5af4c829e07..32032ae42f1 100644
--- a/ydb/core/cms/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/cms/CMakeLists.windows-x86_64.txt
@@ -48,6 +48,7 @@ target_link_libraries(ydb-core-cms PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms PRIVATE
@@ -115,6 +116,7 @@ target_link_libraries(ydb-core-cms.global PUBLIC
   ydb-core-tablet_flat
   core-tx-datashard
   ydb-library-aclib
+  ydb-library-services
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-cms.global PRIVATE
diff --git a/ydb/core/cms/audit_log.cpp b/ydb/core/cms/audit_log.cpp
index 7b5ccef49f9..146b4137520 100644
--- a/ydb/core/cms/audit_log.cpp
+++ b/ydb/core/cms/audit_log.cpp
@@ -1,5 +1,7 @@
 #include "audit_log.h"
 
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/actors/core/log.h>
 
 #include <util/string/builder.h>
diff --git a/ydb/core/cms/ya.make b/ydb/core/cms/ya.make
index e374be95321..bb8cd89bcde 100644
--- a/ydb/core/cms/ya.make
+++ b/ydb/core/cms/ya.make
@@ -125,6 +125,7 @@ PEERDIR(
     ydb/core/tablet_flat
     ydb/core/tx/datashard
     ydb/library/aclib
+    ydb/library/services
 )
 
 GENERATE_ENUM_SERIALIZATION(services.h)
diff --git a/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt
index 23f2cc9ccdf..86d8241e4e0 100644
--- a/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt
@@ -34,6 +34,7 @@ target_link_libraries(core-formats-arrow PUBLIC
   ydb-library-arrow_kernels
   ydb-library-binary_json
   ydb-library-dynumber
+  ydb-library-services
   ydb-library-arrow_clickhouse
 )
 target_sources(core-formats-arrow PRIVATE
diff --git a/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt b/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt
index 893660a4589..eb92be7d074 100644
--- a/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt
@@ -35,6 +35,7 @@ target_link_libraries(core-formats-arrow PUBLIC
   ydb-library-arrow_kernels
   ydb-library-binary_json
   ydb-library-dynumber
+  ydb-library-services
   ydb-library-arrow_clickhouse
 )
 target_sources(core-formats-arrow PRIVATE
diff --git a/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt
index 893660a4589..eb92be7d074 100644
--- a/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt
@@ -35,6 +35,7 @@ target_link_libraries(core-formats-arrow PUBLIC
   ydb-library-arrow_kernels
   ydb-library-binary_json
   ydb-library-dynumber
+  ydb-library-services
   ydb-library-arrow_clickhouse
 )
 target_sources(core-formats-arrow PRIVATE
diff --git a/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt
index cafd5476745..68134b2dc46 100644
--- a/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt
@@ -35,6 +35,7 @@ target_link_libraries(core-formats-arrow PUBLIC
   ydb-library-arrow_kernels
   ydb-library-binary_json
   ydb-library-dynumber
+  ydb-library-services
 )
 target_sources(core-formats-arrow PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_batch_builder.cpp
diff --git a/ydb/core/formats/arrow/arrow_helpers.cpp b/ydb/core/formats/arrow/arrow_helpers.cpp
index d3d14e66437..6b2c2adeb53 100644
--- a/ydb/core/formats/arrow/arrow_helpers.cpp
+++ b/ydb/core/formats/arrow/arrow_helpers.cpp
@@ -8,6 +8,8 @@
 #include "serializer/stream.h"
 
 #include <ydb/library/yverify_stream/yverify_stream.h>
+#include <ydb/library/services/services.pb.h>
+
 #include <util/system/yassert.h>
 #include <util/string/join.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/io/memory.h>
diff --git a/ydb/core/formats/arrow/ya.make b/ydb/core/formats/arrow/ya.make
index 9e58efb807d..597a889debe 100644
--- a/ydb/core/formats/arrow/ya.make
+++ b/ydb/core/formats/arrow/ya.make
@@ -14,6 +14,7 @@ PEERDIR(
     ydb/library/arrow_kernels
     ydb/library/binary_json
     ydb/library/dynumber
+    ydb/library/services
 )
 
 IF (OS_WINDOWS)
diff --git a/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt b/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt
index d2b235f8ea5..ba88f6914a6 100644
--- a/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt
@@ -57,6 +57,7 @@ target_link_libraries(ydb-core-grpc_services PUBLIC
   library-persqueue-topic_parser
   parser-pg_wrapper-interface
   yql-public-types
+  ydb-library-services
   api-grpc-draft
   api-protos
   public-lib-operation_id
diff --git a/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt b/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
index f78de7db912..44ae1979385 100644
--- a/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
@@ -58,6 +58,7 @@ target_link_libraries(ydb-core-grpc_services PUBLIC
   library-persqueue-topic_parser
   parser-pg_wrapper-interface
   yql-public-types
+  ydb-library-services
   api-grpc-draft
   api-protos
   public-lib-operation_id
diff --git a/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt b/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt
index f78de7db912..44ae1979385 100644
--- a/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt
@@ -58,6 +58,7 @@ target_link_libraries(ydb-core-grpc_services PUBLIC
   library-persqueue-topic_parser
   parser-pg_wrapper-interface
   yql-public-types
+  ydb-library-services
   api-grpc-draft
   api-protos
   public-lib-operation_id
diff --git a/ydb/core/grpc_services/CMakeLists.windows-x86_64.txt b/ydb/core/grpc_services/CMakeLists.windows-x86_64.txt
index d2b235f8ea5..ba88f6914a6 100644
--- a/ydb/core/grpc_services/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/grpc_services/CMakeLists.windows-x86_64.txt
@@ -57,6 +57,7 @@ target_link_libraries(ydb-core-grpc_services PUBLIC
   library-persqueue-topic_parser
   parser-pg_wrapper-interface
   yql-public-types
+  ydb-library-services
   api-grpc-draft
   api-protos
   public-lib-operation_id
diff --git a/ydb/core/grpc_services/grpc_mon.cpp b/ydb/core/grpc_services/grpc_mon.cpp
index 67557224e5e..5377a6b9bb2 100644
--- a/ydb/core/grpc_services/grpc_mon.cpp
+++ b/ydb/core/grpc_services/grpc_mon.cpp
@@ -1,6 +1,7 @@
 #include "grpc_mon.h"
 
 #include <ydb/core/base/events.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/cache/cache.h>
 #include <library/cpp/monlib/service/pages/templates.h>
diff --git a/ydb/core/grpc_services/grpc_publisher_service_actor.cpp b/ydb/core/grpc_services/grpc_publisher_service_actor.cpp
index 37cc3aeda3b..63f8bf3915a 100644
--- a/ydb/core/grpc_services/grpc_publisher_service_actor.cpp
+++ b/ydb/core/grpc_services/grpc_publisher_service_actor.cpp
@@ -1,5 +1,7 @@
 #include "grpc_endpoint.h"
 
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 
diff --git a/ydb/core/grpc_services/ya.make b/ydb/core/grpc_services/ya.make
index 282b97003a9..18e4b06f83a 100644
--- a/ydb/core/grpc_services/ya.make
+++ b/ydb/core/grpc_services/ya.make
@@ -120,6 +120,7 @@ PEERDIR(
     ydb/library/persqueue/topic_parser
     ydb/library/yql/parser/pg_wrapper/interface
     ydb/library/yql/public/types
+    ydb/library/services
     ydb/public/api/grpc/draft
     ydb/public/api/protos
     ydb/public/lib/operation_id
diff --git a/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt b/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt
index 623ce422879..8f8dc1e6a42 100644
--- a/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt
@@ -17,6 +17,7 @@ target_link_libraries(core-kesus-proxy PUBLIC
   core-kesus-tablet
   ydb-core-scheme
   core-tx-scheme_cache
+  ydb-library-services
   api-protos
 )
 target_sources(core-kesus-proxy PRIVATE
diff --git a/ydb/core/kesus/proxy/CMakeLists.linux-aarch64.txt b/ydb/core/kesus/proxy/CMakeLists.linux-aarch64.txt
index e7dfe3ffe48..8f61dcfc435 100644
--- a/ydb/core/kesus/proxy/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.linux-aarch64.txt
@@ -18,6 +18,7 @@ target_link_libraries(core-kesus-proxy PUBLIC
   core-kesus-tablet
   ydb-core-scheme
   core-tx-scheme_cache
+  ydb-library-services
   api-protos
 )
 target_sources(core-kesus-proxy PRIVATE
diff --git a/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt b/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt
index e7dfe3ffe48..8f61dcfc435 100644
--- a/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt
@@ -18,6 +18,7 @@ target_link_libraries(core-kesus-proxy PUBLIC
   core-kesus-tablet
   ydb-core-scheme
   core-tx-scheme_cache
+  ydb-library-services
   api-protos
 )
 target_sources(core-kesus-proxy PRIVATE
diff --git a/ydb/core/kesus/proxy/CMakeLists.windows-x86_64.txt b/ydb/core/kesus/proxy/CMakeLists.windows-x86_64.txt
index 623ce422879..8f8dc1e6a42 100644
--- a/ydb/core/kesus/proxy/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.windows-x86_64.txt
@@ -17,6 +17,7 @@ target_link_libraries(core-kesus-proxy PUBLIC
   core-kesus-tablet
   ydb-core-scheme
   core-tx-scheme_cache
+  ydb-library-services
   api-protos
 )
 target_sources(core-kesus-proxy PRIVATE
diff --git a/ydb/core/kesus/proxy/proxy_actor.cpp b/ydb/core/kesus/proxy/proxy_actor.cpp
index e93d90355fc..b6a8dcca35d 100644
--- a/ydb/core/kesus/proxy/proxy_actor.cpp
+++ b/ydb/core/kesus/proxy/proxy_actor.cpp
@@ -4,6 +4,7 @@
 
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/kesus/tablet/events.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
diff --git a/ydb/core/kesus/proxy/ya.make b/ydb/core/kesus/proxy/ya.make
index f9986d300e9..9964731d499 100644
--- a/ydb/core/kesus/proxy/ya.make
+++ b/ydb/core/kesus/proxy/ya.make
@@ -12,6 +12,7 @@ PEERDIR(
     ydb/core/kesus/tablet
     ydb/core/scheme
     ydb/core/tx/scheme_cache
+    ydb/library/services
     ydb/public/api/protos
 )
 
diff --git a/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
index 5677b3ecf4b..b28e35bf89d 100644
--- a/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
@@ -21,6 +21,7 @@ target_link_libraries(core-kesus-tablet PUBLIC
   ydb-core-metering
   ydb-core-protos
   ydb-core-tablet_flat
+  ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kesus/tablet/events.cpp
diff --git a/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt b/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt
index 3d71075132a..cc942331cd5 100644
--- a/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt
@@ -22,6 +22,7 @@ target_link_libraries(core-kesus-tablet PUBLIC
   ydb-core-metering
   ydb-core-protos
   ydb-core-tablet_flat
+  ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kesus/tablet/events.cpp
diff --git a/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
index 3d71075132a..cc942331cd5 100644
--- a/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
@@ -22,6 +22,7 @@ target_link_libraries(core-kesus-tablet PUBLIC
   ydb-core-metering
   ydb-core-protos
   ydb-core-tablet_flat
+  ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kesus/tablet/events.cpp
diff --git a/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt
index 5677b3ecf4b..b28e35bf89d 100644
--- a/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt
@@ -21,6 +21,7 @@ target_link_libraries(core-kesus-tablet PUBLIC
   ydb-core-metering
   ydb-core-protos
   ydb-core-tablet_flat
+  ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kesus/tablet/events.cpp
diff --git a/ydb/core/kesus/tablet/rate_accounting.cpp b/ydb/core/kesus/tablet/rate_accounting.cpp
index 7b451232af4..cd7123ab274 100644
--- a/ydb/core/kesus/tablet/rate_accounting.cpp
+++ b/ydb/core/kesus/tablet/rate_accounting.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/util/token_bucket.h>
 #include <ydb/core/metering/time_grid.h>
 #include <ydb/core/metering/bill_record.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/actors/core/hfunc.h>
 
diff --git a/ydb/core/kesus/tablet/ya.make b/ydb/core/kesus/tablet/ya.make
index cb07d00d898..555e17b4033 100644
--- a/ydb/core/kesus/tablet/ya.make
+++ b/ydb/core/kesus/tablet/ya.make
@@ -44,6 +44,7 @@ PEERDIR(
     ydb/core/metering
     ydb/core/protos
     ydb/core/tablet_flat
+    ydb/library/services
 )
 
 END()
diff --git a/ydb/core/metering/metering.cpp b/ydb/core/metering/metering.cpp
index f30535b9cba..08c785e054e 100644
--- a/ydb/core/metering/metering.cpp
+++ b/ydb/core/metering/metering.cpp
@@ -1,5 +1,7 @@
 #include "metering.h"
 
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/logger/record.h>
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/log.h>
diff --git a/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt b/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt
index c315b65d41b..a6d052bd1dd 100644
--- a/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-mon_alloc PUBLIC
   cpp-yt-memory
   ydb-core-base
   ydb-core-control
+  ydb-library-services
 )
 target_sources(ydb-core-mon_alloc PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/mon_alloc/monitor.cpp
diff --git a/ydb/core/mon_alloc/CMakeLists.linux-aarch64.txt b/ydb/core/mon_alloc/CMakeLists.linux-aarch64.txt
index 64c82607651..ffb79d9a970 100644
--- a/ydb/core/mon_alloc/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/mon_alloc/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-mon_alloc PUBLIC
   cpp-yt-memory
   ydb-core-base
   ydb-core-control
+  ydb-library-services
 )
 target_sources(ydb-core-mon_alloc PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/mon_alloc/monitor.cpp
diff --git a/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt b/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt
index 64c82607651..ffb79d9a970 100644
--- a/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-mon_alloc PUBLIC
   cpp-yt-memory
   ydb-core-base
   ydb-core-control
+  ydb-library-services
 )
 target_sources(ydb-core-mon_alloc PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/mon_alloc/monitor.cpp
diff --git a/ydb/core/mon_alloc/CMakeLists.windows-x86_64.txt b/ydb/core/mon_alloc/CMakeLists.windows-x86_64.txt
index c315b65d41b..a6d052bd1dd 100644
--- a/ydb/core/mon_alloc/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/mon_alloc/CMakeLists.windows-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-mon_alloc PUBLIC
   cpp-yt-memory
   ydb-core-base
   ydb-core-control
+  ydb-library-services
 )
 target_sources(ydb-core-mon_alloc PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/mon_alloc/monitor.cpp
diff --git a/ydb/core/mon_alloc/profiler.cpp b/ydb/core/mon_alloc/profiler.cpp
index 1c13ea25b6a..9f6468a6564 100644
--- a/ydb/core/mon_alloc/profiler.cpp
+++ b/ydb/core/mon_alloc/profiler.cpp
@@ -1,6 +1,8 @@
 #include "profiler.h"
 #include "tcmalloc.h"
 
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/actors/core/actorsystem.h>
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/mon.h>
diff --git a/ydb/core/mon_alloc/ya.make b/ydb/core/mon_alloc/ya.make
index c481022b424..5bc9f5e305e 100644
--- a/ydb/core/mon_alloc/ya.make
+++ b/ydb/core/mon_alloc/ya.make
@@ -26,6 +26,7 @@ PEERDIR(
     library/cpp/yt/memory
     ydb/core/base
     ydb/core/control
+    ydb/library/services
 )
 
 END()
diff --git a/ydb/core/tablet/CMakeLists.darwin-x86_64.txt b/ydb/core/tablet/CMakeLists.darwin-x86_64.txt
index a00d85cb7dc..40e5adc6b95 100644
--- a/ydb/core/tablet/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tablet/CMakeLists.darwin-x86_64.txt
@@ -29,6 +29,7 @@ target_link_libraries(ydb-core-tablet PUBLIC
   ydb-core-tracing
   ydb-core-util
   library-persqueue-topic_parser
+  ydb-library-services
 )
 target_sources(ydb-core-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet/bootstrapper.cpp
diff --git a/ydb/core/tablet/CMakeLists.linux-aarch64.txt b/ydb/core/tablet/CMakeLists.linux-aarch64.txt
index 1143b1cf620..a684f9f1ba4 100644
--- a/ydb/core/tablet/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tablet/CMakeLists.linux-aarch64.txt
@@ -30,6 +30,7 @@ target_link_libraries(ydb-core-tablet PUBLIC
   ydb-core-tracing
   ydb-core-util
   library-persqueue-topic_parser
+  ydb-library-services
 )
 target_sources(ydb-core-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet/bootstrapper.cpp
diff --git a/ydb/core/tablet/CMakeLists.linux-x86_64.txt b/ydb/core/tablet/CMakeLists.linux-x86_64.txt
index 1143b1cf620..a684f9f1ba4 100644
--- a/ydb/core/tablet/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tablet/CMakeLists.linux-x86_64.txt
@@ -30,6 +30,7 @@ target_link_libraries(ydb-core-tablet PUBLIC
   ydb-core-tracing
   ydb-core-util
   library-persqueue-topic_parser
+  ydb-library-services
 )
 target_sources(ydb-core-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet/bootstrapper.cpp
diff --git a/ydb/core/tablet/CMakeLists.windows-x86_64.txt b/ydb/core/tablet/CMakeLists.windows-x86_64.txt
index a00d85cb7dc..40e5adc6b95 100644
--- a/ydb/core/tablet/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tablet/CMakeLists.windows-x86_64.txt
@@ -29,6 +29,7 @@ target_link_libraries(ydb-core-tablet PUBLIC
   ydb-core-tracing
   ydb-core-util
   library-persqueue-topic_parser
+  ydb-library-services
 )
 target_sources(ydb-core-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet/bootstrapper.cpp
diff --git a/ydb/core/tablet/tablet_pipe_server.cpp b/ydb/core/tablet/tablet_pipe_server.cpp
index ca6a67bc8fe..ea5979c18c6 100644
--- a/ydb/core/tablet/tablet_pipe_server.cpp
+++ b/ydb/core/tablet/tablet_pipe_server.cpp
@@ -1,4 +1,6 @@
 #include <ydb/core/base/tablet_pipe.h>
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/actors/core/executor_thread.h>
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/interconnect.h>
diff --git a/ydb/core/tablet/tablet_pipecache.cpp b/ydb/core/tablet/tablet_pipecache.cpp
index f08963d8a7a..99f4552fd8f 100644
--- a/ydb/core/tablet/tablet_pipecache.cpp
+++ b/ydb/core/tablet/tablet_pipecache.cpp
@@ -1,5 +1,7 @@
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/base/tablet_pipe.h>
+#include <ydb/library/services/services.pb.h>
+
 #include <util/generic/set.h>
 #include <util/generic/hash.h>
 #include <util/generic/hash_set.h>
diff --git a/ydb/core/tablet/tablet_responsiveness_pinger.h b/ydb/core/tablet/tablet_responsiveness_pinger.h
index 15fbcf9d68b..c45432e588e 100644
--- a/ydb/core/tablet/tablet_responsiveness_pinger.h
+++ b/ydb/core/tablet/tablet_responsiveness_pinger.h
@@ -1,8 +1,12 @@
 #pragma once
 #include "defs.h"
 #include "tablet_counters.h"
+
+#include <ydb/library/services/services.pb.h>
+
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 
+
 namespace NKikimr {
 
 class TTabletResponsivenessPinger : public TActorBootstrapped<TTabletResponsivenessPinger> {
diff --git a/ydb/core/tablet/ya.make b/ydb/core/tablet/ya.make
index 81c047e88f4..2e19f94bb6f 100644
--- a/ydb/core/tablet/ya.make
+++ b/ydb/core/tablet/ya.make
@@ -73,6 +73,7 @@ PEERDIR(
     ydb/core/tracing
     ydb/core/util
     ydb/library/persqueue/topic_parser
+    ydb/library/services
 )
 
 END()
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt
index 4fea1df5425..b4dbfcd3442 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt
@@ -21,6 +21,7 @@ target_link_libraries(core-tx-long_tx_service PUBLIC
   ydb-core-base
   core-tx-columnshard
   tx-long_tx_service-public
+  ydb-library-services
 )
 target_sources(core-tx-long_tx_service PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/long_tx_service/acquire_snapshot_impl.cpp
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.linux-aarch64.txt b/ydb/core/tx/long_tx_service/CMakeLists.linux-aarch64.txt
index af6f58e84f4..2c05362e6e8 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.linux-aarch64.txt
@@ -22,6 +22,7 @@ target_link_libraries(core-tx-long_tx_service PUBLIC
   ydb-core-base
   core-tx-columnshard
   tx-long_tx_service-public
+  ydb-library-services
 )
 target_sources(core-tx-long_tx_service PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/long_tx_service/acquire_snapshot_impl.cpp
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt b/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt
index af6f58e84f4..2c05362e6e8 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt
@@ -22,6 +22,7 @@ target_link_libraries(core-tx-long_tx_service PUBLIC
   ydb-core-base
   core-tx-columnshard
   tx-long_tx_service-public
+  ydb-library-services
 )
 target_sources(core-tx-long_tx_service PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/long_tx_service/acquire_snapshot_impl.cpp
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.windows-x86_64.txt b/ydb/core/tx/long_tx_service/CMakeLists.windows-x86_64.txt
index 4fea1df5425..b4dbfcd3442 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.windows-x86_64.txt
@@ -21,6 +21,7 @@ target_link_libraries(core-tx-long_tx_service PUBLIC
   ydb-core-base
   core-tx-columnshard
   tx-long_tx_service-public
+  ydb-library-services
 )
 target_sources(core-tx-long_tx_service PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/long_tx_service/acquire_snapshot_impl.cpp
diff --git a/ydb/core/tx/long_tx_service/long_tx_service_impl.h b/ydb/core/tx/long_tx_service/long_tx_service_impl.h
index 6a83b790bfc..8d3ffac3ddb 100644
--- a/ydb/core/tx/long_tx_service/long_tx_service_impl.h
+++ b/ydb/core/tx/long_tx_service/long_tx_service_impl.h
@@ -4,6 +4,7 @@
 #include <ydb/core/tx/long_tx_service/public/events.h>
 #include <ydb/core/util/intrusive_heap.h>
 #include <ydb/core/util/ulid.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
diff --git a/ydb/core/tx/long_tx_service/ya.make b/ydb/core/tx/long_tx_service/ya.make
index ebf56aae229..a6617bbe2dd 100644
--- a/ydb/core/tx/long_tx_service/ya.make
+++ b/ydb/core/tx/long_tx_service/ya.make
@@ -14,6 +14,7 @@ PEERDIR(
     ydb/core/base
     ydb/core/tx/columnshard
     ydb/core/tx/long_tx_service/public
+    ydb/library/services
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt b/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt
index 6be40961047..a0bfaca26ec 100644
--- a/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt
@@ -18,6 +18,7 @@ target_link_libraries(library-ycloud-impl PUBLIC
   cpp-grpc-client
   library-cpp-json
   ydb-core-base
+  ydb-library-services
   lib-deprecated-client
   lib-deprecated-kicli
 )
diff --git a/ydb/library/ycloud/impl/CMakeLists.linux-aarch64.txt b/ydb/library/ycloud/impl/CMakeLists.linux-aarch64.txt
index 5777387f5d1..1363bd6cb9e 100644
--- a/ydb/library/ycloud/impl/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.linux-aarch64.txt
@@ -19,6 +19,7 @@ target_link_libraries(library-ycloud-impl PUBLIC
   cpp-grpc-client
   library-cpp-json
   ydb-core-base
+  ydb-library-services
   lib-deprecated-client
   lib-deprecated-kicli
 )
diff --git a/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt b/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt
index 5777387f5d1..1363bd6cb9e 100644
--- a/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt
@@ -19,6 +19,7 @@ target_link_libraries(library-ycloud-impl PUBLIC
   cpp-grpc-client
   library-cpp-json
   ydb-core-base
+  ydb-library-services
   lib-deprecated-client
   lib-deprecated-kicli
 )
diff --git a/ydb/library/ycloud/impl/CMakeLists.windows-x86_64.txt b/ydb/library/ycloud/impl/CMakeLists.windows-x86_64.txt
index 6be40961047..a0bfaca26ec 100644
--- a/ydb/library/ycloud/impl/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.windows-x86_64.txt
@@ -18,6 +18,7 @@ target_link_libraries(library-ycloud-impl PUBLIC
   cpp-grpc-client
   library-cpp-json
   ydb-core-base
+  ydb-library-services
   lib-deprecated-client
   lib-deprecated-kicli
 )
diff --git a/ydb/library/ycloud/impl/folder_service_adapter.cpp b/ydb/library/ycloud/impl/folder_service_adapter.cpp
index 56189b98815..7e5588e10cd 100644
--- a/ydb/library/ycloud/impl/folder_service_adapter.cpp
+++ b/ydb/library/ycloud/impl/folder_service_adapter.cpp
@@ -7,6 +7,7 @@
 
 #include <ydb/library/ycloud/api/folder_service.h>
 #include <ydb/library/ycloud/api/folder_service_transitional.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
diff --git a/ydb/library/ycloud/impl/ya.make b/ydb/library/ycloud/impl/ya.make
index 5a62430d907..a0daeed519b 100644
--- a/ydb/library/ycloud/impl/ya.make
+++ b/ydb/library/ycloud/impl/ya.make
@@ -32,6 +32,7 @@ PEERDIR(
     library/cpp/grpc/client
     library/cpp/json
     ydb/core/base
+    ydb/library/services
     ydb/public/lib/deprecated/client
     ydb/public/lib/deprecated/kicli
 )
diff --git a/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt b/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt
index e2cdd8fbf4a..3e17e7cf8f5 100644
--- a/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt
+++ b/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt
@@ -19,6 +19,7 @@ target_link_libraries(ydb-services-bg_tasks PUBLIC
   services-metadata-abstract
   services-bg_tasks-abstract
   services-bg_tasks-protos
+  ydb-library-services
 )
 target_sources(ydb-services-bg_tasks PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/bg_tasks/service.cpp
diff --git a/ydb/services/bg_tasks/CMakeLists.linux-aarch64.txt b/ydb/services/bg_tasks/CMakeLists.linux-aarch64.txt
index 9989b2b98d4..39b92941065 100644
--- a/ydb/services/bg_tasks/CMakeLists.linux-aarch64.txt
+++ b/ydb/services/bg_tasks/CMakeLists.linux-aarch64.txt
@@ -20,6 +20,7 @@ target_link_libraries(ydb-services-bg_tasks PUBLIC
   services-metadata-abstract
   services-bg_tasks-abstract
   services-bg_tasks-protos
+  ydb-library-services
 )
 target_sources(ydb-services-bg_tasks PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/bg_tasks/service.cpp
diff --git a/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt b/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt
index 9989b2b98d4..39b92941065 100644
--- a/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt
+++ b/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt
@@ -20,6 +20,7 @@ target_link_libraries(ydb-services-bg_tasks PUBLIC
   services-metadata-abstract
   services-bg_tasks-abstract
   services-bg_tasks-protos
+  ydb-library-services
 )
 target_sources(ydb-services-bg_tasks PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/bg_tasks/service.cpp
diff --git a/ydb/services/bg_tasks/CMakeLists.windows-x86_64.txt b/ydb/services/bg_tasks/CMakeLists.windows-x86_64.txt
index e2cdd8fbf4a..3e17e7cf8f5 100644
--- a/ydb/services/bg_tasks/CMakeLists.windows-x86_64.txt
+++ b/ydb/services/bg_tasks/CMakeLists.windows-x86_64.txt
@@ -19,6 +19,7 @@ target_link_libraries(ydb-services-bg_tasks PUBLIC
   services-metadata-abstract
   services-bg_tasks-abstract
   services-bg_tasks-protos
+  ydb-library-services
 )
 target_sources(ydb-services-bg_tasks PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/bg_tasks/service.cpp
diff --git a/ydb/services/bg_tasks/abstract/interface.h b/ydb/services/bg_tasks/abstract/interface.h
index 65065963329..f094c0243ed 100644
--- a/ydb/services/bg_tasks/abstract/interface.h
+++ b/ydb/services/bg_tasks/abstract/interface.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <ydb/core/base/events.h>
 #include <ydb/services/bg_tasks/protos/container.pb.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/actors/core/events.h>
 #include <library/cpp/object_factory/object_factory.h>
diff --git a/ydb/services/bg_tasks/ya.make b/ydb/services/bg_tasks/ya.make
index 76dc269b89c..c3babcea242 100644
--- a/ydb/services/bg_tasks/ya.make
+++ b/ydb/services/bg_tasks/ya.make
@@ -9,10 +9,11 @@ PEERDIR(
     ydb/services/metadata/abstract
     ydb/services/bg_tasks/abstract
     ydb/services/bg_tasks/protos
+    ydb/library/services
 )
 
 END()
 
 RECURSE_FOR_TESTS(
     ut
-)
\ No newline at end of file
+)