Removed ADDINCL for C++ SDK (#15655)

119 files changed, 5 insertions, 238 deletions

diff --git a/ydb/core/tx/replication/service/ya.make b/ydb/core/tx/replication/service/ya.make
index 973d831620..9ac9a4a481 100644
--- a/ydb/core/tx/replication/service/ya.make
+++ b/ydb/core/tx/replication/service/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 PEERDIR(
     library/cpp/json
     ydb/core/base
diff --git a/ydb/public/sdk/cpp/adapters/issue/ya.make b/ydb/public/sdk/cpp/adapters/issue/ya.make
index 898ca9c7cd..d7a1c1c69f 100644
--- a/ydb/public/sdk/cpp/adapters/issue/ya.make
+++ b/ydb/public/sdk/cpp/adapters/issue/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 PEERDIR(
     yql/essentials/public/issue
     ydb/library/yql/public/ydb_issue
diff --git a/ydb/public/sdk/cpp/examples/basic_example/ya.make b/ydb/public/sdk/cpp/examples/basic_example/ya.make
index e03169f3ed..6ee4ebc16f 100644
--- a/ydb/public/sdk/cpp/examples/basic_example/ya.make
+++ b/ydb/public/sdk/cpp/examples/basic_example/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     basic_example_data.cpp
diff --git a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/ya.make b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/ya.make
index 99f546b0e4..ebaa8fb6a9 100644
--- a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/ya.make
+++ b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
 )
diff --git a/ydb/public/sdk/cpp/examples/pagination/ya.make b/ydb/public/sdk/cpp/examples/pagination/ya.make
index d6517f9df8..68f27b4207 100644
--- a/ydb/public/sdk/cpp/examples/pagination/ya.make
+++ b/ydb/public/sdk/cpp/examples/pagination/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     pagination_data.cpp
diff --git a/ydb/public/sdk/cpp/examples/secondary_index/ya.make b/ydb/public/sdk/cpp/examples/secondary_index/ya.make
index 5cb7fc3388..331af00ee4 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index/ya.make
+++ b/ydb/public/sdk/cpp/examples/secondary_index/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     secondary_index.cpp
diff --git a/ydb/public/sdk/cpp/examples/secondary_index_builtin/ya.make b/ydb/public/sdk/cpp/examples/secondary_index_builtin/ya.make
index f16f03c1b2..5c38d9fd76 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index_builtin/ya.make
+++ b/ydb/public/sdk/cpp/examples/secondary_index_builtin/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     secondary_index.cpp
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/ya.make b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/ya.make
index 8f77262275..161f5dbbde 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/ya.make
+++ b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/ya.make
@@ -1,7 +1,5 @@
 PROGRAM(persqueue_reader_eventloop)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
 )
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/simple/ya.make b/ydb/public/sdk/cpp/examples/topic_reader/simple/ya.make
index 092d056391..e83263f92d 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/simple/ya.make
+++ b/ydb/public/sdk/cpp/examples/topic_reader/simple/ya.make
@@ -1,7 +1,5 @@
 PROGRAM(simple_persqueue_reader)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
 )
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/transaction/ya.make b/ydb/public/sdk/cpp/examples/topic_reader/transaction/ya.make
index 86cbb04ce3..947f7e6c74 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/transaction/ya.make
+++ b/ydb/public/sdk/cpp/examples/topic_reader/transaction/ya.make
@@ -1,7 +1,5 @@
 PROGRAM(read_from_topic_in_transaction)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     application.cpp
     main.cpp
diff --git a/ydb/public/sdk/cpp/examples/ttl/ya.make b/ydb/public/sdk/cpp/examples/ttl/ya.make
index 749d46cc7a..09fb81235f 100644
--- a/ydb/public/sdk/cpp/examples/ttl/ya.make
+++ b/ydb/public/sdk/cpp/examples/ttl/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     ttl.h
diff --git a/ydb/public/sdk/cpp/examples/vector_index/ya.make b/ydb/public/sdk/cpp/examples/vector_index/ya.make
index 5fda8195cf..b97f350efd 100644
--- a/ydb/public/sdk/cpp/examples/vector_index/ya.make
+++ b/ydb/public/sdk/cpp/examples/vector_index/ya.make
@@ -1,7 +1,5 @@
 PROGRAM()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     main.cpp
     vector_index.cpp
diff --git a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam/common/ya.make b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam/common/ya.make
index 5138def508..7557641383 100644
--- a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam/common/ya.make
+++ b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY(client-iam-common-include)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     types.h
 )
diff --git a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam_private/common/ya.make b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam_private/common/ya.make
index e8c2e25fc7..6f511369a7 100644
--- a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam_private/common/ya.make
+++ b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/iam_private/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY(client-iam-private-common-include)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     types.h
 )
diff --git a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/ya.make b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/ya.make
index 4d625cfee9..e134c07028 100644
--- a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/ya.make
+++ b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/codecs.h)
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/control_plane.h)
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/read_events.h)
diff --git a/ydb/public/sdk/cpp/sdk_common.inc b/ydb/public/sdk/cpp/sdk_common.inc
deleted file mode 100644
index d7f76f95c7..0000000000
--- a/ydb/public/sdk/cpp/sdk_common.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-ADDINCL(
-    GLOBAL ydb/public/sdk/cpp/include
-)
-
-ADDINCL(
-    ydb/public/sdk/cpp
-)
diff --git a/ydb/public/sdk/cpp/src/client/cms/ya.make b/ydb/public/sdk/cpp/src/client/cms/ya.make
index 8a5b21dbbb..707585feff 100644
--- a/ydb/public/sdk/cpp/src/client/cms/ya.make
+++ b/ydb/public/sdk/cpp/src/client/cms/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     cms.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/common_client/impl/ya.make b/ydb/public/sdk/cpp/src/client/common_client/impl/ya.make
index 9ccb37ee0d..3a91b28250 100644
--- a/ydb/public/sdk/cpp/src/client/common_client/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/common_client/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     client.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/common_client/ya.make b/ydb/public/sdk/cpp/src/client/common_client/ya.make
index f4e1fa007f..3b263c8dbd 100644
--- a/ydb/public/sdk/cpp/src/client/common_client/ya.make
+++ b/ydb/public/sdk/cpp/src/client/common_client/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     settings.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/config/ya.make b/ydb/public/sdk/cpp/src/client/config/ya.make
index d129149f9f..c6ca5393fc 100644
--- a/ydb/public/sdk/cpp/src/client/config/ya.make
+++ b/ydb/public/sdk/cpp/src/client/config/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     config.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/coordination/ya.make b/ydb/public/sdk/cpp/src/client/coordination/ya.make
index e31a143049..bd9fd297f1 100644
--- a/ydb/public/sdk/cpp/src/client/coordination/ya.make
+++ b/ydb/public/sdk/cpp/src/client/coordination/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     coordination.cpp
     proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/src/client/datastreams/ya.make b/ydb/public/sdk/cpp/src/client/datastreams/ya.make
index eaa3bd3165..f41488eede 100644
--- a/ydb/public/sdk/cpp/src/client/datastreams/ya.make
+++ b/ydb/public/sdk/cpp/src/client/datastreams/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     datastreams.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/debug/ya.make b/ydb/public/sdk/cpp/src/client/debug/ya.make
index 1c88ec5790..001117a5ea 100644
--- a/ydb/public/sdk/cpp/src/client/debug/ya.make
+++ b/ydb/public/sdk/cpp/src/client/debug/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     client.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/discovery/ya.make b/ydb/public/sdk/cpp/src/client/discovery/ya.make
index ae4ef33264..b176574866 100644
--- a/ydb/public/sdk/cpp/src/client/discovery/ya.make
+++ b/ydb/public/sdk/cpp/src/client/discovery/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     discovery.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/draft/ya.make b/ydb/public/sdk/cpp/src/client/draft/ya.make
index fd341620c8..6690f78650 100644
--- a/ydb/public/sdk/cpp/src/client/draft/ya.make
+++ b/ydb/public/sdk/cpp/src/client/draft/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     ydb_dynamic_config.cpp
     ydb_replication.cpp
diff --git a/ydb/public/sdk/cpp/src/client/driver/ya.make b/ydb/public/sdk/cpp/src/client/driver/ya.make
index e5a28314bd..66ff82d2bf 100644
--- a/ydb/public/sdk/cpp/src/client/driver/ya.make
+++ b/ydb/public/sdk/cpp/src/client/driver/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     driver.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/export/ya.make b/ydb/public/sdk/cpp/src/client/export/ya.make
index 9b6b816aaf..1d4d215b53 100644
--- a/ydb/public/sdk/cpp/src/client/export/ya.make
+++ b/ydb/public/sdk/cpp/src/client/export/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     export.cpp
     out.cpp
diff --git a/ydb/public/sdk/cpp/src/client/extension_common/ya.make b/ydb/public/sdk/cpp/src/client/extension_common/ya.make
index 85e5847bf4..2bfc23a795 100644
--- a/ydb/public/sdk/cpp/src/client/extension_common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/extension_common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     extension.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/extensions/discovery_mutator/ya.make b/ydb/public/sdk/cpp/src/client/extensions/discovery_mutator/ya.make
index ae92c1b374..e943d384f4 100644
--- a/ydb/public/sdk/cpp/src/client/extensions/discovery_mutator/ya.make
+++ b/ydb/public/sdk/cpp/src/client/extensions/discovery_mutator/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     discovery_mutator.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/extensions/solomon_stats/ya.make b/ydb/public/sdk/cpp/src/client/extensions/solomon_stats/ya.make
index 9f0ac06b8d..5fa75228e4 100644
--- a/ydb/public/sdk/cpp/src/client/extensions/solomon_stats/ya.make
+++ b/ydb/public/sdk/cpp/src/client/extensions/solomon_stats/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     pull_client.cpp
     pull_connector.cpp
diff --git a/ydb/public/sdk/cpp/src/client/federated_topic/impl/ya.make b/ydb/public/sdk/cpp/src/client/federated_topic/impl/ya.make
index 6a102764f9..e99caf2bf1 100644
--- a/ydb/public/sdk/cpp/src/client/federated_topic/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/federated_topic/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     federated_read_session.h
     federated_read_session.cpp
diff --git a/ydb/public/sdk/cpp/src/client/federated_topic/ut/fds_mock/ya.make b/ydb/public/sdk/cpp/src/client/federated_topic/ut/fds_mock/ya.make
index c2d5ffb214..cedc8d7d91 100644
--- a/ydb/public/sdk/cpp/src/client/federated_topic/ut/fds_mock/ya.make
+++ b/ydb/public/sdk/cpp/src/client/federated_topic/ut/fds_mock/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     fds_mock.h
 )
diff --git a/ydb/public/sdk/cpp/src/client/federated_topic/ut/ya.make b/ydb/public/sdk/cpp/src/client/federated_topic/ut/ya.make
index cad2686606..38a0fcbd8b 100644
--- a/ydb/public/sdk/cpp/src/client/federated_topic/ut/ya.make
+++ b/ydb/public/sdk/cpp/src/client/federated_topic/ut/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/src/client/federated_topic/ya.make b/ydb/public/sdk/cpp/src/client/federated_topic/ya.make
index b58abff2e1..f33a98f322 100644
--- a/ydb/public/sdk/cpp/src/client/federated_topic/ya.make
+++ b/ydb/public/sdk/cpp/src/client/federated_topic/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/federated_topic/federated_topic.h)
 
 SRCS(
diff --git a/ydb/public/sdk/cpp/src/client/helpers/ya.make b/ydb/public/sdk/cpp/src/client/helpers/ya.make
index e1b7b97088..8dbab2c03f 100644
--- a/ydb/public/sdk/cpp/src/client/helpers/ya.make
+++ b/ydb/public/sdk/cpp/src/client/helpers/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     helpers.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/iam/common/ya.make b/ydb/public/sdk/cpp/src/client/iam/common/ya.make
index f27a760e58..068ae005e4 100644
--- a/ydb/public/sdk/cpp/src/client/iam/common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/iam/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     iam.h
 )
diff --git a/ydb/public/sdk/cpp/src/client/iam/ya.make b/ydb/public/sdk/cpp/src/client/iam/ya.make
index 449886b88d..e097bc5e6f 100644
--- a/ydb/public/sdk/cpp/src/client/iam/ya.make
+++ b/ydb/public/sdk/cpp/src/client/iam/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     iam.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/iam_private/common/ya.make b/ydb/public/sdk/cpp/src/client/iam_private/common/ya.make
index a2990e6345..818aa044c1 100644
--- a/ydb/public/sdk/cpp/src/client/iam_private/common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/iam_private/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     iam.h
 )
diff --git a/ydb/public/sdk/cpp/src/client/iam_private/ya.make b/ydb/public/sdk/cpp/src/client/iam_private/ya.make
index ce4b7a5129..8cfdff1154 100644
--- a/ydb/public/sdk/cpp/src/client/iam_private/ya.make
+++ b/ydb/public/sdk/cpp/src/client/iam_private/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     iam.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_endpoints/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_endpoints/ya.make
index e580efaafd..e0bc45c972 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_endpoints/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_endpoints/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     endpoints.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/common/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/common/ya.make
index cf73914736..1842c788b9 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     parser.cpp
     getenv.cpp
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/db_driver_state/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/db_driver_state/ya.make
index ca5bf2b7a6..5719de2b37 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/db_driver_state/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/db_driver_state/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     authenticator.cpp
     endpoint_pool.cpp
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/grpc_connections/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/grpc_connections/ya.make
index 5ce41dc9a7..1bd264bd23 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/grpc_connections/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/grpc_connections/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     actions.cpp
     grpc_connections.cpp
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/kqp_session_common/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/kqp_session_common/ya.make
index 629df1ea13..723dc3e7dc 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/kqp_session_common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/kqp_session_common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     kqp_session_common.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/logger/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/logger/ya.make
index 25cadcab0e..b0599d4144 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/logger/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/logger/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     log.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/make_request/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/make_request/ya.make
index b0a40422de..4794e82b83 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/make_request/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/make_request/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     make.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/plain_status/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/plain_status/ya.make
index 6bf23008fe..1d92e644f7 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/plain_status/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/plain_status/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     status.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/retry/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/retry/ya.make
index da50cdb6a2..39155892a0 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/retry/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/retry/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     retry.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/session_pool/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/session_pool/ya.make
index f12dffa2fc..22f9116105 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/session_pool/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/session_pool/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     session_pool.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/thread_pool/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/thread_pool/ya.make
index f5e706f1e5..aa626871c6 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/thread_pool/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/thread_pool/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     pool.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/value_helpers/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/value_helpers/ya.make
index f92e5abd15..b045208650 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/value_helpers/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/value_helpers/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     helpers.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_stats/ya.make b/ydb/public/sdk/cpp/src/client/impl/ydb_stats/ya.make
index 3b9f01f6d5..9a186926e0 100644
--- a/ydb/public/sdk/cpp/src/client/impl/ydb_stats/ya.make
+++ b/ydb/public/sdk/cpp/src/client/impl/ydb_stats/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     stats.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/import/ya.make b/ydb/public/sdk/cpp/src/client/import/ya.make
index 76d170c09b..67c1d756a1 100644
--- a/ydb/public/sdk/cpp/src/client/import/ya.make
+++ b/ydb/public/sdk/cpp/src/client/import/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     import.cpp
     out.cpp
diff --git a/ydb/public/sdk/cpp/src/client/monitoring/ya.make b/ydb/public/sdk/cpp/src/client/monitoring/ya.make
index c3e2532734..12d589d09e 100644
--- a/ydb/public/sdk/cpp/src/client/monitoring/ya.make
+++ b/ydb/public/sdk/cpp/src/client/monitoring/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     monitoring.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/operation/ya.make b/ydb/public/sdk/cpp/src/client/operation/ya.make
index d23866bbdc..6445699285 100644
--- a/ydb/public/sdk/cpp/src/client/operation/ya.make
+++ b/ydb/public/sdk/cpp/src/client/operation/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     operation.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/params/ya.make b/ydb/public/sdk/cpp/src/client/params/ya.make
index 0609d93b38..04e76c41ca 100644
--- a/ydb/public/sdk/cpp/src/client/params/ya.make
+++ b/ydb/public/sdk/cpp/src/client/params/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     params.cpp
     impl.cpp
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/codecs/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/codecs/ya.make
index 05c88b8a20..ce49f20ed8 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/codecs/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/codecs/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     codecs.h
 )
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/impl/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/impl/ya.make
index 204122207d..ccf8d43627 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     aliases.h
     common.h
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/include/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/include/ya.make
index ee49322fea..d5cd441d8b 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/include/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/include/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/src/client/persqueue_public/include/control_plane.h)
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/src/client/persqueue_public/include/read_events.h)
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/src/client/persqueue_public/include/write_events.h)
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ya.make
index de1690acb9..1f0569892b 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ut_utils/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     data_plane_helpers.h
     data_plane_helpers.cpp
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/with_offset_ranges_mode_ut/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/with_offset_ranges_mode_ut/ya.make
index 4ddaf666a0..8784146bd3 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/with_offset_ranges_mode_ut/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/with_offset_ranges_mode_ut/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ya.make
index b8f9f22eb7..0b91f73c76 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/ut/ya.make
@@ -1,7 +1,5 @@
 UNITTEST_FOR(ydb/public/sdk/cpp/src/client/persqueue_public)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/src/client/persqueue_public/ya.make b/ydb/public/sdk/cpp/src/client/persqueue_public/ya.make
index 55cf1d6674..ab54b0621b 100644
--- a/ydb/public/sdk/cpp/src/client/persqueue_public/ya.make
+++ b/ydb/public/sdk/cpp/src/client/persqueue_public/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     persqueue.h
 )
diff --git a/ydb/public/sdk/cpp/src/client/proto/ya.make b/ydb/public/sdk/cpp/src/client/proto/ya.make
index 229886bed0..017a21d4e9 100644
--- a/ydb/public/sdk/cpp/src/client/proto/ya.make
+++ b/ydb/public/sdk/cpp/src/client/proto/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     accessor.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/query/impl/ya.make b/ydb/public/sdk/cpp/src/client/query/impl/ya.make
index 777328dbd0..968c118f9c 100644
--- a/ydb/public/sdk/cpp/src/client/query/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/query/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     exec_query.cpp
     exec_query.h
diff --git a/ydb/public/sdk/cpp/src/client/query/ya.make b/ydb/public/sdk/cpp/src/client/query/ya.make
index e468461143..8d9c46168a 100644
--- a/ydb/public/sdk/cpp/src/client/query/ya.make
+++ b/ydb/public/sdk/cpp/src/client/query/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     client.cpp
     query.cpp
diff --git a/ydb/public/sdk/cpp/src/client/rate_limiter/ya.make b/ydb/public/sdk/cpp/src/client/rate_limiter/ya.make
index 6b5a90872c..4c176b1939 100644
--- a/ydb/public/sdk/cpp/src/client/rate_limiter/ya.make
+++ b/ydb/public/sdk/cpp/src/client/rate_limiter/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     rate_limiter.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/resources/ya.make b/ydb/public/sdk/cpp/src/client/resources/ya.make
index b593c84bca..77350f7379 100644
--- a/ydb/public/sdk/cpp/src/client/resources/ya.make
+++ b/ydb/public/sdk/cpp/src/client/resources/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     ydb_resources.cpp
     ydb_ca.cpp
diff --git a/ydb/public/sdk/cpp/src/client/result/ya.make b/ydb/public/sdk/cpp/src/client/result/ya.make
index 0cc590d2d9..94f73db771 100644
--- a/ydb/public/sdk/cpp/src/client/result/ya.make
+++ b/ydb/public/sdk/cpp/src/client/result/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     out.cpp
     proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/src/client/scheme/ya.make b/ydb/public/sdk/cpp/src/client/scheme/ya.make
index 46a092e9bb..dee79e83f6 100644
--- a/ydb/public/sdk/cpp/src/client/scheme/ya.make
+++ b/ydb/public/sdk/cpp/src/client/scheme/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     out.cpp
     scheme.cpp
diff --git a/ydb/public/sdk/cpp/src/client/ss_tasks/ya.make b/ydb/public/sdk/cpp/src/client/ss_tasks/ya.make
index 5f7fc1e9c1..f3c72f2458 100644
--- a/ydb/public/sdk/cpp/src/client/ss_tasks/ya.make
+++ b/ydb/public/sdk/cpp/src/client/ss_tasks/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     task.cpp
     out.cpp
diff --git a/ydb/public/sdk/cpp/src/client/table/impl/ya.make b/ydb/public/sdk/cpp/src/client/table/impl/ya.make
index 158409f4bb..f82681f0c1 100644
--- a/ydb/public/sdk/cpp/src/client/table/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/table/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     client_session.cpp
     data_query.cpp
diff --git a/ydb/public/sdk/cpp/src/client/table/query_stats/ya.make b/ydb/public/sdk/cpp/src/client/table/query_stats/ya.make
index 59ed87e31f..fd2b8bc5d4 100644
--- a/ydb/public/sdk/cpp/src/client/table/query_stats/ya.make
+++ b/ydb/public/sdk/cpp/src/client/table/query_stats/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     stats.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/table/ya.make b/ydb/public/sdk/cpp/src/client/table/ya.make
index d9726f9428..c31db4347c 100644
--- a/ydb/public/sdk/cpp/src/client/table/ya.make
+++ b/ydb/public/sdk/cpp/src/client/table/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     out.cpp
     proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/src/client/topic/codecs/ya.make b/ydb/public/sdk/cpp/src/client/topic/codecs/ya.make
index b4c67bdb25..81dda3914b 100644
--- a/ydb/public/sdk/cpp/src/client/topic/codecs/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/codecs/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     codecs.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/topic/common/ya.make b/ydb/public/sdk/cpp/src/client/topic/common/ya.make
index 084d12ffa5..7de45600d6 100644
--- a/ydb/public/sdk/cpp/src/client/topic/common/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/common/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     callback_context.h
     executor_impl.h
diff --git a/ydb/public/sdk/cpp/src/client/topic/impl/ya.make b/ydb/public/sdk/cpp/src/client/topic/impl/ya.make
index 29215afd9d..98d1745b15 100644
--- a/ydb/public/sdk/cpp/src/client/topic/impl/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/impl/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     common.h
     common.cpp
diff --git a/ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/ya.make b/ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/ya.make
index 41c1285001..2b44b36c97 100644
--- a/ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/ut/ut_utils/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     managed_executor.cpp
     managed_executor.h
diff --git a/ydb/public/sdk/cpp/src/client/topic/ut/ya.make b/ydb/public/sdk/cpp/src/client/topic/ut/ya.make
index a268f7df44..00c38e7e8c 100644
--- a/ydb/public/sdk/cpp/src/client/topic/ut/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/ut/ya.make
@@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/public/sdk/cpp/src/client/topic)
 
 REQUIREMENTS(ram:32)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE OR WITH_VALGRIND)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/src/client/topic/ya.make b/ydb/public/sdk/cpp/src/client/topic/ya.make
index 4aa545a57b..3867d37301 100644
--- a/ydb/public/sdk/cpp/src/client/topic/ya.make
+++ b/ydb/public/sdk/cpp/src/client/topic/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     out.cpp
     proto_accessor.cpp
diff --git a/ydb/public/sdk/cpp/src/client/types/credentials/login/ya.make b/ydb/public/sdk/cpp/src/client/types/credentials/login/ya.make
index 0aa2dde561..531508f030 100644
--- a/ydb/public/sdk/cpp/src/client/types/credentials/login/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/credentials/login/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     login.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/types/credentials/oauth2_token_exchange/ya.make b/ydb/public/sdk/cpp/src/client/types/credentials/oauth2_token_exchange/ya.make
index 41b6427cb6..9962d6bb67 100644
--- a/ydb/public/sdk/cpp/src/client/types/credentials/oauth2_token_exchange/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/credentials/oauth2_token_exchange/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     credentials.cpp
     from_file.cpp
diff --git a/ydb/public/sdk/cpp/src/client/types/credentials/ya.make b/ydb/public/sdk/cpp/src/client/types/credentials/ya.make
index 4503014b40..8dc30dab1d 100644
--- a/ydb/public/sdk/cpp/src/client/types/credentials/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/credentials/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     credentials.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/types/exceptions/ya.make b/ydb/public/sdk/cpp/src/client/types/exceptions/ya.make
index 06816457a5..499d0b5528 100644
--- a/ydb/public/sdk/cpp/src/client/types/exceptions/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/exceptions/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     exceptions.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/types/fatal_error_handlers/ya.make b/ydb/public/sdk/cpp/src/client/types/fatal_error_handlers/ya.make
index 0ad854b47c..cac7ea733f 100644
--- a/ydb/public/sdk/cpp/src/client/types/fatal_error_handlers/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/fatal_error_handlers/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     handlers.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/types/operation/ya.make b/ydb/public/sdk/cpp/src/client/types/operation/ya.make
index a330e40296..a4aa1732fe 100644
--- a/ydb/public/sdk/cpp/src/client/types/operation/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/operation/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     operation.cpp
     out.cpp
diff --git a/ydb/public/sdk/cpp/src/client/types/status/ya.make b/ydb/public/sdk/cpp/src/client/types/status/ya.make
index 59f1ff53be..fd84804f7e 100644
--- a/ydb/public/sdk/cpp/src/client/types/status/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/status/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     status.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/client/types/ya.make b/ydb/public/sdk/cpp/src/client/types/ya.make
index 536b97fd80..8890df4e18 100644
--- a/ydb/public/sdk/cpp/src/client/types/ya.make
+++ b/ydb/public/sdk/cpp/src/client/types/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 PEERDIR(
     contrib/libs/protobuf
     ydb/public/sdk/cpp/src/library/grpc/client
diff --git a/ydb/public/sdk/cpp/src/client/value/ya.make b/ydb/public/sdk/cpp/src/client/value/ya.make
index 4a98d9d5e8..d9510fdcb0 100644
--- a/ydb/public/sdk/cpp/src/client/value/ya.make
+++ b/ydb/public/sdk/cpp/src/client/value/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     out.cpp
     value.cpp
diff --git a/ydb/public/sdk/cpp/src/library/decimal/ya.make b/ydb/public/sdk/cpp/src/library/decimal/ya.make
index 15f41e1605..d59c5000b9 100644
--- a/ydb/public/sdk/cpp/src/library/decimal/ya.make
+++ b/ydb/public/sdk/cpp/src/library/decimal/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     yql_decimal.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/library/grpc/client/ya.make b/ydb/public/sdk/cpp/src/library/grpc/client/ya.make
index 7b0e50ecc4..bf1af2762c 100644
--- a/ydb/public/sdk/cpp/src/library/grpc/client/ya.make
+++ b/ydb/public/sdk/cpp/src/library/grpc/client/ya.make
@@ -1,7 +1,5 @@
 LIBRARY(sdk-library-grpc-client-v3)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     grpc_client_low.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/library/issue/ya.make b/ydb/public/sdk/cpp/src/library/issue/ya.make
index fbaf3f7205..68f9902296 100644
--- a/ydb/public/sdk/cpp/src/library/issue/ya.make
+++ b/ydb/public/sdk/cpp/src/library/issue/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     utf8.cpp
     yql_issue.cpp
diff --git a/ydb/public/sdk/cpp/src/library/jwt/ya.make b/ydb/public/sdk/cpp/src/library/jwt/ya.make
index 3bd60ca6d0..248337e9d7 100644
--- a/ydb/public/sdk/cpp/src/library/jwt/ya.make
+++ b/ydb/public/sdk/cpp/src/library/jwt/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     jwt.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/library/operation_id/ya.make b/ydb/public/sdk/cpp/src/library/operation_id/ya.make
index e52d53af85..31560d8c5b 100644
--- a/ydb/public/sdk/cpp/src/library/operation_id/ya.make
+++ b/ydb/public/sdk/cpp/src/library/operation_id/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     operation_id.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/library/persqueue/obfuscate/ya.make b/ydb/public/sdk/cpp/src/library/persqueue/obfuscate/ya.make
index 1ae559fd51..e3094dc0a3 100644
--- a/ydb/public/sdk/cpp/src/library/persqueue/obfuscate/ya.make
+++ b/ydb/public/sdk/cpp/src/library/persqueue/obfuscate/ya.make
@@ -1,7 +1,5 @@
 LIBRARY(sdk-library-persqueue-obfuscate-v3)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     obfuscate.h
     obfuscate.cpp
diff --git a/ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/ya.make b/ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/ya.make
index 00eea09b31..ee93d4e9e5 100644
--- a/ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/ya.make
+++ b/ydb/public/sdk/cpp/src/library/persqueue/topic_parser_public/ya.make
@@ -1,7 +1,5 @@
 LIBRARY(sdk-library-persqueue-topic_parser_public-v3)
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     topic_parser.h
     topic_parser.cpp
diff --git a/ydb/public/sdk/cpp/src/library/string_utils/helpers/ya.make b/ydb/public/sdk/cpp/src/library/string_utils/helpers/ya.make
index 081fdffccc..4a77904762 100644
--- a/ydb/public/sdk/cpp/src/library/string_utils/helpers/ya.make
+++ b/ydb/public/sdk/cpp/src/library/string_utils/helpers/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     helpers.cpp
 )
diff --git a/ydb/public/sdk/cpp/src/library/uuid/ya.make b/ydb/public/sdk/cpp/src/library/uuid/ya.make
index dc000d20eb..15cd576d23 100644
--- a/ydb/public/sdk/cpp/src/library/uuid/ya.make
+++ b/ydb/public/sdk/cpp/src/library/uuid/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     uuid.cpp
 )
diff --git a/ydb/public/sdk/cpp/tests/integration/basic_example/ya.make b/ydb/public/sdk/cpp/tests/integration/basic_example/ya.make
index 91f3fae069..93acc5089a 100644
--- a/ydb/public/sdk/cpp/tests/integration/basic_example/ya.make
+++ b/ydb/public/sdk/cpp/tests/integration/basic_example/ya.make
@@ -1,6 +1,4 @@
 GTEST()
-
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
 INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/public/sdk/cpp/tests/integration/bulk_upsert/ya.make b/ydb/public/sdk/cpp/tests/integration/bulk_upsert/ya.make
index 9e09c3705f..6077c17645 100644
--- a/ydb/public/sdk/cpp/tests/integration/bulk_upsert/ya.make
+++ b/ydb/public/sdk/cpp/tests/integration/bulk_upsert/ya.make
@@ -1,6 +1,4 @@
 GTEST()
-
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
 INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/public/sdk/cpp/tests/integration/server_restart/ya.make b/ydb/public/sdk/cpp/tests/integration/server_restart/ya.make
index 57195f0ae5..6e7bd7e8d9 100644
--- a/ydb/public/sdk/cpp/tests/integration/server_restart/ya.make
+++ b/ydb/public/sdk/cpp/tests/integration/server_restart/ya.make
@@ -1,6 +1,4 @@
 GTEST()
-
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
 INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/public/sdk/cpp/tests/unit/client/coordination/ya.make b/ydb/public/sdk/cpp/tests/unit/client/coordination/ya.make
index a92953b812..f6f7042197 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/coordination/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/coordination/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/discovery_mutator/ya.make b/ydb/public/sdk/cpp/tests/unit/client/discovery_mutator/ya.make
index f1f7daf681..ccf7c7fe70 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/discovery_mutator/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/discovery_mutator/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/draft/helpers/ya.make b/ydb/public/sdk/cpp/tests/unit/client/draft/helpers/ya.make
index b74a987583..2379d6e15c 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/draft/helpers/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/draft/helpers/ya.make
@@ -1,7 +1,5 @@
 LIBRARY()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 PEERDIR(
     ydb/public/api/grpc
     ydb/public/api/grpc/draft
diff --git a/ydb/public/sdk/cpp/tests/unit/client/draft/ya.make b/ydb/public/sdk/cpp/tests/unit/client/draft/ya.make
index fb0e05a094..0c2aa733af 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/draft/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/draft/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/driver/ya.make b/ydb/public/sdk/cpp/tests/unit/client/driver/ya.make
index 6cc0a699a5..fb17d8dea8 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/driver/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/driver/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/endpoints/ya.make b/ydb/public/sdk/cpp/tests/unit/client/endpoints/ya.make
index 8d37b6886f..f49a875225 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/endpoints/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/endpoints/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/params/ya.make b/ydb/public/sdk/cpp/tests/unit/client/params/ya.make
index 6a3860a481..fdb02c2e95 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/params/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/params/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/result/ya.make b/ydb/public/sdk/cpp/tests/unit/client/result/ya.make
index 845cd3c445..ef05e0fad5 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/result/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/result/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/client/value/ya.make b/ydb/public/sdk/cpp/tests/unit/client/value/ya.make
index 2aba55b2dc..9a6c85257a 100644
--- a/ydb/public/sdk/cpp/tests/unit/client/value/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/client/value/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 IF (SANITIZER_TYPE == "thread")
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/sdk/cpp/tests/unit/library/decimal/ya.make b/ydb/public/sdk/cpp/tests/unit/library/decimal/ya.make
index e93b6a7e1d..736a9d3fa5 100644
--- a/ydb/public/sdk/cpp/tests/unit/library/decimal/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/library/decimal/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 SRCS(
     yql_decimal_ut.cpp
     yql_wide_int_ut.cpp
diff --git a/ydb/public/sdk/cpp/tests/unit/library/grpc_client/ya.make b/ydb/public/sdk/cpp/tests/unit/library/grpc_client/ya.make
index 690af039e1..e9a48400b2 100644
--- a/ydb/public/sdk/cpp/tests/unit/library/grpc_client/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/library/grpc_client/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 FORK_SUBTESTS()
 
 SRCS(
diff --git a/ydb/public/sdk/cpp/tests/unit/library/issue/ya.make b/ydb/public/sdk/cpp/tests/unit/library/issue/ya.make
index 05488b48b6..0c80b49414 100644
--- a/ydb/public/sdk/cpp/tests/unit/library/issue/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/library/issue/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 FORK_SUBTESTS()
 
 SRCS(
diff --git a/ydb/public/sdk/cpp/tests/unit/library/operation_id/ya.make b/ydb/public/sdk/cpp/tests/unit/library/operation_id/ya.make
index f2b1c5a95b..8fb56ed08a 100644
--- a/ydb/public/sdk/cpp/tests/unit/library/operation_id/ya.make
+++ b/ydb/public/sdk/cpp/tests/unit/library/operation_id/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-INCLUDE(${ARCADIA_ROOT}/ydb/public/sdk/cpp/sdk_common.inc)
-
 FORK_SUBTESTS()
 
 IF (SANITIZER_TYPE OR WITH_VALGRIND)
diff --git a/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_queries_ut.cpp b/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_queries_ut.cpp
index 4f5539e612..600423cf06 100644
--- a/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_queries_ut.cpp
+++ b/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_queries_ut.cpp
@@ -5,7 +5,7 @@
 #include <library/cpp/protobuf/interop/cast.h>
 #include <library/cpp/testing/unittest/registar.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/fq/libs/control_plane_storage/events/events.h>
 
diff --git a/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_quotas_ut.cpp b/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_quotas_ut.cpp
index 585b4e33a9..c83e60a848 100644
--- a/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_quotas_ut.cpp
+++ b/ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_quotas_ut.cpp
@@ -5,7 +5,7 @@
 #include <library/cpp/protobuf/interop/cast.h>
 #include <library/cpp/testing/unittest/registar.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/fq/libs/control_plane_storage/events/events.h>
 #include <ydb/core/fq/libs/quota_manager/quota_manager.h>
diff --git a/ydb/tests/fq/control_plane_storage/ydb_test_bootstrap.h b/ydb/tests/fq/control_plane_storage/ydb_test_bootstrap.h
index 11fa568e61..d4d5cd97ec 100644
--- a/ydb/tests/fq/control_plane_storage/ydb_test_bootstrap.h
+++ b/ydb/tests/fq/control_plane_storage/ydb_test_bootstrap.h
@@ -14,7 +14,7 @@
 #include <ydb/core/fq/libs/config/protos/issue_id.pb.h>
 #include <ydb/core/fq/libs/init/init.h>
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
-#include <ydb-cpp-sdk/client/result/result.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/result/result.h>
 
 #include <ydb/core/testlib/basics/runtime.h>
 #include <ydb/core/testlib/tablet_helpers.h>
diff --git a/ydb/tests/fq/pq_async_io/mock_pq_gateway.h b/ydb/tests/fq/pq_async_io/mock_pq_gateway.h
index 13b74271ac..f106229f82 100644
--- a/ydb/tests/fq/pq_async_io/mock_pq_gateway.h
+++ b/ydb/tests/fq/pq_async_io/mock_pq_gateway.h
@@ -9,7 +9,7 @@
 #include <ydb/library/yql/dq/actors/protos/dq_events.pb.h>
 #include <yql/essentials/minikql/mkql_alloc.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 #include <ydb/core/testlib/basics/runtime.h>
 
 #include <library/cpp/testing/unittest/registar.h>
diff --git a/ydb/tests/fq/pq_async_io/ut_helpers.h b/ydb/tests/fq/pq_async_io/ut_helpers.h
index 5d39b6024b..a938403149 100644
--- a/ydb/tests/fq/pq_async_io/ut_helpers.h
+++ b/ydb/tests/fq/pq_async_io/ut_helpers.h
@@ -9,7 +9,7 @@
 #include <ydb/library/yql/dq/actors/protos/dq_events.pb.h>
 #include <yql/essentials/minikql/mkql_alloc.h>
 
-#include <ydb-cpp-sdk/client/topic/client.h>
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/topic/client.h>
 #include <ydb/core/testlib/basics/runtime.h>
 
 #include <library/cpp/testing/unittest/registar.h>