Refactor includes to YDB C++ SDK for federated query (#15635)

94 files changed, 141 insertions, 141 deletions

diff --git a/ydb/core/fq/libs/actors/nodes_manager.cpp b/ydb/core/fq/libs/actors/nodes_manager.cpp
index 1b1906e285..d0ecc78eac 100644
--- a/ydb/core/fq/libs/actors/nodes_manager.cpp
+++ b/ydb/core/fq/libs/actors/nodes_manager.cpp
@@ -8,8 +8,8 @@
 #include <ydb/library/actors/interconnect/events_local.h>
 #include <ydb/library/yql/providers/dq/worker_manager/interface/events.h>
 #include <yql/essentials/public/issue/yql_issue_message.h>
-#include <ydb-cpp-sdk/client/driver/driver.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
 #include <ydb/core/fq/libs/common/entity_id.h>
 #include <ydb/core/fq/libs/private_client/internal_service.h>
 #include <ydb/library/actors/core/log.h>
diff --git a/ydb/core/fq/libs/actors/pending_fetcher.cpp b/ydb/core/fq/libs/actors/pending_fetcher.cpp
index def090ba2b..29a00f3224 100644
--- a/ydb/core/fq/libs/actors/pending_fetcher.cpp
+++ b/ydb/core/fq/libs/actors/pending_fetcher.cpp
@@ -37,10 +37,10 @@
 #include <yql/essentials/public/issue/yql_issue_message.h>
 #include <yql/essentials/public/issue/protos/issue_message.pb.h>
 
-#include <ydb-cpp-sdk/client/table/table.h>
-#include <ydb-cpp-sdk/client/driver/driver.h>
-#include <ydb-cpp-sdk/client/value/value.h>
-#include <ydb-cpp-sdk/client/result/result.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/result/result.h>
 
 #include <ydb/core/fq/libs/common/compression.h>
 #include <ydb/core/fq/libs/common/entity_id.h>
diff --git a/ydb/core/fq/libs/checkpoint_storage/ut/gc_ut.cpp b/ydb/core/fq/libs/checkpoint_storage/ut/gc_ut.cpp
index b0e030a938..511052b6aa 100644
--- a/ydb/core/fq/libs/checkpoint_storage/ut/gc_ut.cpp
+++ b/ydb/core/fq/libs/checkpoint_storage/ut/gc_ut.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/fq/libs/ydb/util.h>
 
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/library/actors/core/executor_pool_basic.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
diff --git a/ydb/core/fq/libs/checkpoint_storage/ydb_checkpoint_storage.cpp b/ydb/core/fq/libs/checkpoint_storage/ydb_checkpoint_storage.cpp
index 7d5c6bfd0f..773176a68d 100644
--- a/ydb/core/fq/libs/checkpoint_storage/ydb_checkpoint_storage.cpp
+++ b/ydb/core/fq/libs/checkpoint_storage/ydb_checkpoint_storage.cpp
@@ -4,7 +4,7 @@
 #include <ydb/core/fq/libs/ydb/util.h>
 #include <ydb/core/fq/libs/ydb/ydb.h>
 
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <util/stream/str.h>
diff --git a/ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp b/ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp
index 03be0aa4ac..03440ab9df 100644
--- a/ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp
+++ b/ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp
@@ -4,7 +4,7 @@
 #include <ydb/core/fq/libs/ydb/util.h>
 #include <ydb/core/fq/libs/ydb/ydb.h>
 
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <yql/essentials/minikql/comp_nodes/mkql_saveload.h>
diff --git a/ydb/core/fq/libs/common/debug_info.cpp b/ydb/core/fq/libs/common/debug_info.cpp
index 500b23cc7a..4c0772d919 100644
--- a/ydb/core/fq/libs/common/debug_info.cpp
+++ b/ydb/core/fq/libs/common/debug_info.cpp
@@ -1,6 +1,6 @@
 #include "debug_info.h"
 
-#include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/common/debug_info.h b/ydb/core/fq/libs/common/debug_info.h
index b4e669fb82..184e600f3d 100644
--- a/ydb/core/fq/libs/common/debug_info.h
+++ b/ydb/core/fq/libs/common/debug_info.h
@@ -2,7 +2,7 @@
 
 #include <util/generic/string.h>
 
-#include <ydb-cpp-sdk/client/params/params.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/params/params.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/common/rows_proto_splitter_ut.cpp b/ydb/core/fq/libs/common/rows_proto_splitter_ut.cpp
index 2458da7566..0e0f5cf640 100644
--- a/ydb/core/fq/libs/common/rows_proto_splitter_ut.cpp
+++ b/ydb/core/fq/libs/common/rows_proto_splitter_ut.cpp
@@ -1,6 +1,6 @@
 #include "rows_proto_splitter.h"
 
-#include <ydb-cpp-sdk/client/result/result.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/result/result.h>
 #include <ydb/services/ydb/ydb_common_ut.h>
 
 namespace NFq {
diff --git a/ydb/core/fq/libs/common/util.h b/ydb/core/fq/libs/common/util.h
index b6cf8361ec..2b4f977303 100644
--- a/ydb/core/fq/libs/common/util.h
+++ b/ydb/core/fq/libs/common/util.h
@@ -6,7 +6,7 @@
 #include <google/protobuf/repeated_field.h>
 #include <yql/essentials/public/issue/yql_issue.h>
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/types/status/status.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status/status.h>
 
 #include <library/cpp/iterator/mapped.h>
 #include <util/generic/string.h>
diff --git a/ydb/core/fq/libs/compute/common/retry_actor.h b/ydb/core/fq/libs/compute/common/retry_actor.h
index 9c1cb096bb..fbbc21803c 100644
--- a/ydb/core/fq/libs/compute/common/retry_actor.h
+++ b/ydb/core/fq/libs/compute/common/retry_actor.h
@@ -4,7 +4,7 @@
 
 #include <ydb/core/fq/libs/compute/common/run_actor_params.h>
 
-#include <ydb-cpp-sdk/client/types/status_codes.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status_codes.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <library/cpp/retry/retry_policy.h>
diff --git a/ydb/core/fq/libs/compute/common/utils.cpp b/ydb/core/fq/libs/compute/common/utils.cpp
index 85f533a0ba..e5e3f585c4 100644
--- a/ydb/core/fq/libs/compute/common/utils.cpp
+++ b/ydb/core/fq/libs/compute/common/utils.cpp
@@ -7,7 +7,7 @@
 #include <yql/essentials/public/issue/yql_issue_message.h>
 #include <yql/essentials/public/issue/protos/issue_severity.pb.h>
 
-#include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/compute/common/utils.h b/ydb/core/fq/libs/compute/common/utils.h
index c0a2339024..1ae3be989a 100644
--- a/ydb/core/fq/libs/compute/common/utils.h
+++ b/ydb/core/fq/libs/compute/common/utils.h
@@ -8,8 +8,8 @@
 #include <ydb/core/fq/libs/shared_resources/shared_resources.h>
 #include <ydb/core/fq/libs/ydb/ydb.h>
 
-#include <ydb-cpp-sdk/client/table/table.h>
-#include <ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/compute/ydb/actors_factory.h b/ydb/core/fq/libs/compute/ydb/actors_factory.h
index ac21842888..699e36bb03 100644
--- a/ydb/core/fq/libs/compute/ydb/actors_factory.h
+++ b/ydb/core/fq/libs/compute/ydb/actors_factory.h
@@ -5,7 +5,7 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/base_compute_actor.h b/ydb/core/fq/libs/compute/ydb/base_compute_actor.h
index e1effa9a24..a311b534a6 100644
--- a/ydb/core/fq/libs/compute/ydb/base_compute_actor.h
+++ b/ydb/core/fq/libs/compute/ydb/base_compute_actor.h
@@ -6,7 +6,7 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/types/status_codes.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status_codes.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <library/cpp/retry/retry_policy.h>
diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
index 73a7af92ad..5b5d155ad8 100644
--- a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
+++ b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
@@ -11,8 +11,8 @@
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
 
 #include <ydb/public/lib/fq/scope.h>
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/ydb_grpc_helpers.h b/ydb/core/fq/libs/compute/ydb/control_plane/ydb_grpc_helpers.h
index 9b34f7e071..cafcc46447 100644
--- a/ydb/core/fq/libs/compute/ydb/control_plane/ydb_grpc_helpers.h
+++ b/ydb/core/fq/libs/compute/ydb/control_plane/ydb_grpc_helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/library/ycloud/api/events.h>
-#include <ydb-cpp-sdk/client/resources/ydb_resources.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/resources/ydb_resources.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/compute/ydb/events/events.h b/ydb/core/fq/libs/compute/ydb/events/events.h
index 715bac7ea9..d177a019bb 100644
--- a/ydb/core/fq/libs/compute/ydb/events/events.h
+++ b/ydb/core/fq/libs/compute/ydb/events/events.h
@@ -4,9 +4,9 @@
 #include <ydb/core/fq/libs/control_plane_storage/proto/yq_internal.pb.h>
 #include <ydb/core/fq/libs/events/event_subspace.h>
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
-#include <ydb-cpp-sdk/client/query/query.h>
-#include <ydb-cpp-sdk/client/types/operation/operation.h>
-#include <ydb-cpp-sdk/client/types/status_codes.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status_codes.h>
 
 #include <yql/essentials/public/issue/yql_issue.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
index 578f821422..5e10c5f91d 100644
--- a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
@@ -8,8 +8,8 @@
 #include <ydb/core/fq/libs/ydb/ydb.h>
 #include <ydb/library/services/services.pb.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/executer_actor.h b/ydb/core/fq/libs/compute/ydb/executer_actor.h
index afb778256b..bac08a08c3 100644
--- a/ydb/core/fq/libs/compute/ydb/executer_actor.h
+++ b/ydb/core/fq/libs/compute/ydb/executer_actor.h
@@ -6,7 +6,7 @@
 
 #include <ydb/library/actors/core/actor.h>
 
-#include <ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
index 2407837e12..7e420c6609 100644
--- a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
@@ -9,8 +9,8 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/finalizer_actor.h b/ydb/core/fq/libs/compute/ydb/finalizer_actor.h
index ff92c45a4e..de9fad7bb7 100644
--- a/ydb/core/fq/libs/compute/ydb/finalizer_actor.h
+++ b/ydb/core/fq/libs/compute/ydb/finalizer_actor.h
@@ -4,7 +4,7 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
 
 #include <ydb/library/actors/core/actor.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp b/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
index 95342a1c9e..2d3ec87d1c 100644
--- a/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
@@ -10,8 +10,8 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/initializer_actor.h b/ydb/core/fq/libs/compute/ydb/initializer_actor.h
index 5033bbce39..dc8f760633 100644
--- a/ydb/core/fq/libs/compute/ydb/initializer_actor.h
+++ b/ydb/core/fq/libs/compute/ydb/initializer_actor.h
@@ -4,7 +4,7 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
 
 #include <ydb/library/actors/core/actor.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
index 2d0f0bffba..67b30edd43 100644
--- a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
@@ -10,8 +10,8 @@
 #include <ydb/core/util/backoff.h>
 #include <ydb/library/services/services.pb.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
index 159f81d8be..acab4cfc31 100644
--- a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
@@ -12,9 +12,9 @@
 
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
-#include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
index ff929a8c40..5d850ad64c 100644
--- a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
@@ -14,8 +14,8 @@
 #include <ydb/library/yql/dq/actors/dq.h>
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
index bea43670e4..d80bb32555 100644
--- a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
@@ -13,8 +13,8 @@
 
 #include <ydb/library/yql/dq/actors/dq.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/compute/ydb/synchronization_service/synchronization_service.cpp b/ydb/core/fq/libs/compute/ydb/synchronization_service/synchronization_service.cpp
index 825a0753cc..9f0bd647dd 100644
--- a/ydb/core/fq/libs/compute/ydb/synchronization_service/synchronization_service.cpp
+++ b/ydb/core/fq/libs/compute/ydb/synchronization_service/synchronization_service.cpp
@@ -13,8 +13,8 @@
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
 
 #include <ydb/public/lib/fq/scope.h>
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <ydb/library/actors/core/actor.h>
diff --git a/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp b/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp
index 44a488754d..69671343dd 100644
--- a/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp
@@ -3,8 +3,8 @@
 #include <ydb/core/fq/libs/compute/ydb/events/events.h>
 #include <ydb/core/fq/libs/ydb/ydb.h>
 
-#include <ydb-cpp-sdk/client/query/client.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <yql/essentials/public/issue/yql_issue_message.h>
diff --git a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp
index d1a6c369ad..4c32d95695 100644
--- a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp
@@ -21,9 +21,9 @@
 #include <ydb/library/services/services.pb.h>
 #include <ydb/library/yql/dq/actors/dq.h>
 #include <yql/essentials/public/issue/yql_issue_message.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
-#include <ydb-cpp-sdk/client/proto/accessor.h>
-#include <ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
 
 
 #define LOG_E(stream) LOG_ERROR_S(*TlsActivationContext, NKikimrServices::FQ_RUN_ACTOR, "[ydb] QueryId: " << Params.QueryId << " " << stream)
diff --git a/ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.cpp b/ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.cpp
index 94ba54a61b..4ccbf33d9a 100644
--- a/ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.cpp
+++ b/ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.cpp
@@ -10,7 +10,7 @@
 #include <ydb/core/fq/libs/control_plane_storage/control_plane_storage.h>
 #include <ydb/public/api/protos/draft/fq.pb.h>
 #include <ydb/public/lib/fq/scope.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 namespace NFq::NPrivate {
diff --git a/ydb/core/fq/libs/control_plane_proxy/events/events.h b/ydb/core/fq/libs/control_plane_proxy/events/events.h
index cab26b0f0c..47526210d0 100644
--- a/ydb/core/fq/libs/control_plane_proxy/events/events.h
+++ b/ydb/core/fq/libs/control_plane_proxy/events/events.h
@@ -3,7 +3,7 @@
 #include "type_traits.h"
 
 #include <util/generic/maybe.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/core/fq/libs/control_plane_storage/events/events.h>
 #include <ydb/core/fq/libs/quota_manager/events/events.h>
 
diff --git a/ydb/core/fq/libs/control_plane_storage/events/events.h b/ydb/core/fq/libs/control_plane_storage/events/events.h
index bdcdac675d..d5b83f58da 100644
--- a/ydb/core/fq/libs/control_plane_storage/events/events.h
+++ b/ydb/core/fq/libs/control_plane_storage/events/events.h
@@ -10,7 +10,7 @@
 
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/params/params.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/params/params.h>
 
 #include <yql/essentials/public/issue/yql_issue.h>
 
@@ -19,7 +19,7 @@
 #include <ydb/core/fq/libs/control_plane_storage/proto/yq_internal.pb.h>
 #include <ydb/core/fq/libs/events/event_subspace.h>
 #include <ydb/core/fq/libs/quota_manager/events/events.h>
-#include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/control_plane_storage/internal/utils.h b/ydb/core/fq/libs/control_plane_storage/internal/utils.h
index 90adcfd1f3..51b2e2e88d 100644
--- a/ydb/core/fq/libs/control_plane_storage/internal/utils.h
+++ b/ydb/core/fq/libs/control_plane_storage/internal/utils.h
@@ -4,7 +4,7 @@
 
 #include <util/string/builder.h>
 
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
 
 #include <yql/essentials/public/issue/yql_issue_message.h>
 
diff --git a/ydb/core/fq/libs/control_plane_storage/request_actor.h b/ydb/core/fq/libs/control_plane_storage/request_actor.h
index 4f1f6aae12..fded54457d 100644
--- a/ydb/core/fq/libs/control_plane_storage/request_actor.h
+++ b/ydb/core/fq/libs/control_plane_storage/request_actor.h
@@ -7,7 +7,7 @@
 #include <ydb/core/fq/libs/db_schema/db_schema.h>
 #include <ydb/core/fq/libs/shared_resources/db_exec.h>
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
 
 #include <util/datetime/base.h>
 #include <util/generic/typetraits.h>
diff --git a/ydb/core/fq/libs/control_plane_storage/validators.h b/ydb/core/fq/libs/control_plane_storage/validators.h
index f74153d264..d5b1c3f503 100644
--- a/ydb/core/fq/libs/control_plane_storage/validators.h
+++ b/ydb/core/fq/libs/control_plane_storage/validators.h
@@ -8,10 +8,10 @@
 #include <util/string/printf.h>
 
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/params/params.h>
-#include <ydb-cpp-sdk/client/params/params.h>
-#include <ydb-cpp-sdk/client/result/result.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/params/params.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/params/params.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/result/result.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/core/fq/libs/control_plane_storage/events/events.h>
 #include <ydb/core/fq/libs/db_schema/db_schema.h>
diff --git a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_impl.h b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_impl.h
index 203c115f01..c895ade3ca 100644
--- a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_impl.h
+++ b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_impl.h
@@ -20,7 +20,7 @@
 #include <library/cpp/protobuf/interop/cast.h>
 
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <ydb/library/db_pool/db_pool.h>
diff --git a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
index 84a3f5c70a..26137ffeba 100644
--- a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
+++ b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
@@ -14,7 +14,7 @@
 #include <ydb/core/fq/libs/db_schema/db_schema.h>
 
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
 
 #include <ydb/core/fq/libs/shared_resources/db_exec.h>
 
diff --git a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_quotas.cpp b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_quotas.cpp
index 37ca11a049..75d767a913 100644
--- a/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_quotas.cpp
+++ b/ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_quotas.cpp
@@ -13,7 +13,7 @@
 #include <ydb/core/fq/libs/quota_manager/quota_manager.h>
 
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
 
 #include <util/digest/multi.h>
 
diff --git a/ydb/core/fq/libs/db_schema/db_schema.cpp b/ydb/core/fq/libs/db_schema/db_schema.cpp
index 479cecfdf9..c37da92aa5 100644
--- a/ydb/core/fq/libs/db_schema/db_schema.cpp
+++ b/ydb/core/fq/libs/db_schema/db_schema.cpp
@@ -1,6 +1,6 @@
 #include "db_schema.h"
 
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <util/string/printf.h>
 
 namespace NFq {
diff --git a/ydb/core/fq/libs/db_schema/db_schema.h b/ydb/core/fq/libs/db_schema/db_schema.h
index 45552011c0..dfac2ae3a2 100644
--- a/ydb/core/fq/libs/db_schema/db_schema.h
+++ b/ydb/core/fq/libs/db_schema/db_schema.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
-#include <ydb-cpp-sdk/client/params/params.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/params/params.h>
 
 #include <util/string/builder.h>
 #include <util/generic/hash_set.h>
diff --git a/ydb/core/fq/libs/events/events.h b/ydb/core/fq/libs/events/events.h
index 4cb7ddadbf..8d30173233 100644
--- a/ydb/core/fq/libs/events/events.h
+++ b/ydb/core/fq/libs/events/events.h
@@ -9,7 +9,7 @@
 
 #include <ydb/core/fq/libs/graph_params/proto/graph_params.pb.h>
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/library/actors/core/events.h>
 
diff --git a/ydb/core/fq/libs/health/health.cpp b/ydb/core/fq/libs/health/health.cpp
index 4a27127798..3aebb1a701 100644
--- a/ydb/core/fq/libs/health/health.cpp
+++ b/ydb/core/fq/libs/health/health.cpp
@@ -7,7 +7,7 @@
 #include <ydb/core/mon/mon.h>
 #include <library/cpp/monlib/service/pages/templates.h>
 
-#include <ydb-cpp-sdk/client/discovery/discovery.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/discovery/discovery.h>
 
 namespace NFq {
 namespace {
diff --git a/ydb/core/fq/libs/private_client/events.h b/ydb/core/fq/libs/private_client/events.h
index 1160cec150..c2ab694549 100644
--- a/ydb/core/fq/libs/private_client/events.h
+++ b/ydb/core/fq/libs/private_client/events.h
@@ -7,7 +7,7 @@
 
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 #include <ydb/core/fq/libs/events/event_subspace.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/core/fq/libs/shared_resources/shared_resources.h>
 
diff --git a/ydb/core/fq/libs/private_client/internal_service.h b/ydb/core/fq/libs/private_client/internal_service.h
index a74d63d505..0d07026de1 100644
--- a/ydb/core/fq/libs/private_client/internal_service.h
+++ b/ydb/core/fq/libs/private_client/internal_service.h
@@ -8,7 +8,7 @@
 
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 #include <ydb/core/fq/libs/events/event_subspace.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/core/fq/libs/shared_resources/shared_resources.h>
 
diff --git a/ydb/core/fq/libs/private_client/private_client.h b/ydb/core/fq/libs/private_client/private_client.h
index aa5142b455..c17922c401 100644
--- a/ydb/core/fq/libs/private_client/private_client.h
+++ b/ydb/core/fq/libs/private_client/private_client.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
 #include <ydb/core/fq/libs/grpc/fq_private_v1.grpc.pb.h>
 
diff --git a/ydb/core/fq/libs/quota_manager/quota_manager.cpp b/ydb/core/fq/libs/quota_manager/quota_manager.cpp
index d24a4b848f..014355ecfe 100644
--- a/ydb/core/fq/libs/quota_manager/quota_manager.cpp
+++ b/ydb/core/fq/libs/quota_manager/quota_manager.cpp
@@ -6,7 +6,7 @@
 #include <ydb/library/actors/core/log.h>
 #include <library/cpp/protobuf/interop/cast.h>
 
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/core/fq/libs/control_plane_storage/schema.h>
 #include <ydb/core/fq/libs/control_plane_storage/util.h>
 #include <ydb/core/fq/libs/shared_resources/db_exec.h>
diff --git a/ydb/core/fq/libs/quota_manager/quota_proxy.cpp b/ydb/core/fq/libs/quota_manager/quota_proxy.cpp
index 8425647a2a..eaf10cd234 100644
--- a/ydb/core/fq/libs/quota_manager/quota_proxy.cpp
+++ b/ydb/core/fq/libs/quota_manager/quota_proxy.cpp
@@ -5,7 +5,7 @@
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/core/fq/libs/control_plane_storage/util.h>
 #include <ydb/core/fq/libs/shared_resources/shared_resources.h>
 
diff --git a/ydb/core/fq/libs/read_rule/read_rule_creator.cpp b/ydb/core/fq/libs/read_rule/read_rule_creator.cpp
index 5c96ca7a0b..56836af2a0 100644
--- a/ydb/core/fq/libs/read_rule/read_rule_creator.cpp
+++ b/ydb/core/fq/libs/read_rule/read_rule_creator.cpp
@@ -4,7 +4,7 @@
 #include <ydb/core/fq/libs/events/events.h>
 
 #include <ydb/library/services/services.pb.h>
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <ydb/library/yql/providers/dq/api/protos/service.pb.h>
diff --git a/ydb/core/fq/libs/read_rule/read_rule_creator.h b/ydb/core/fq/libs/read_rule/read_rule_creator.h
index a53ba5ac2a..e57e802a41 100644
--- a/ydb/core/fq/libs/read_rule/read_rule_creator.h
+++ b/ydb/core/fq/libs/read_rule/read_rule_creator.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
diff --git a/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp b/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp
index 290f299289..3a13c37b99 100644
--- a/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp
+++ b/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp
@@ -4,7 +4,7 @@
 #include <ydb/core/fq/libs/events/events.h>
 
 #include <ydb/library/services/services.pb.h>
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/fq/libs/read_rule/read_rule_deleter.h b/ydb/core/fq/libs/read_rule/read_rule_deleter.h
index 237fb0348d..ea353058c9 100644
--- a/ydb/core/fq/libs/read_rule/read_rule_deleter.h
+++ b/ydb/core/fq/libs/read_rule/read_rule_deleter.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/core/fq/libs/protos/fq_private.pb.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
diff --git a/ydb/core/fq/libs/result_formatter/result_formatter.cpp b/ydb/core/fq/libs/result_formatter/result_formatter.cpp
index 9e116a27ef..2c9bc4a440 100644
--- a/ydb/core/fq/libs/result_formatter/result_formatter.cpp
+++ b/ydb/core/fq/libs/result_formatter/result_formatter.cpp
@@ -11,7 +11,7 @@
 #include <yql/essentials/minikql/mkql_node.h>
 #include <yql/essentials/minikql/computation/mkql_computation_node_holders.h>
 
-#include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
 
 #include <library/cpp/json/yson/json2yson.h>
 
diff --git a/ydb/core/fq/libs/result_formatter/result_formatter.h b/ydb/core/fq/libs/result_formatter/result_formatter.h
index 0bf654c1f2..5093091d24 100644
--- a/ydb/core/fq/libs/result_formatter/result_formatter.h
+++ b/ydb/core/fq/libs/result_formatter/result_formatter.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <ydb/public/api/protos/draft/fq.pb.h>
-#include <ydb-cpp-sdk/client/value/value.h>
-#include <ydb-cpp-sdk/client/result/result.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/result/result.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/core/fq/libs/row_dispatcher/actors_factory.h b/ydb/core/fq/libs/row_dispatcher/actors_factory.h
index 340d03cd81..0c38fcc736 100644
--- a/ydb/core/fq/libs/row_dispatcher/actors_factory.h
+++ b/ydb/core/fq/libs/row_dispatcher/actors_factory.h
@@ -3,7 +3,7 @@
 #include <ydb/core/fq/libs/config/protos/row_dispatcher.pb.h>
 #include <util/generic/ptr.h>
 #include <ydb/library/actors/core/actor.h>
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
 
 namespace NFq::NRowDispatcher {
diff --git a/ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_abstract.h b/ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_abstract.h
index c74d974b44..343ee3f786 100644
--- a/ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_abstract.h
+++ b/ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_abstract.h
@@ -3,7 +3,7 @@
 #include <ydb/core/fq/libs/row_dispatcher/events/topic_session_stats.h>
 #include <ydb/core/fq/libs/row_dispatcher/format_handler/common/common.h>
 
-#include <ydb-cpp-sdk/client/topic/read_events.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/read_events.h>
 
 #include <yql/essentials/public/udf/udf_value.h>
 
diff --git a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
index 383a5af68c..13713c1620 100644
--- a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
+++ b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
@@ -11,7 +11,7 @@
 
 #include <ydb/public/sdk/cpp/adapters/issue/issue.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 
 #include <util/generic/queue.h>
 
diff --git a/ydb/core/fq/libs/shared_resources/shared_resources.cpp b/ydb/core/fq/libs/shared_resources/shared_resources.cpp
index 680728011a..63e48122a6 100644
--- a/ydb/core/fq/libs/shared_resources/shared_resources.cpp
+++ b/ydb/core/fq/libs/shared_resources/shared_resources.cpp
@@ -6,8 +6,8 @@
 #include <ydb/library/services/services.pb.h>
 
 #include <ydb/public/api/protos/ydb_discovery.pb.h>
-#include <ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h>
-#include <ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h>
 
 #include <util/generic/cast.h>
 #include <util/generic/strbuf.h>
diff --git a/ydb/core/fq/libs/shared_resources/shared_resources.h b/ydb/core/fq/libs/shared_resources/shared_resources.h
index 7fbd700462..d8ea5d1691 100644
--- a/ydb/core/fq/libs/shared_resources/shared_resources.h
+++ b/ydb/core/fq/libs/shared_resources/shared_resources.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/library/db_pool/db_pool.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 #include <ydb/core/fq/libs/config/protos/fq_config.pb.h>
 #include <ydb/core/fq/libs/shared_resources/interface/shared_resources.h>
 
diff --git a/ydb/core/fq/libs/ydb/schema.cpp b/ydb/core/fq/libs/ydb/schema.cpp
index ff25ff42c7..52ce82c0ae 100644
--- a/ydb/core/fq/libs/ydb/schema.cpp
+++ b/ydb/core/fq/libs/ydb/schema.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/fq/libs/events/events.h>
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/log.h>
diff --git a/ydb/core/fq/libs/ydb/schema.h b/ydb/core/fq/libs/ydb/schema.h
index 2391934ab9..ffc6e4e8b0 100644
--- a/ydb/core/fq/libs/ydb/schema.h
+++ b/ydb/core/fq/libs/ydb/schema.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/fq/libs/ydb/ydb.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <library/cpp/retry/retry_policy.h>
diff --git a/ydb/core/fq/libs/ydb/ut/ydb_ut.cpp b/ydb/core/fq/libs/ydb/ut/ydb_ut.cpp
index 1310a81515..925dcaa17c 100644
--- a/ydb/core/fq/libs/ydb/ut/ydb_ut.cpp
+++ b/ydb/core/fq/libs/ydb/ut/ydb_ut.cpp
@@ -3,8 +3,8 @@
 
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
 
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/fq/libs/ydb/util.h b/ydb/core/fq/libs/ydb/util.h
index c657915c4e..1753568de1 100644
--- a/ydb/core/fq/libs/ydb/util.h
+++ b/ydb/core/fq/libs/ydb/util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/types/status/status.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status/status.h>
 #include <yql/essentials/public/issue/yql_issue_id.h>
 
 #include <util/generic/fwd.h>
diff --git a/ydb/core/fq/libs/ydb/ydb.h b/ydb/core/fq/libs/ydb/ydb.h
index 3856469ae6..b853591554 100644
--- a/ydb/core/fq/libs/ydb/ydb.h
+++ b/ydb/core/fq/libs/ydb/ydb.h
@@ -4,10 +4,10 @@
 #include <yql/essentials/public/issue/yql_issue.h>
 #include <ydb/core/fq/libs/config/protos/storage.pb.h>
 
-#include <ydb-cpp-sdk/client/coordination/coordination.h>
-#include <ydb-cpp-sdk/client/rate_limiter/rate_limiter.h>
-#include <ydb-cpp-sdk/client/table/table.h>
-#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/coordination/coordination.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/rate_limiter/rate_limiter.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 
 #include <util/stream/file.h>
 #include <util/string/strip.h>
diff --git a/ydb/core/kqp/ut/federated_query/common/common.h b/ydb/core/kqp/ut/federated_query/common/common.h
index 853c8fe1a6..bc89cdef5c 100644
--- a/ydb/core/kqp/ut/federated_query/common/common.h
+++ b/ydb/core/kqp/ut/federated_query/common/common.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
-#include <ydb-cpp-sdk/client/query/query.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
 #include <ydb/library/yql/providers/s3/actors_factory/yql_s3_actors_factory.h>
 
 namespace NKikimr::NKqp::NFederatedQueryTest {
diff --git a/ydb/core/kqp/ut/federated_query/generic_ut/kqp_generic_provider_ut.cpp b/ydb/core/kqp/ut/federated_query/generic_ut/kqp_generic_provider_ut.cpp
index 99f5b583bd..4724d18c12 100644
--- a/ydb/core/kqp/ut/federated_query/generic_ut/kqp_generic_provider_ut.cpp
+++ b/ydb/core/kqp/ut/federated_query/generic_ut/kqp_generic_provider_ut.cpp
@@ -8,9 +8,9 @@
 #include <ydb/public/api/protos/ydb_query.pb.h>
 #include <ydb/public/api/grpc/ydb_query_v1.grpc.pb.h>
 #include <ydb/public/sdk/cpp/src/library/grpc/client/grpc_client_low.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
-#include <ydb-cpp-sdk/client/query/query.h>
-#include <ydb-cpp-sdk/client/types/status_codes.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/query.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status_codes.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp
index 4e0c5fba97..bb4523a7ab 100644
--- a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp
+++ b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp
@@ -3,11 +3,11 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <yql/essentials/utils/log/log.h>
-#include <ydb-cpp-sdk/client/draft/ydb_scripting.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
-#include <ydb-cpp-sdk/client/proto/accessor.h>
-#include <ydb-cpp-sdk/client/types/operation/operation.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/draft/ydb_scripting.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <fmt/format.h>
 
diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_scheme_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_scheme_ut.cpp
index 6e138cea69..368228bfe1 100644
--- a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_scheme_ut.cpp
+++ b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_scheme_ut.cpp
@@ -3,7 +3,7 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <yql/essentials/utils/log/log.h>
-#include <ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 
 #include <fmt/format.h>
 
diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp
index 5c38627e0a..cd2a2070c2 100644
--- a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp
+++ b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp
@@ -3,11 +3,11 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <yql/essentials/utils/log/log.h>
-#include <ydb-cpp-sdk/client/operation/operation.h>
-#include <ydb-cpp-sdk/client/proto/accessor.h>
-#include <ydb-cpp-sdk/client/types/operation/operation.h>
-#include <ydb-cpp-sdk/client/table/table.h>
-#include <ydb-cpp-sdk/client/query/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/operation/operation.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
 
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/testing/unittest/registar.h>
diff --git a/ydb/core/public_http/http_req.cpp b/ydb/core/public_http/http_req.cpp
index 9378e8a239..faf732dd38 100644
--- a/ydb/core/public_http/http_req.cpp
+++ b/ydb/core/public_http/http_req.cpp
@@ -1,7 +1,7 @@
 #include "http_req.h"
 
 #include <ydb/library/actors/http/http_proxy.h>
-#include <ydb-cpp-sdk/client/types/status_codes.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/status_codes.h>
 #include <ydb/core/http_proxy/http_req.h>
 
 #include <util/generic/guid.h>
diff --git a/ydb/library/yql/providers/generic/actors/yql_generic_read_actor.cpp b/ydb/library/yql/providers/generic/actors/yql_generic_read_actor.cpp
index d71a8d783f..537baf912a 100644
--- a/ydb/library/yql/providers/generic/actors/yql_generic_read_actor.cpp
+++ b/ydb/library/yql/providers/generic/actors/yql_generic_read_actor.cpp
@@ -2,7 +2,7 @@
 #include "yql_generic_read_actor.h"
 #include "yql_generic_token_provider.h"
 
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/test_creds.h b/ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/test_creds.h
index 6a001caf00..41d8b40724 100644
--- a/ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/test_creds.h
+++ b/ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/test_creds.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 
 namespace NYql::NTestCreds {
diff --git a/ydb/library/yql/providers/generic/provider/yql_generic_state.h b/ydb/library/yql/providers/generic/provider/yql_generic_state.h
index c981b31e63..27f6f1850b 100644
--- a/ydb/library/yql/providers/generic/provider/yql_generic_state.h
+++ b/ydb/library/yql/providers/generic/provider/yql_generic_state.h
@@ -5,7 +5,7 @@
 #include <yql/essentials/core/yql_data_provider.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 #include <ydb/library/yql/providers/generic/connector/libcpp/client.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 namespace NKikimr::NMiniKQL {
     class IFunctionRegistry;
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_meta_extractor.h b/ydb/library/yql/providers/pq/async_io/dq_pq_meta_extractor.h
index 76e1b32f51..e195c8f67e 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_meta_extractor.h
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_meta_extractor.h
@@ -5,7 +5,7 @@
 #include <yql/essentials/public/udf/udf_data_type.h>
 #include <yql/essentials/public/udf/udf_value.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp
index 0c7a8c3342..f6ce58194b 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp
@@ -25,8 +25,8 @@
 #include <ydb/core/fq/libs/events/events.h>
 #include <ydb/core/fq/libs/row_dispatcher/events/data_plane.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.h b/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.h
index 9c88a59769..1f3a4622de 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.h
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.h
@@ -9,7 +9,7 @@
 #include <ydb/library/yql/providers/pq/proto/dq_io.pb.h>
 #include <ydb/library/yql/providers/pq/proto/dq_task_params.pb.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/library/actors/core/actor.h>
 
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
index 486d91652e..5237917a00 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
@@ -19,8 +19,8 @@
 #include <yql/essentials/utils/log/log.h>
 #include <yql/essentials/utils/yql_panic.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h
index a6905a90a2..7578c6b1a9 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h
@@ -10,7 +10,7 @@
 #include <ydb/library/yql/providers/pq/proto/dq_io.pb.h>
 #include <ydb/library/yql/providers/pq/proto/dq_task_params.pb.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/library/actors/core/actor.h>
 
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
index 0ac0ad087f..5529ac46a4 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
@@ -13,8 +13,8 @@
 #include <ydb/library/yql/providers/pq/proto/dq_io_state.pb.h>
 #include <yql/essentials/utils/yql_panic.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h
index c2c1e942d5..3e5e17c80a 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h
@@ -10,7 +10,7 @@
 #include <ydb/library/yql/providers/pq/proto/dq_io.pb.h>
 #include <ydb/library/yql/providers/pq/proto/dq_task_params.pb.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/library/actors/core/actor.h>
 
diff --git a/ydb/library/yql/providers/pq/cm_client/client.h b/ydb/library/yql/providers/pq/cm_client/client.h
index fe5b0c321b..3ad42e2d0b 100644
--- a/ydb/library/yql/providers/pq/cm_client/client.h
+++ b/ydb/library/yql/providers/pq/cm_client/client.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <yql/essentials/public/issue/yql_issue.h>
 
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 #include <library/cpp/threading/future/future.h>
 
diff --git a/ydb/library/yql/providers/pq/gateway/dummy/yql_pq_blocking_queue.h b/ydb/library/yql/providers/pq/gateway/dummy/yql_pq_blocking_queue.h
index 9f7e400b02..3335c0e8ec 100644
--- a/ydb/library/yql/providers/pq/gateway/dummy/yql_pq_blocking_queue.h
+++ b/ydb/library/yql/providers/pq/gateway/dummy/yql_pq_blocking_queue.h
@@ -1,4 +1,4 @@
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 
 #include <util/generic/deque.h>
 #include <util/system/condvar.h>
diff --git a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.cpp b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.cpp
index dad33ea382..2fb5322481 100644
--- a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.cpp
+++ b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.cpp
@@ -3,7 +3,7 @@
 
 #include <yql/essentials/utils/log/context.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <util/system/mutex.h>
 
diff --git a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
index de57961aa6..2fbd054599 100644
--- a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
+++ b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
@@ -6,7 +6,7 @@
 
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h b/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
index 04adf51d93..533cde59cc 100644
--- a/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
+++ b/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/datastreams/datastreams.h>
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/datastreams/datastreams.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 
 #include <yql/essentials/providers/common/proto/gateways_config.pb.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
diff --git a/ydb/library/yql/providers/pq/provider/ut/yql_pq_ut.cpp b/ydb/library/yql/providers/pq/provider/ut/yql_pq_ut.cpp
index 3df0929b32..3953190e86 100644
--- a/ydb/library/yql/providers/pq/provider/ut/yql_pq_ut.cpp
+++ b/ydb/library/yql/providers/pq/provider/ut/yql_pq_ut.cpp
@@ -34,7 +34,7 @@
 #include <yql/essentials/core/file_storage/proto/file_storage.pb.h>
 #include <yql/essentials/core/file_storage/file_storage.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <util/stream/tee.h>
 #include <util/string/cast.h>
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h b/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
index f4922273c4..4898be1347 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
@@ -4,9 +4,9 @@
 
 #include <yql/essentials/providers/common/proto/gateways_config.pb.h>
 #include <ydb/library/yql/providers/pq/cm_client/client.h>
-#include <ydb-cpp-sdk/client/datastreams/datastreams.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/datastreams/datastreams.h>
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 #include <library/cpp/threading/future/core/future.h>
 
 #include <util/generic/ptr.h>
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_topic_client.h b/ydb/library/yql/providers/pq/provider/yql_pq_topic_client.h
index d4fe9a2788..314784aa4d 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_topic_client.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_topic_client.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 
 namespace NYql {
 class ITopicClient : public TThrRefBase {
diff --git a/ydb/library/yql/providers/s3/credentials/credentials.h b/ydb/library/yql/providers/s3/credentials/credentials.h
index 8dff6fef90..7e8ddd6991 100644
--- a/ydb/library/yql/providers/s3/credentials/credentials.h
+++ b/ydb/library/yql/providers/s3/credentials/credentials.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 namespace NYql {
 
diff --git a/ydb/library/yql/providers/solomon/actors/dq_solomon_metrics_queue.h b/ydb/library/yql/providers/solomon/actors/dq_solomon_metrics_queue.h
index f6331f33b4..01a2d3fb7e 100644
--- a/ydb/library/yql/providers/solomon/actors/dq_solomon_metrics_queue.h
+++ b/ydb/library/yql/providers/solomon/actors/dq_solomon_metrics_queue.h
@@ -3,7 +3,7 @@
 #include "dq_solomon_actors_util.h"
 
 #include <ydb/library/actors/core/actor.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 
 namespace NYql::NDq {
 
diff --git a/ydb/library/yql/providers/solomon/solomon_accessor/client/solomon_accessor_client.h b/ydb/library/yql/providers/solomon/solomon_accessor/client/solomon_accessor_client.h
index ddbbeedb62..a680f29e7c 100644
--- a/ydb/library/yql/providers/solomon/solomon_accessor/client/solomon_accessor_client.h
+++ b/ydb/library/yql/providers/solomon/solomon_accessor/client/solomon_accessor_client.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/threading/future/core/future.h>
-#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/credentials/credentials.h>
 #include <ydb/library/yql/providers/solomon/proto/dq_solomon_shard.pb.h>
 
 namespace NYql::NSo {
diff --git a/ydb/services/fq/ut_integration/fq_ut.cpp b/ydb/services/fq/ut_integration/fq_ut.cpp
index c8210a2089..3c5ddd6f07 100644
--- a/ydb/services/fq/ut_integration/fq_ut.cpp
+++ b/ydb/services/fq/ut_integration/fq_ut.cpp
@@ -1,5 +1,5 @@
 #include <ydb/services/ydb/ydb_common_ut.h>
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 
 #include <ydb/public/lib/fq/fq.h>
 #include <ydb/public/lib/fq/helpers.h>
diff --git a/ydb/services/fq/ut_integration/ut_utils.cpp b/ydb/services/fq/ut_integration/ut_utils.cpp
index 3c6df45c73..11847dee5f 100644
--- a/ydb/services/fq/ut_integration/ut_utils.cpp
+++ b/ydb/services/fq/ut_integration/ut_utils.cpp
@@ -1,6 +1,6 @@
 #include "ut_utils.h"
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 #include <ydb/public/lib/fq/scope.h>
 #include <ydb/core/fq/libs/actors/proxy.h>
 #include <ydb/core/fq/libs/events/events.h>
diff --git a/ydb/services/fq/ut_integration/ut_utils.h b/ydb/services/fq/ut_integration/ut_utils.h
index ea123f2948..d3d04688db 100644
--- a/ydb/services/fq/ut_integration/ut_utils.h
+++ b/ydb/services/fq/ut_integration/ut_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/driver/driver.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h>
 #include <util/system/shellcommand.h>
 #include <contrib/libs/curl/include/curl/curl.h>
 #include <library/cpp/json/json_reader.h>