quoter move code out of ydb core base

102 files changed, 789 insertions, 129 deletions

diff --git a/ydb/core/base/CMakeLists.darwin-x86_64.txt b/ydb/core/base/CMakeLists.darwin-x86_64.txt
index 2a6628b32e4..d9cc205a3c9 100644
--- a/ydb/core/base/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/base/CMakeLists.darwin-x86_64.txt
@@ -9,12 +9,6 @@
 add_subdirectory(services)
 add_subdirectory(ut)
 add_subdirectory(ut_board_subscriber)
-get_built_tool_path(
-  TOOL_enum_parser_bin
-  TOOL_enum_parser_dependency
-  tools/enum_parser/enum_parser
-  enum_parser
-)
 
 add_library(ydb-core-base)
 target_link_libraries(ydb-core-base PUBLIC
@@ -45,7 +39,6 @@ target_link_libraries(ydb-core-base PUBLIC
   api-protos-out
   library-yql-minikql
   cpp-deprecated-atomic
-  tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/actor_activity_names.cpp
@@ -62,7 +55,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/services_assert.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage.cpp
@@ -83,8 +75,3 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/tx_processing.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype.cpp
 )
-generate_enum_serilization(ydb-core-base
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.h
-  INCLUDE_HEADERS
-  ydb/core/base/quoter.h
-)
diff --git a/ydb/core/base/CMakeLists.linux-aarch64.txt b/ydb/core/base/CMakeLists.linux-aarch64.txt
index bd7865b0b0a..7f8a6c28b8d 100644
--- a/ydb/core/base/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/base/CMakeLists.linux-aarch64.txt
@@ -9,12 +9,6 @@
 add_subdirectory(services)
 add_subdirectory(ut)
 add_subdirectory(ut_board_subscriber)
-get_built_tool_path(
-  TOOL_enum_parser_bin
-  TOOL_enum_parser_dependency
-  tools/enum_parser/enum_parser
-  enum_parser
-)
 
 add_library(ydb-core-base)
 target_link_libraries(ydb-core-base PUBLIC
@@ -46,7 +40,6 @@ target_link_libraries(ydb-core-base PUBLIC
   api-protos-out
   library-yql-minikql
   cpp-deprecated-atomic
-  tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/actor_activity_names.cpp
@@ -63,7 +56,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/services_assert.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage.cpp
@@ -84,8 +76,3 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/tx_processing.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype.cpp
 )
-generate_enum_serilization(ydb-core-base
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.h
-  INCLUDE_HEADERS
-  ydb/core/base/quoter.h
-)
diff --git a/ydb/core/base/CMakeLists.linux-x86_64.txt b/ydb/core/base/CMakeLists.linux-x86_64.txt
index bd7865b0b0a..7f8a6c28b8d 100644
--- a/ydb/core/base/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/base/CMakeLists.linux-x86_64.txt
@@ -9,12 +9,6 @@
 add_subdirectory(services)
 add_subdirectory(ut)
 add_subdirectory(ut_board_subscriber)
-get_built_tool_path(
-  TOOL_enum_parser_bin
-  TOOL_enum_parser_dependency
-  tools/enum_parser/enum_parser
-  enum_parser
-)
 
 add_library(ydb-core-base)
 target_link_libraries(ydb-core-base PUBLIC
@@ -46,7 +40,6 @@ target_link_libraries(ydb-core-base PUBLIC
   api-protos-out
   library-yql-minikql
   cpp-deprecated-atomic
-  tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/actor_activity_names.cpp
@@ -63,7 +56,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/services_assert.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage.cpp
@@ -84,8 +76,3 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/tx_processing.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype.cpp
 )
-generate_enum_serilization(ydb-core-base
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.h
-  INCLUDE_HEADERS
-  ydb/core/base/quoter.h
-)
diff --git a/ydb/core/base/CMakeLists.windows-x86_64.txt b/ydb/core/base/CMakeLists.windows-x86_64.txt
index 2a6628b32e4..d9cc205a3c9 100644
--- a/ydb/core/base/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/base/CMakeLists.windows-x86_64.txt
@@ -9,12 +9,6 @@
 add_subdirectory(services)
 add_subdirectory(ut)
 add_subdirectory(ut_board_subscriber)
-get_built_tool_path(
-  TOOL_enum_parser_bin
-  TOOL_enum_parser_dependency
-  tools/enum_parser/enum_parser
-  enum_parser
-)
 
 add_library(ydb-core-base)
 target_link_libraries(ydb-core-base PUBLIC
@@ -45,7 +39,6 @@ target_link_libraries(ydb-core-base PUBLIC
   api-protos-out
   library-yql-minikql
   cpp-deprecated-atomic
-  tools-enum_parser-enum_serialization_runtime
 )
 target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/actor_activity_names.cpp
@@ -62,7 +55,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/services_assert.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/statestorage.cpp
@@ -83,8 +75,3 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/tx_processing.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/blobstorage_grouptype.cpp
 )
-generate_enum_serilization(ydb-core-base
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.h
-  INCLUDE_HEADERS
-  ydb/core/base/quoter.h
-)
diff --git a/ydb/core/base/events.h b/ydb/core/base/events.h
index fd7b78ff2b2..ce0ee341e9d 100644
--- a/ydb/core/base/events.h
+++ b/ydb/core/base/events.h
@@ -98,7 +98,7 @@ struct TKikimrEvents : TEvents {
         ES_IAM_SERVICE,
         ES_FOLDER_SERVICE,
         ES_GRPC_MON,
-        ES_QUOTA,
+        ES_QUOTA, // must be in sync with ydb/core/quoter/public/quoter.h
         ES_COORDINATED_QUOTA,
         ES_ACCESS_SERVICE,
         ES_USER_ACCOUNT_SERVICE,
diff --git a/ydb/core/base/ya.make b/ydb/core/base/ya.make
index 3af57c78ffd..7e65496bc43 100644
--- a/ydb/core/base/ya.make
+++ b/ydb/core/base/ya.make
@@ -39,8 +39,6 @@ SRCS(
     path.cpp
     pool_stats_collector.cpp
     pool_stats_collector.h
-    quoter.cpp
-    quoter.h
     resource_profile.h
     row_version.cpp
     row_version.h
@@ -78,7 +76,6 @@ SRCS(
     tx_processing.cpp
     user_registry.h
     blobstorage_grouptype.cpp
-    wilson.h
 )
 
 PEERDIR(
@@ -109,8 +106,6 @@ PEERDIR(
     library/cpp/deprecated/atomic
 )
 
-GENERATE_ENUM_SERIALIZATION(quoter.h)
-
 END()
 
 RECURSE_FOR_TESTS(
diff --git a/ydb/core/blobstorage/backpressure/defs.h b/ydb/core/blobstorage/backpressure/defs.h
index 6fc9da407f3..6a327bf2037 100644
--- a/ydb/core/blobstorage/backpressure/defs.h
+++ b/ydb/core/blobstorage/backpressure/defs.h
@@ -10,7 +10,7 @@
 #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h>
 #include <ydb/core/protos/blobstorage.pb.h>
 #include <ydb/core/base/interconnect_channels.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/actors/core/interconnect.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 #include <library/cpp/actors/core/hfunc.h>
diff --git a/ydb/core/blobstorage/dsproxy/dsproxy.h b/ydb/core/blobstorage/dsproxy/dsproxy.h
index 091bd8df5dc..ce7f1a2478a 100644
--- a/ydb/core/blobstorage/dsproxy/dsproxy.h
+++ b/ydb/core/blobstorage/dsproxy/dsproxy.h
@@ -18,7 +18,7 @@
 #include <library/cpp/actors/wilson/wilson_span.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/group_stat.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/containers/stack_vector/stack_vec.h>
 #include <util/generic/hash_set.h>
 
diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge.cpp
index 0a46ceaa5d8..f5571e1c6a4 100644
--- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge.cpp
+++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge.cpp
@@ -10,7 +10,7 @@
 #include <ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr.h>
 #include <ydb/core/blobstorage/vdisk/common/blobstorage_dblogcutter.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/monlib/service/pages/templates.h>
 
 using namespace NKikimrServices;
diff --git a/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp.h b/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp.h
index 99c87171716..619b190e9db 100644
--- a/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp.h
+++ b/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp.h
@@ -2,7 +2,7 @@
 
 #include "defs.h"
 
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/actors/wilson/wilson_span.h>
 
 namespace NKikimr {
diff --git a/ydb/core/blobstorage/vdisk/query/query_readactor.cpp b/ydb/core/blobstorage/vdisk/query/query_readactor.cpp
index 664e57d90bb..b59131079b6 100644
--- a/ydb/core/blobstorage/vdisk/query/query_readactor.cpp
+++ b/ydb/core/blobstorage/vdisk/query/query_readactor.cpp
@@ -1,6 +1,6 @@
 #include "query_readbatch.h"
 #include <ydb/core/blobstorage/base/vdisk_priorities.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/actors/wilson/wilson_span.h>
 #include <util/generic/algorithm.h>
 
diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
index 9dcb1ec4b66..122f771b2c8 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
+++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
@@ -20,7 +20,7 @@
 #include <ydb/core/util/queue_inplace.h>
 #include <ydb/core/util/stlog.h>
 #include <ydb/core/base/counters.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/node_whiteboard/node_whiteboard.h>
 
 #include <library/cpp/monlib/service/pages/templates.h>
diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp
index f22c213961b..f56a9ae3596 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp
+++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp
@@ -2,7 +2,7 @@
 #include <ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h>
 #include <ydb/core/blobstorage/vdisk/common/vdisk_response.h>
 #include <ydb/core/blobstorage/vdisk/common/circlebufresize.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp
index b9e74248389..43c5f5f3fd2 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp
+++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp
@@ -3,7 +3,7 @@
 #include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank.h>
 #include <ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h>
 #include <ydb/core/util/queue_inplace.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <library/cpp/actors/wilson/wilson_span.h>
 
 namespace NKikimr {
diff --git a/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp b/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp
index fbf4eef012a..6d5dc6bc8e9 100644
--- a/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp
+++ b/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp
@@ -1,6 +1,6 @@
 #include "quoter_service.h"
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/base/path.h>
 #include <ydb/core/fq/libs/ydb/util.h>
 #include <ydb/core/fq/libs/ydb/ydb.h>
diff --git a/ydb/core/grpc_services/rpc_rate_limiter_api.cpp b/ydb/core/grpc_services/rpc_rate_limiter_api.cpp
index ebd720b0eec..ba484730324 100644
--- a/ydb/core/grpc_services/rpc_rate_limiter_api.cpp
+++ b/ydb/core/grpc_services/rpc_rate_limiter_api.cpp
@@ -5,7 +5,7 @@
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/kesus/tablet/events.h>
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
index b28e35bf89d..e8bcc4199b1 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-time_series_vec
   ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
diff --git a/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt b/ydb/core/kesus/tablet/CMakeLists.linux-aarch64.txt
index cc942331cd5..d0a80721c37 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-time_series_vec
   ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
diff --git a/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
index cc942331cd5..d0a80721c37 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-time_series_vec
   ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
diff --git a/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt b/ydb/core/kesus/tablet/CMakeLists.windows-x86_64.txt
index b28e35bf89d..e8bcc4199b1 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-time_series_vec
   ydb-library-services
 )
 target_sources(core-kesus-tablet PRIVATE
diff --git a/ydb/core/kesus/tablet/rate_accounting.h b/ydb/core/kesus/tablet/rate_accounting.h
index 4ac00f831c2..a3f0852ed01 100644
--- a/ydb/core/kesus/tablet/rate_accounting.h
+++ b/ydb/core/kesus/tablet/rate_accounting.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/kesus.pb.h>
-#include <ydb/core/util/time_series_vec.h>
+#include <ydb/library/time_series_vec/time_series_vec.h>
 
 #include <library/cpp/actors/core/actorsystem.h>
 #include <library/cpp/actors/core/actor.h>
diff --git a/ydb/core/kesus/tablet/ya.make b/ydb/core/kesus/tablet/ya.make
index 555e17b4033..ce4b14c6818 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/time_series_vec
     ydb/library/services
 )
 
diff --git a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
index 2f3b744c0df..eba7ad1a98b 100644
--- a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
+++ b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/base/appdata.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/client/minikql_compile/mkql_compile_service.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/kqp/gateway/kqp_metadata_loader.h>
diff --git a/ydb/core/kqp/compile_service/kqp_compile_service.cpp b/ydb/core/kqp/compile_service/kqp_compile_service.cpp
index cc920e29952..584559a0e38 100644
--- a/ydb/core/kqp/compile_service/kqp_compile_service.cpp
+++ b/ydb/core/kqp/compile_service/kqp_compile_service.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/base/appdata.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/cms/console/console.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_compute_manager.cpp b/ydb/core/kqp/compute_actor/kqp_scan_compute_manager.cpp
index 18f7cb9968b..1f974e23261 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_compute_manager.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_scan_compute_manager.cpp
@@ -1,5 +1,5 @@
 #include "kqp_scan_compute_manager.h"

-#include <ydb/core/base/wilson.h>

+#include <ydb/library/wilson_ids/wilson.h>

 #include <util/string/builder.h>

 

 namespace NKikimr::NKqp::NScanPrivate {

diff --git a/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp b/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
index 62a91c1d161..8731b9ad18e 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
@@ -1,5 +1,5 @@
 #include "kqp_scan_fetcher_actor.h"
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/kqp/common/kqp_resolve.h>
 #include <ydb/core/tx/datashard/range_ops.h>
 #include <ydb/core/actorlib_impl/long_timer.h>
diff --git a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
index b97955b4f36..4c57b020666 100644
--- a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
@@ -10,7 +10,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/tablet_pipecache.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/client/minikql_compile/db_key_resolver.h>
 #include <ydb/core/kqp/common/kqp_yql.h>
 #include <ydb/core/kqp/compute_actor/kqp_compute_actor.h>
diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
index 5b34ecbf40b..bcb554a1441 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
@@ -14,7 +14,7 @@
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/tablet_pipecache.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/protos/pqconfig.pb.h>
diff --git a/ydb/core/kqp/executer_actor/kqp_literal_executer.cpp b/ydb/core/kqp/executer_actor/kqp_literal_executer.cpp
index c24bf3ec7a9..d154b774fee 100644
--- a/ydb/core/kqp/executer_actor/kqp_literal_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_literal_executer.cpp
@@ -9,7 +9,7 @@
 #include <ydb/core/kqp/opt/kqp_query_plan.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node.h>
 
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 
 namespace NKikimr {
 namespace NKqp {
diff --git a/ydb/core/kqp/executer_actor/kqp_planner.cpp b/ydb/core/kqp/executer_actor/kqp_planner.cpp
index 05ba1f3fc31..a3eda7ec17d 100644
--- a/ydb/core/kqp/executer_actor/kqp_planner.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_planner.cpp
@@ -5,7 +5,7 @@
 
 #include <ydb/core/kqp/common/kqp_yql.h>
 #include <ydb/core/base/appdata.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 
 #include <util/generic/set.h>
 
diff --git a/ydb/core/kqp/node_service/kqp_node_service.cpp b/ydb/core/kqp/node_service/kqp_node_service.cpp
index 6e70cfdfc50..8900cf1966c 100644
--- a/ydb/core/kqp/node_service/kqp_node_service.cpp
+++ b/ydb/core/kqp/node_service/kqp_node_service.cpp
@@ -14,7 +14,7 @@
 #include <ydb/core/kqp/runtime/kqp_read_actor.h>
 #include <ydb/core/kqp/common/kqp_resolve.h>
 
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/monlib/service/pages/templates.h>
diff --git a/ydb/core/kqp/session_actor/kqp_query_state.h b/ydb/core/kqp/session_actor/kqp_query_state.h
index c795d0eeaca..1e625d40473 100644
--- a/ydb/core/kqp/session_actor/kqp_query_state.h
+++ b/ydb/core/kqp/session_actor/kqp_query_state.h
@@ -7,7 +7,7 @@
 #include <library/cpp/actors/wilson/wilson_trace.h>
 
 #include <ydb/core/base/cputime.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/kqp/common/kqp.h>
 #include <ydb/core/kqp/common/kqp_resolve.h>
 #include <ydb/core/kqp/common/kqp_timeouts.h>
diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
index d6b74dcedef..8ebf510066f 100644
--- a/ydb/core/kqp/session_actor/kqp_session_actor.cpp
+++ b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -22,7 +22,7 @@
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/cputime.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/core/protos/kqp.pb.h>
 #include <ydb/core/sys_view/service/sysview_service.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
diff --git a/ydb/core/persqueue/partition.cpp b/ydb/core/persqueue/partition.cpp
index 5e1c76e8c63..faebc0aff8d 100644
--- a/ydb/core/persqueue/partition.cpp
+++ b/ydb/core/persqueue/partition.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/protos/counters_pq.pb.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/library/persqueue/topic_parser/topic_parser.h>
diff --git a/ydb/core/persqueue/partition_monitoring.cpp b/ydb/core/persqueue/partition_monitoring.cpp
index d7673c652c7..0348762e2b5 100644
--- a/ydb/core/persqueue/partition_monitoring.cpp
+++ b/ydb/core/persqueue/partition_monitoring.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/protos/counters_pq.pb.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/library/persqueue/topic_parser/topic_parser.h>
diff --git a/ydb/core/persqueue/partition_read.cpp b/ydb/core/persqueue/partition_read.cpp
index 82b84db309a..6b7e14c0327 100644
--- a/ydb/core/persqueue/partition_read.cpp
+++ b/ydb/core/persqueue/partition_read.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/protos/counters_pq.pb.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/library/persqueue/topic_parser/topic_parser.h>
diff --git a/ydb/core/persqueue/partition_write.cpp b/ydb/core/persqueue/partition_write.cpp
index ec498d1806d..7cb0c67a6da 100644
--- a/ydb/core/persqueue/partition_write.cpp
+++ b/ydb/core/persqueue/partition_write.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/protos/counters_pq.pb.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/library/persqueue/topic_parser/topic_parser.h>
diff --git a/ydb/core/persqueue/read_speed_limiter.h b/ydb/core/persqueue/read_speed_limiter.h
index 68fef3f3493..624e7416a21 100644
--- a/ydb/core/persqueue/read_speed_limiter.h
+++ b/ydb/core/persqueue/read_speed_limiter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/persqueue/events/internal.h>
 
 #include <library/cpp/actors/core/hfunc.h>
diff --git a/ydb/core/quoter/CMakeLists.darwin-x86_64.txt b/ydb/core/quoter/CMakeLists.darwin-x86_64.txt
index 944c9b9fff3..229d5f127e7 100644
--- a/ydb/core/quoter/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/quoter/CMakeLists.darwin-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(public)
 add_subdirectory(quoter_service_bandwidth_test)
 add_subdirectory(ut)
 
@@ -20,6 +21,7 @@ target_link_libraries(ydb-core-quoter PUBLIC
   core-tx-scheme_cache
   ydb-core-util
   yql-public-issue
+  ydb-library-time_series_vec
 )
 target_sources(ydb-core-quoter PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/quoter/debug_info.cpp
diff --git a/ydb/core/quoter/CMakeLists.linux-aarch64.txt b/ydb/core/quoter/CMakeLists.linux-aarch64.txt
index 3bd282f84d9..dcb35282ad9 100644
--- a/ydb/core/quoter/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/quoter/CMakeLists.linux-aarch64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(public)
 add_subdirectory(quoter_service_bandwidth_test)
 add_subdirectory(ut)
 
@@ -21,6 +22,7 @@ target_link_libraries(ydb-core-quoter PUBLIC
   core-tx-scheme_cache
   ydb-core-util
   yql-public-issue
+  ydb-library-time_series_vec
 )
 target_sources(ydb-core-quoter PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/quoter/debug_info.cpp
diff --git a/ydb/core/quoter/CMakeLists.linux-x86_64.txt b/ydb/core/quoter/CMakeLists.linux-x86_64.txt
index 3bd282f84d9..dcb35282ad9 100644
--- a/ydb/core/quoter/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/quoter/CMakeLists.linux-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(public)
 add_subdirectory(quoter_service_bandwidth_test)
 add_subdirectory(ut)
 
@@ -21,6 +22,7 @@ target_link_libraries(ydb-core-quoter PUBLIC
   core-tx-scheme_cache
   ydb-core-util
   yql-public-issue
+  ydb-library-time_series_vec
 )
 target_sources(ydb-core-quoter PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/quoter/debug_info.cpp
diff --git a/ydb/core/quoter/CMakeLists.windows-x86_64.txt b/ydb/core/quoter/CMakeLists.windows-x86_64.txt
index 955aef639cb..788d329b834 100644
--- a/ydb/core/quoter/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/quoter/CMakeLists.windows-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(public)
 add_subdirectory(quoter_service_bandwidth_test)
 
 add_library(ydb-core-quoter)
@@ -19,6 +20,7 @@ target_link_libraries(ydb-core-quoter PUBLIC
   core-tx-scheme_cache
   ydb-core-util
   yql-public-issue
+  ydb-library-time_series_vec
 )
 target_sources(ydb-core-quoter PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/quoter/debug_info.cpp
diff --git a/ydb/core/quoter/kesus_quoter_proxy.cpp b/ydb/core/quoter/kesus_quoter_proxy.cpp
index 2be32929a33..edf33160b3b 100644
--- a/ydb/core/quoter/kesus_quoter_proxy.cpp
+++ b/ydb/core/quoter/kesus_quoter_proxy.cpp
@@ -5,7 +5,7 @@
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/path.h>
 #include <ydb/core/kesus/tablet/events.h>
-#include <ydb/core/util/time_series_vec.h>
+#include <ydb/library/time_series_vec/time_series_vec.h>
 
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 
diff --git a/ydb/core/quoter/probes.h b/ydb/core/quoter/probes.h
index c5ef9aca125..076b6f8357a 100644
--- a/ydb/core/quoter/probes.h
+++ b/ydb/core/quoter/probes.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 #include <library/cpp/lwtrace/all.h>
 
diff --git a/ydb/core/quoter/public/CMakeLists.darwin-x86_64.txt b/ydb/core/quoter/public/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..ab3c153e6a2
--- /dev/null
+++ b/ydb/core/quoter/public/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,34 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_enum_parser_bin
+  TOOL_enum_parser_dependency
+  tools/enum_parser/enum_parser
+  enum_parser
+)
+
+add_library(core-quoter-public)
+target_compile_options(core-quoter-public PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(core-quoter-public PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-actors-core
+  ydb-library-time_series_vec
+  tools-enum_parser-enum_serialization_runtime
+)
+target_sources(core-quoter-public PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.cpp
+)
+generate_enum_serilization(core-quoter-public
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.h
+  INCLUDE_HEADERS
+  ydb/core/quoter/public/quoter.h
+)
diff --git a/ydb/core/quoter/public/CMakeLists.linux-aarch64.txt b/ydb/core/quoter/public/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..7b75358ab98
--- /dev/null
+++ b/ydb/core/quoter/public/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,35 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_enum_parser_bin
+  TOOL_enum_parser_dependency
+  tools/enum_parser/enum_parser
+  enum_parser
+)
+
+add_library(core-quoter-public)
+target_compile_options(core-quoter-public PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(core-quoter-public PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  cpp-actors-core
+  ydb-library-time_series_vec
+  tools-enum_parser-enum_serialization_runtime
+)
+target_sources(core-quoter-public PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.cpp
+)
+generate_enum_serilization(core-quoter-public
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.h
+  INCLUDE_HEADERS
+  ydb/core/quoter/public/quoter.h
+)
diff --git a/ydb/core/quoter/public/CMakeLists.linux-x86_64.txt b/ydb/core/quoter/public/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..7b75358ab98
--- /dev/null
+++ b/ydb/core/quoter/public/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,35 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_enum_parser_bin
+  TOOL_enum_parser_dependency
+  tools/enum_parser/enum_parser
+  enum_parser
+)
+
+add_library(core-quoter-public)
+target_compile_options(core-quoter-public PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(core-quoter-public PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  cpp-actors-core
+  ydb-library-time_series_vec
+  tools-enum_parser-enum_serialization_runtime
+)
+target_sources(core-quoter-public PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.cpp
+)
+generate_enum_serilization(core-quoter-public
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.h
+  INCLUDE_HEADERS
+  ydb/core/quoter/public/quoter.h
+)
diff --git a/ydb/core/quoter/public/CMakeLists.txt b/ydb/core/quoter/public/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/ydb/core/quoter/public/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/core/quoter/public/CMakeLists.windows-x86_64.txt b/ydb/core/quoter/public/CMakeLists.windows-x86_64.txt
new file mode 100644
index 00000000000..ab3c153e6a2
--- /dev/null
+++ b/ydb/core/quoter/public/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,34 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_enum_parser_bin
+  TOOL_enum_parser_dependency
+  tools/enum_parser/enum_parser
+  enum_parser
+)
+
+add_library(core-quoter-public)
+target_compile_options(core-quoter-public PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(core-quoter-public PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-actors-core
+  ydb-library-time_series_vec
+  tools-enum_parser-enum_serialization_runtime
+)
+target_sources(core-quoter-public PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.cpp
+)
+generate_enum_serilization(core-quoter-public
+  ${CMAKE_SOURCE_DIR}/ydb/core/quoter/public/quoter.h
+  INCLUDE_HEADERS
+  ydb/core/quoter/public/quoter.h
+)
diff --git a/ydb/core/base/quoter.cpp b/ydb/core/quoter/public/quoter.cpp
index c31333fe567..6e4812e083f 100644
--- a/ydb/core/base/quoter.cpp
+++ b/ydb/core/quoter/public/quoter.cpp
@@ -2,9 +2,9 @@
 
 namespace NKikimr {
 
-TActorId MakeQuoterServiceID() {
+NActors::TActorId MakeQuoterServiceID() {
     char x[12] = { 'q', 'u', 'o', 't', 'e', 'r', 's', 'v', 'c' };
-    return TActorId(0, TStringBuf(x, 12));
+    return NActors::TActorId(0, TStringBuf(x, 12));
 }
 
 ui64 TEvQuota::TResourceLeaf::MakeTaggedRateRes(ui32 tag, ui32 rate) {
diff --git a/ydb/core/base/quoter.h b/ydb/core/quoter/public/quoter.h
index 41a19775bc8..f8ffdb68331 100644
--- a/ydb/core/base/quoter.h
+++ b/ydb/core/quoter/public/quoter.h
@@ -1,16 +1,20 @@
 #pragma once
-#include "defs.h"
-#include "events.h"
 #include <library/cpp/actors/core/event_local.h>
 #include <util/generic/deque.h>
 #include <util/generic/vector.h>
-#include <ydb/core/util/time_series_vec.h>
+#include <ydb/library/time_series_vec/time_series_vec.h>
+#include <library/cpp/actors/core/events.h>
 
 namespace NKikimr {
 
 struct TEvQuota {
+
+    enum EEventSpaceQuoter {
+         ES_QUOTA = 4177  // must be in sync with ydb/core/base/events.h
+    };
+
     enum EEv {
-        EvRequest = EventSpaceBegin(TKikimrEvents::ES_QUOTA),
+        EvRequest = EventSpaceBegin(EEventSpaceQuoter::ES_QUOTA),
         EvCancelRequest,
         EvClearance,
 
@@ -24,7 +28,7 @@ struct TEvQuota {
         EvEnd
     };
 
-    static_assert(EvEnd < EventSpaceEnd(TKikimrEvents::ES_QUOTA), "expect EvEnd < EventSpaceEnd(TKikimrEvents::ES_QUOTA)");
+    static_assert(EvEnd < EventSpaceEnd(EEventSpaceQuoter::ES_QUOTA), "expect EvEnd < EventSpaceEnd(TKikimrEvents::ES_QUOTA)");
 
     struct TResourceLeaf {
         static constexpr ui64 QuoterSystem = Max<ui64>(); // use as quoter id for some embedded quoters
@@ -69,7 +73,7 @@ struct TEvQuota {
     };
 
     // event cookie + sender actorid would be used as id for cancel requests
-    struct TEvRequest : public TEventLocal<TEvRequest, EvRequest> {
+    struct TEvRequest : public NActors::TEventLocal<TEvRequest, EvRequest> {
         const EResourceOperator Operator;
         const TVector<TResourceLeaf> Reqs;
         TDuration Deadline;
@@ -81,7 +85,7 @@ struct TEvQuota {
         {}
     };
 
-    struct TEvClearance : public TEventLocal<TEvClearance, EvClearance> {
+    struct TEvClearance : public NActors::TEventLocal<TEvClearance, EvClearance> {
         // clearance result, could be success or deadline, or one of error
         enum class EResult {
             GenericError,
@@ -97,12 +101,12 @@ struct TEvQuota {
 
     // when cookie present - cancel one request
     // when cookie omitted - cancel all requests from sender
-    struct TEvCancelRequest : public TEventLocal<TEvClearance, EvCancelRequest> {};
+    struct TEvCancelRequest : public NActors::TEventLocal<TEvClearance, EvCancelRequest> {};
 
     // b/w service and quoter proxy
 
     // initial request
-    struct TEvProxyRequest : public TEventLocal<TEvProxyRequest, EvProxyRequest> {
+    struct TEvProxyRequest : public NActors::TEventLocal<TEvProxyRequest, EvProxyRequest> {
         const TString Resource;
 
         TEvProxyRequest(const TString &resource)
@@ -117,7 +121,7 @@ struct TEvQuota {
         EveryActiveTick,
     };
 
-    struct TEvProxySession : public TEventLocal<TEvProxySession, EvProxySession> {
+    struct TEvProxySession : public NActors::TEventLocal<TEvProxySession, EvProxySession> {
         enum EResult {
             GenericError,
             UnknownResource,
@@ -166,7 +170,7 @@ struct TEvQuota {
         TProxyStat(const TProxyStat &x) = default;
     };
 
-    struct TEvProxyStats : public TEventLocal<TEvProxyStats, EvProxyStats> {
+    struct TEvProxyStats : public NActors::TEventLocal<TEvProxyStats, EvProxyStats> {
         const TDeque<TProxyStat> Stats;
 
         TEvProxyStats(TDeque<TProxyStat> &&stats)
@@ -174,7 +178,7 @@ struct TEvQuota {
         {}
     };
 
-    struct TEvProxyCloseSession : public TEventLocal<TEvProxyCloseSession, EvProxyCloseSession> {
+    struct TEvProxyCloseSession : public NActors::TEventLocal<TEvProxyCloseSession, EvProxyCloseSession> {
         const TString Resource;
         const ui64 ResourceId;
 
@@ -234,7 +238,7 @@ struct TEvQuota {
         {}
     };
 
-    struct TEvProxyUpdate : public TEventLocal<TEvProxyUpdate, EvProxyUpdate> {
+    struct TEvProxyUpdate : public NActors::TEventLocal<TEvProxyUpdate, EvProxyUpdate> {
         const ui64 QuoterId;
         TVector<TProxyResourceUpdate> Resources;
         const EUpdateState QuoterState;
@@ -249,6 +253,6 @@ struct TEvQuota {
 };
 
 //
-TActorId MakeQuoterServiceID();
+NActors::TActorId MakeQuoterServiceID();
 
 }
diff --git a/ydb/core/quoter/public/ya.make b/ydb/core/quoter/public/ya.make
new file mode 100644
index 00000000000..f2357366297
--- /dev/null
+++ b/ydb/core/quoter/public/ya.make
@@ -0,0 +1,17 @@
+LIBRARY()
+
+SRCS(
+    quoter.h
+    quoter.cpp
+)
+
+PEERDIR(
+    library/cpp/actors/core
+    ydb/library/time_series_vec
+)
+
+GENERATE_ENUM_SERIALIZATION(quoter.h)
+
+YQL_LAST_ABI_VERSION()
+
+END()
diff --git a/ydb/core/quoter/quoter_service.cpp b/ydb/core/quoter/quoter_service.cpp
index 24897018b77..6996e614a67 100644
--- a/ydb/core/quoter/quoter_service.cpp
+++ b/ydb/core/quoter/quoter_service.cpp
@@ -4,6 +4,7 @@
 #include "probes.h"
 
 #include <ydb/core/base/counters.h>
+#include <ydb/core/base/events.h>
 #include <library/cpp/lwtrace/mon/mon_lwtrace.h>
 
 #include <cmath>
@@ -43,6 +44,9 @@ extern const TString DISCONNECTS_COUNTER_SENSOR_NAME = "Disconnects";
 
 constexpr double TICK_RATE_EPSILON = 0.0000000001;
 
+
+static_assert(EventSpaceBegin(NKikimr::TKikimrEvents::ES_QUOTA) == EventSpaceBegin(NKikimr::TEvQuota::ES_QUOTA), "quoter event ids mismatch");
+
 NMonitoring::IHistogramCollectorPtr GetLatencyHistogramBuckets() {
     return NMonitoring::ExplicitHistogram({0, 1, 2, 5, 10, 20, 50, 100, 500, 1000, 2000, 5000, 10000, 30000, 50000});
 }
diff --git a/ydb/core/quoter/quoter_service.h b/ydb/core/quoter/quoter_service.h
index 982f6552b9e..8f4ef4b83f1 100644
--- a/ydb/core/quoter/quoter_service.h
+++ b/ydb/core/quoter/quoter_service.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "defs.h"
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.cpp b/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.cpp
index 1a48d8211a2..02ca905e077 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.cpp
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.cpp
@@ -1,5 +1,5 @@
 #include "quota_requester.h"
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 #include <cmath>
 
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.h b/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.h
index cbc0463ebdf..239956f7280 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.h
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/quota_requester.h
@@ -2,7 +2,7 @@
 #include "options.h"
 #include "server.h"
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 
diff --git a/ydb/core/quoter/ya.make b/ydb/core/quoter/ya.make
index bfc2f307a98..707467931f7 100644
--- a/ydb/core/quoter/ya.make
+++ b/ydb/core/quoter/ya.make
@@ -18,6 +18,7 @@ PEERDIR(
     ydb/core/tx/scheme_cache
     ydb/core/util
     ydb/library/yql/public/issue
+    ydb/library/time_series_vec
 )
 
 END()
diff --git a/ydb/core/testlib/basics/services.cpp b/ydb/core/testlib/basics/services.cpp
index d833168f842..c5f1087c949 100644
--- a/ydb/core/testlib/basics/services.cpp
+++ b/ydb/core/testlib/basics/services.cpp
@@ -4,7 +4,7 @@
 #include "runtime.h"
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/hive.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/base/statestorage.h>
 #include <ydb/core/base/statestorage_impl.h>
 #include <ydb/core/base/tablet_pipe.h>
diff --git a/ydb/core/tx/datashard/datashard__propose_tx_base.cpp b/ydb/core/tx/datashard/datashard__propose_tx_base.cpp
index 9f62e9246bf..a3f67353c90 100644
--- a/ydb/core/tx/datashard/datashard__propose_tx_base.cpp
+++ b/ydb/core/tx/datashard/datashard__propose_tx_base.cpp
@@ -4,7 +4,7 @@
 #include "probes.h"
 
 #include <ydb/core/util/pb.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 
 LWTRACE_USING(DATASHARD_PROVIDER)
 
diff --git a/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt b/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt
index 1cd04b6ee53..56e0a5b69f5 100644
--- a/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt
@@ -56,7 +56,6 @@ target_sources(ydb-core-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/util/queue_oneone_inplace_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/simple_cache_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/stlog_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/util/time_series_vec_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/token_bucket_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid_ut.cpp
diff --git a/ydb/core/util/ut/CMakeLists.linux-aarch64.txt b/ydb/core/util/ut/CMakeLists.linux-aarch64.txt
index 339c04ed8aa..687f3c9f882 100644
--- a/ydb/core/util/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/util/ut/CMakeLists.linux-aarch64.txt
@@ -59,7 +59,6 @@ target_sources(ydb-core-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/util/queue_oneone_inplace_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/simple_cache_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/stlog_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/util/time_series_vec_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/token_bucket_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid_ut.cpp
diff --git a/ydb/core/util/ut/CMakeLists.linux-x86_64.txt b/ydb/core/util/ut/CMakeLists.linux-x86_64.txt
index 96a038eb233..5f7ca774ee6 100644
--- a/ydb/core/util/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/util/ut/CMakeLists.linux-x86_64.txt
@@ -60,7 +60,6 @@ target_sources(ydb-core-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/util/queue_oneone_inplace_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/simple_cache_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/stlog_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/util/time_series_vec_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/token_bucket_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid_ut.cpp
diff --git a/ydb/core/util/ut/CMakeLists.windows-x86_64.txt b/ydb/core/util/ut/CMakeLists.windows-x86_64.txt
index 64fa208c0dd..c95120a8adf 100644
--- a/ydb/core/util/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/util/ut/CMakeLists.windows-x86_64.txt
@@ -49,7 +49,6 @@ target_sources(ydb-core-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/util/queue_oneone_inplace_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/simple_cache_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/stlog_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/util/time_series_vec_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/token_bucket_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid_ut.cpp
diff --git a/ydb/core/util/ut/ya.make b/ydb/core/util/ut/ya.make
index daa702955e3..c0c14508aa4 100644
--- a/ydb/core/util/ut/ya.make
+++ b/ydb/core/util/ut/ya.make
@@ -45,7 +45,6 @@ SRCS(
     queue_oneone_inplace_ut.cpp
     simple_cache_ut.cpp
     stlog_ut.cpp
-    time_series_vec_ut.cpp
     token_bucket_ut.cpp
     ui64id_ut.cpp
     ulid_ut.cpp
diff --git a/ydb/core/util/ya.make b/ydb/core/util/ya.make
index 2a1bdd22d1b..1834165ee9a 100644
--- a/ydb/core/util/ya.make
+++ b/ydb/core/util/ya.make
@@ -47,7 +47,6 @@ SRCS(
     testactorsys.h
     text.cpp
     text.h
-    time_series_vec.h
     token_bucket.h
     throughput_meter.h
     tuples.h
diff --git a/ydb/core/ymq/actor/action.h b/ydb/core/ymq/actor/action.h
index 6eedff16304..67a0b700ce9 100644
--- a/ydb/core/ymq/actor/action.h
+++ b/ydb/core/ymq/actor/action.h
@@ -14,7 +14,7 @@
 #include <ydb/core/audit/audit_log.h>
 #include <ydb/core/base/path.h>
 #include <ydb/core/base/ticket_parser.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/core/ymq/base/action.h>
 #include <ydb/core/ymq/base/acl.h>
diff --git a/ydb/core/ymq/actor/local_rate_limiter_allocator.cpp b/ydb/core/ymq/actor/local_rate_limiter_allocator.cpp
index 2fde20e8260..ce70339bbe9 100644
--- a/ydb/core/ymq/actor/local_rate_limiter_allocator.cpp
+++ b/ydb/core/ymq/actor/local_rate_limiter_allocator.cpp
@@ -1,6 +1,6 @@
 #include "local_rate_limiter_allocator.h"
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 #include <util/generic/hash_multi_map.h>
 #include <util/system/guard.h>
diff --git a/ydb/core/ymq/actor/queue_leader.cpp b/ydb/core/ymq/actor/queue_leader.cpp
index d04a0960a94..ce6fc5fb471 100644
--- a/ydb/core/ymq/actor/queue_leader.cpp
+++ b/ydb/core/ymq/actor/queue_leader.cpp
@@ -11,7 +11,7 @@
 #include <ydb/core/ymq/base/counters.h>
 #include <ydb/core/ymq/base/probes.h>
 #include <ydb/core/base/appdata.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/ymq/queues/common/queries.h>
 #include <ydb/core/ymq/queues/common/key_hashes.h>
 #include <ydb/core/ymq/queues/common/db_queries_maker.h>
diff --git a/ydb/core/ymq/actor/queue_schema.h b/ydb/core/ymq/actor/queue_schema.h
index 4e4054de7df..84dc8960561 100644
--- a/ydb/core/ymq/actor/queue_schema.h
+++ b/ydb/core/ymq/actor/queue_schema.h
@@ -2,7 +2,7 @@
 #include "defs.h"
 
 #include "schema.h"
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/kesus/tablet/events.h>
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/public/lib/value/value.h>
diff --git a/ydb/core/ymq/actor/service.cpp b/ydb/core/ymq/actor/service.cpp
index 3b8dc95a3f2..09a4182f8a8 100644
--- a/ydb/core/ymq/actor/service.cpp
+++ b/ydb/core/ymq/actor/service.cpp
@@ -18,7 +18,7 @@
 
 #include <ydb/public/lib/value/value.h>
 #include <ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h>
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/ymq/base/counters.h>
 #include <ydb/core/ymq/base/probes.h>
diff --git a/ydb/library/CMakeLists.txt b/ydb/library/CMakeLists.txt
index 3db3204702a..c24d1639d46 100644
--- a/ydb/library/CMakeLists.txt
+++ b/ydb/library/CMakeLists.txt
@@ -33,7 +33,9 @@ add_subdirectory(schlab)
 add_subdirectory(security)
 add_subdirectory(services)
 add_subdirectory(testlib)
+add_subdirectory(time_series_vec)
 add_subdirectory(uuid)
+add_subdirectory(wilson_ids)
 add_subdirectory(workload)
 add_subdirectory(yaml_config)
 add_subdirectory(ycloud)
diff --git a/ydb/library/time_series_vec/CMakeLists.darwin-x86_64.txt b/ydb/library/time_series_vec/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..51cc6db3cb6
--- /dev/null
+++ b/ydb/library/time_series_vec/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,15 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(ydb-library-time_series_vec INTERFACE)
+target_link_libraries(ydb-library-time_series_vec INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/time_series_vec/CMakeLists.linux-aarch64.txt b/ydb/library/time_series_vec/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..548d33d23ba
--- /dev/null
+++ b/ydb/library/time_series_vec/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,16 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(ydb-library-time_series_vec INTERFACE)
+target_link_libraries(ydb-library-time_series_vec INTERFACE
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/time_series_vec/CMakeLists.linux-x86_64.txt b/ydb/library/time_series_vec/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..548d33d23ba
--- /dev/null
+++ b/ydb/library/time_series_vec/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,16 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(ydb-library-time_series_vec INTERFACE)
+target_link_libraries(ydb-library-time_series_vec INTERFACE
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/time_series_vec/CMakeLists.txt b/ydb/library/time_series_vec/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/ydb/library/time_series_vec/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/library/time_series_vec/CMakeLists.windows-x86_64.txt b/ydb/library/time_series_vec/CMakeLists.windows-x86_64.txt
new file mode 100644
index 00000000000..51cc6db3cb6
--- /dev/null
+++ b/ydb/library/time_series_vec/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,15 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(ydb-library-time_series_vec INTERFACE)
+target_link_libraries(ydb-library-time_series_vec INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/core/util/time_series_vec.h b/ydb/library/time_series_vec/time_series_vec.h
index e0753e06ee9..e0753e06ee9 100644
--- a/ydb/core/util/time_series_vec.h
+++ b/ydb/library/time_series_vec/time_series_vec.h
diff --git a/ydb/core/util/time_series_vec_ut.cpp b/ydb/library/time_series_vec/time_series_vec_ut.cpp
index ca5aa41d88c..ca5aa41d88c 100644
--- a/ydb/core/util/time_series_vec_ut.cpp
+++ b/ydb/library/time_series_vec/time_series_vec_ut.cpp
diff --git a/ydb/library/time_series_vec/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/time_series_vec/ut/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..8be10746c0d
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,75 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(ydb-library-time_series_vec-ut)
+target_include_directories(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec
+)
+target_link_libraries(ydb-library-time_series_vec-ut PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-library-time_series_vec
+  library-cpp-getopt
+  library-cpp-svnversion
+  cpp-threading-future
+)
+target_link_options(ydb-library-time_series_vec-ut PRIVATE
+  -Wl,-platform_version,macos,11.0,11.0
+  -fPIC
+  -fPIC
+)
+target_sources(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec/time_series_vec_ut.cpp
+)
+set_property(
+  TARGET
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  SPLIT_FACTOR
+  10
+)
+add_yunittest(
+  NAME
+  ydb-library-time_series_vec-ut
+  TEST_TARGET
+  ydb-library-time_series_vec-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  LABELS
+  MEDIUM
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  PROCESSORS
+  1
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  TIMEOUT
+  600
+)
+target_allocator(ydb-library-time_series_vec-ut
+  system_allocator
+)
+vcs_info(ydb-library-time_series_vec-ut)
diff --git a/ydb/library/time_series_vec/ut/CMakeLists.linux-aarch64.txt b/ydb/library/time_series_vec/ut/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..e57f86f7b18
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,80 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(ydb-library-time_series_vec-ut)
+target_include_directories(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec
+)
+target_link_libraries(ydb-library-time_series_vec-ut PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  cpp-testing-unittest_main
+  ydb-library-time_series_vec
+  library-cpp-getopt
+  library-cpp-svnversion
+  cpp-threading-future
+)
+target_link_options(ydb-library-time_series_vec-ut PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec/time_series_vec_ut.cpp
+)
+set_property(
+  TARGET
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  SPLIT_FACTOR
+  10
+)
+add_yunittest(
+  NAME
+  ydb-library-time_series_vec-ut
+  TEST_TARGET
+  ydb-library-time_series_vec-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  LABELS
+  MEDIUM
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  PROCESSORS
+  1
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  TIMEOUT
+  600
+)
+target_allocator(ydb-library-time_series_vec-ut
+  cpp-malloc-jemalloc
+)
+vcs_info(ydb-library-time_series_vec-ut)
diff --git a/ydb/library/time_series_vec/ut/CMakeLists.linux-x86_64.txt b/ydb/library/time_series_vec/ut/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..0dbaf30c6e5
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,82 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(ydb-library-time_series_vec-ut)
+target_include_directories(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec
+)
+target_link_libraries(ydb-library-time_series_vec-ut PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-library-time_series_vec
+  library-cpp-getopt
+  library-cpp-svnversion
+  cpp-threading-future
+)
+target_link_options(ydb-library-time_series_vec-ut PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec/time_series_vec_ut.cpp
+)
+set_property(
+  TARGET
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  SPLIT_FACTOR
+  10
+)
+add_yunittest(
+  NAME
+  ydb-library-time_series_vec-ut
+  TEST_TARGET
+  ydb-library-time_series_vec-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  LABELS
+  MEDIUM
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  PROCESSORS
+  1
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  TIMEOUT
+  600
+)
+target_allocator(ydb-library-time_series_vec-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
+vcs_info(ydb-library-time_series_vec-ut)
diff --git a/ydb/library/time_series_vec/ut/CMakeLists.txt b/ydb/library/time_series_vec/ut/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/library/time_series_vec/ut/CMakeLists.windows-x86_64.txt b/ydb/library/time_series_vec/ut/CMakeLists.windows-x86_64.txt
new file mode 100644
index 00000000000..17b542c9370
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,70 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(ydb-library-time_series_vec-ut)
+target_include_directories(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec
+)
+target_link_libraries(ydb-library-time_series_vec-ut PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-library-time_series_vec
+  library-cpp-getopt
+  library-cpp-svnversion
+  cpp-threading-future
+)
+target_sources(ydb-library-time_series_vec-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/time_series_vec/time_series_vec_ut.cpp
+)
+set_property(
+  TARGET
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  SPLIT_FACTOR
+  10
+)
+add_yunittest(
+  NAME
+  ydb-library-time_series_vec-ut
+  TEST_TARGET
+  ydb-library-time_series_vec-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  LABELS
+  MEDIUM
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  PROCESSORS
+  1
+)
+set_yunittest_property(
+  TEST
+  ydb-library-time_series_vec-ut
+  PROPERTY
+  TIMEOUT
+  600
+)
+target_allocator(ydb-library-time_series_vec-ut
+  system_allocator
+)
+vcs_info(ydb-library-time_series_vec-ut)
diff --git a/ydb/library/time_series_vec/ut/ya.make b/ydb/library/time_series_vec/ut/ya.make
new file mode 100644
index 00000000000..85fc9e71886
--- /dev/null
+++ b/ydb/library/time_series_vec/ut/ya.make
@@ -0,0 +1,24 @@
+UNITTEST_FOR(ydb/library/time_series_vec)
+
+FORK_SUBTESTS()
+IF (WITH_VALGRIND)
+    SPLIT_FACTOR(30)
+    TIMEOUT(1200)
+    SIZE(LARGE)
+    TAG(ya:fat)
+ELSE()
+    TIMEOUT(600)
+    SIZE(MEDIUM)
+ENDIF()
+
+PEERDIR(
+    library/cpp/getopt
+    library/cpp/svnversion
+    library/cpp/threading/future
+)
+
+SRCS(
+    time_series_vec_ut.cpp
+)
+
+END()
diff --git a/ydb/library/time_series_vec/ya.make b/ydb/library/time_series_vec/ya.make
new file mode 100644
index 00000000000..85d5467f19a
--- /dev/null
+++ b/ydb/library/time_series_vec/ya.make
@@ -0,0 +1,11 @@
+LIBRARY()
+
+SRCS(
+    time_series_vec.h
+)
+
+END()
+
+RECURSE_FOR_TESTS(
+    ut
+)
diff --git a/ydb/library/wilson_ids/CMakeLists.darwin-x86_64.txt b/ydb/library/wilson_ids/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..ae2afc4629d
--- /dev/null
+++ b/ydb/library/wilson_ids/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,14 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(ydb-library-wilson_ids INTERFACE)
+target_link_libraries(ydb-library-wilson_ids INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/wilson_ids/CMakeLists.linux-aarch64.txt b/ydb/library/wilson_ids/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..16ce0bf4a80
--- /dev/null
+++ b/ydb/library/wilson_ids/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,15 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(ydb-library-wilson_ids INTERFACE)
+target_link_libraries(ydb-library-wilson_ids INTERFACE
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/wilson_ids/CMakeLists.linux-x86_64.txt b/ydb/library/wilson_ids/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..16ce0bf4a80
--- /dev/null
+++ b/ydb/library/wilson_ids/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,15 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(ydb-library-wilson_ids INTERFACE)
+target_link_libraries(ydb-library-wilson_ids INTERFACE
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/library/wilson_ids/CMakeLists.txt b/ydb/library/wilson_ids/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/ydb/library/wilson_ids/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/library/wilson_ids/CMakeLists.windows-x86_64.txt b/ydb/library/wilson_ids/CMakeLists.windows-x86_64.txt
new file mode 100644
index 00000000000..ae2afc4629d
--- /dev/null
+++ b/ydb/library/wilson_ids/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,14 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(ydb-library-wilson_ids INTERFACE)
+target_link_libraries(ydb-library-wilson_ids INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/ydb/core/base/wilson.h b/ydb/library/wilson_ids/wilson.h
index d0a2299e208..d0a2299e208 100644
--- a/ydb/core/base/wilson.h
+++ b/ydb/library/wilson_ids/wilson.h
diff --git a/ydb/library/wilson_ids/ya.make b/ydb/library/wilson_ids/ya.make
new file mode 100644
index 00000000000..55ee6f499ed
--- /dev/null
+++ b/ydb/library/wilson_ids/ya.make
@@ -0,0 +1,7 @@
+LIBRARY()
+
+SRCS(
+    wilson.h
+)
+
+END()
diff --git a/ydb/library/ya.make b/ydb/library/ya.make
index 04e97cec842..d7f20f4ed8e 100644
--- a/ydb/library/ya.make
+++ b/ydb/library/ya.make
@@ -22,6 +22,8 @@ RECURSE(
     schlab
     security
     testlib
+    time_series_vec
+    wilson_ids
     workload
     yaml_config
     workload
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt
index d2e223792a5..e6abdb15992 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(dq-actors-compute PUBLIC
   yql-dq-tasks
   minikql-comp_nodes-llvm
   yql-public-issue
+  core-quoter-public
 )
 target_sources(dq-actors-compute PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-aarch64.txt
index 071adef32c2..3b824ab6741 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-aarch64.txt
@@ -26,6 +26,7 @@ target_link_libraries(dq-actors-compute PUBLIC
   yql-dq-tasks
   minikql-comp_nodes-llvm
   yql-public-issue
+  core-quoter-public
 )
 target_sources(dq-actors-compute PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt
index 071adef32c2..3b824ab6741 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt
@@ -26,6 +26,7 @@ target_link_libraries(dq-actors-compute PUBLIC
   yql-dq-tasks
   minikql-comp_nodes-llvm
   yql-public-issue
+  core-quoter-public
 )
 target_sources(dq-actors-compute PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.windows-x86_64.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.windows-x86_64.txt
index d2e223792a5..e6abdb15992 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.windows-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(dq-actors-compute PUBLIC
   yql-dq-tasks
   minikql-comp_nodes-llvm
   yql-public-issue
+  core-quoter-public
 )
 target_sources(dq-actors-compute PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
diff --git a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
index 6e86c10b8ab..53494e31c36 100644
--- a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
@@ -5,7 +5,7 @@
 
 #include <ydb/library/yql/dq/common/dq_common.h>
 
-#include <ydb/core/base/quoter.h>
+#include <ydb/core/quoter/public/quoter.h>
 
 namespace NYql {
 namespace NDq {
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
index fe2f05af3c6..48e591d875e 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
@@ -420,7 +420,7 @@ void TDqComputeActorChannels::HandleWork(TEvInterconnect::TEvNodeDisconnected::T
     }
 }
 
-void TDqComputeActorChannels::HandleUndeliveredEvChannelData(ui64 channelId, TEvents::TEvUndelivered::EReason reason) {
+void TDqComputeActorChannels::HandleUndeliveredEvChannelData(ui64 channelId, NActors::TEvents::TEvUndelivered::EReason reason) {
     TOutputChannelState& outputChannel = OutCh(channelId);
 
     if (outputChannel.Finished && outputChannel.EarlyFinish && !SupportCheckpoints) {
@@ -449,7 +449,7 @@ void TDqComputeActorChannels::HandleUndeliveredEvChannelData(ui64 channelId, TEv
     ScheduleRetryForChannel<TOutputChannelState, TEvDqCompute::TEvRetryChannelData>(outputChannel, Now());
 }
 
-void TDqComputeActorChannels::HandleUndeliveredEvChannelDataAck(ui64 channelId, TEvents::TEvUndelivered::EReason reason) {
+void TDqComputeActorChannels::HandleUndeliveredEvChannelDataAck(ui64 channelId, NActors::TEvents::TEvUndelivered::EReason reason) {
     TInputChannelState& inputChannel = InCh(channelId);
     inputChannel.PollRequest.reset();
 
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
index 853397cc4b2..cade7d4fb70 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
@@ -4,9 +4,9 @@
 
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/interconnect/interconnect.h>
-#include <ydb/core/base/events.h>
 #include <ydb/library/yql/dq/actors/dq.h>
 
+#include <library/cpp/actors/core/interconnect.h>
 
 namespace NYql::NDq {
 
@@ -54,16 +54,16 @@ private:
     void HandleWork(TEvDqCompute::TEvChannelDataAck::TPtr& ev);
     void HandleWork(TEvDqCompute::TEvRetryChannelData::TPtr& ev);
     void HandleWork(TEvDqCompute::TEvRetryChannelDataAck::TPtr& ev);
-    void HandleWork(NKikimr::TEvents::TEvUndelivered::TPtr& ev);
-    void HandleWork(NKikimr::TEvInterconnect::TEvNodeDisconnected::TPtr& ev);
-    void HandleUndeliveredEvChannelData(ui64 channelId, NKikimr::TEvents::TEvUndelivered::EReason reason);
-    void HandleUndeliveredEvChannelDataAck(ui64 channelId, NKikimr::TEvents::TEvUndelivered::EReason reason);
+    void HandleWork(NActors::TEvents::TEvUndelivered::TPtr& ev);
+    void HandleWork(NActors::TEvInterconnect::TEvNodeDisconnected::TPtr& ev);
+    void HandleUndeliveredEvChannelData(ui64 channelId, NActors::TEvents::TEvUndelivered::EReason reason);
+    void HandleUndeliveredEvChannelDataAck(ui64 channelId, NActors::TEvents::TEvUndelivered::EReason reason);
     template <typename TChannelState, typename TRetryEvent>
     bool ScheduleRetryForChannel(TChannelState& channel, TInstant now);
 
 private:
     STATEFN(DeadState);
-    void HandlePoison(NKikimr::TEvents::TEvPoison::TPtr&);
+    void HandlePoison(NActors::TEvents::TEvPoison::TPtr&);
 
 private:
     TInstant Now() const;
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
index 7b6eb24acdb..ef64de90857 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
@@ -10,7 +10,7 @@
 #include "dq_compute_memory_quota.h"
 
 #include <ydb/library/ydb_issue/issue_helpers.h>
-#include <ydb/core/base/wilson.h>
+#include <ydb/library/wilson_ids/wilson.h>
 #include <ydb/library/services/services.pb.h>
 
 #include <ydb/library/yql/providers/dq/counters/counters.h>
diff --git a/ydb/library/yql/dq/actors/compute/ya.make b/ydb/library/yql/dq/actors/compute/ya.make
index 41f42b86075..34e9e08bfb6 100644
--- a/ydb/library/yql/dq/actors/compute/ya.make
+++ b/ydb/library/yql/dq/actors/compute/ya.make
@@ -24,6 +24,7 @@ PEERDIR(
     ydb/library/yql/dq/tasks
     ydb/library/yql/minikql/comp_nodes/llvm
     ydb/library/yql/public/issue
+    ydb/core/quoter/public
 )
 
 YQL_LAST_ABI_VERSION()