diff --git a/ydb/core/tx/replication/service/ya.make b/ydb/core/tx/replication/service/ya.make
index 973d831620cd..9ac9a4a48126 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 898ca9c7cdca..d7a1c1c69f63 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 e03169f3ed09..6ee4ebc16ff6 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 99f546b0e4cd..ebaa8fb6a9bf 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 d6517f9df8d4..68f27b420731 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 5cb7fc338838..331af00ee448 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 f16f03c1b2bc..5c38d9fd7637 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 8f7726227586..161f5dbbdeab 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 092d05639141..e83263f92dc3 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 86cbb04ce3a6..947f7e6c7456 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 749d46cc7a55..09fb81235fa4 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 5fda8195cf12..b97f350efdfc 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 5138def50841..75576413839e 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 e8c2e25fc710..6f511369a7cc 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 4d625cfee9d1..e134c0702835 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 d7f76f95c7ba..000000000000
--- 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 8a5b21dbbb16..707585feff89 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 9ccb37ee0d8d..3a91b282500b 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 f4e1fa007f56..3b263c8dbd2f 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 d129149f9fb6..c6ca5393fc9a 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 e31a14304948..bd9fd297f19d 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 eaa3bd3165d4..f41488eedec3 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 1c88ec57901d..001117a5eaa0 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 ae4ef332641b..b176574866c0 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 fd341620c839..6690f7865098 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 e5a28314bd55..66ff82d2bf8f 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 9b6b816aafb4..1d4d215b5377 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 85e5847bf4f0..2bfc23a795f4 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 ae92c1b37425..e943d384f4f8 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 9f0ac06b8d2a..5fa75228e45a 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 6a102764f98f..e99caf2bf12f 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 c2d5ffb21406..cedc8d7d91fc 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 cad268660693..38a0fcbd8b6b 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 b58abff2e196..f33a98f3229f 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 e1b7b97088ed..8dbab2c03faf 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 f27a760e584f..068ae005e404 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 449886b88d86..e097bc5e6f3c 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 a2990e63454b..818aa044c111 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 ce4b7a51292d..8cfdff11548c 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 e580efaafdcc..e0bc45c9728d 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 cf73914736a9..1842c788b94a 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 ca5bf2b7a6e1..5719de2b3773 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 5ce41dc9a73b..1bd264bd238d 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 629df1ea1384..723dc3e7dc1b 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 25cadcab0ec4..b0599d414441 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 b0a40422de43..4794e82b8321 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 6bf23008fe10..1d92e644f77d 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 da50cdb6a29f..39155892a013 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 f12dffa2fc33..22f9116105c4 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 f5e706f1e54f..aa626871c6f9 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 f92e5abd156e..b045208650d9 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 3b9f01f6d59c..9a186926e0d9 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 76d170c09b7f..67c1d756a1ed 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 c3e253273493..12d589d09e48 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 d23866bbdc8e..64456992855a 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 0609d93b38f6..04e76c41cac9 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 05c88b8a209b..ce49f20ed823 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 204122207d04..ccf8d4362790 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 ee49322fea6a..d5cd441d8bd5 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 de1690acb9d0..1f0569892bd4 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 4ddaf666a0fa..8784146bd352 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 b8f9f22eb759..0b91f73c7664 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 55cf1d667459..ab54b0621b61 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 229886bed040..017a21d4e9b9 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 777328dbd00d..968c118f9ced 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 e46846114304..8d9c46168ae1 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 6b5a90872c2d..4c176b1939f7 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 b593c84bca07..77350f73795b 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 0cc590d2d906..94f73db77124 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 46a092e9bb7e..dee79e83f6f5 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 5f7fc1e9c1df..f3c72f24589f 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 158409f4bbe0..f82681f0c153 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 59ed87e31f6f..fd2b8bc5d49c 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 d9726f9428f6..c31db4347c88 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 b4c67bdb2536..81dda3914b84 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 084d12ffa5ef..7de45600d6da 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 29215afd9d28..98d1745b1561 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 41c12850017d..2b44b36c97ac 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 a268f7df44c6..00c38e7e8c2f 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 4aa545a57bda..3867d3730158 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 0aa2dde56183..531508f030e2 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 41b6427cb6be..9962d6bb6752 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 4503014b4021..8dc30dab1df9 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 06816457a5e3..499d0b55289f 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 0ad854b47c25..cac7ea733f99 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 a330e40296e1..a4aa1732fef2 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 59f1ff53be6e..fd84804f7edc 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 536b97fd80fb..8890df4e188b 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 4a98d9d5e8f9..d9510fdcb0d5 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 15f41e160575..d59c5000b9e6 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 7b0e50ecc4f9..bf1af2762c2f 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 fbaf3f720579..68f99022969c 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 3bd60ca6d015..248337e9d70d 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 e52d53af8567..31560d8c5bc6 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 1ae559fd510b..e3094dc0a380 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 00eea09b3194..ee93d4e9e576 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 081fdffccced..4a77904762f2 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 dc000d20ebc0..15cd576d234a 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 91f3fae069a4..93acc5089a10 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 9e09c3705fdc..6077c1764542 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 57195f0ae56f..6e7bd7e8d9ef 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 a92953b8120b..f6f704219732 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 f1f7daf6818b..ccf7c7fe70fc 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 b74a9875830f..2379d6e15cfa 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 fb0e05a0945a..0c2aa733af73 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 6cc0a699a53e..fb17d8dea89a 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 8d37b6886fc2..f49a8752259c 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 6a3860a481f0..fdb02c2e95c1 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 845cd3c445ee..ef05e0fad5a0 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 2aba55b2dc79..9a6c85257a59 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 e93b6a7e1dea..736a9d3fa5cc 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 690af039e127..e9a48400b212 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 05488b48b6ef..0c80b4941457 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 f2b1c5a95b84..8fb56ed08ab5 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 4f5539e612f4..600423cf063c 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 585b4e33a99f..c83e60a848a1 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 11fa568e61c3..d4d5cd97ec18 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 13b74271ac47..f106229f8264 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 5d39b6024b87..a93840314937 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>