diff --git a/examples/secondary_index/secondary_index_generate.cpp b/examples/secondary_index/secondary_index_generate.cpp
index a56043f2b9..0f8c701332 100644
--- a/examples/secondary_index/secondary_index_generate.cpp
+++ b/examples/secondary_index/secondary_index_generate.cpp
@@ -1,7 +1,7 @@
 #include "secondary_index.h"
 
-#include <src/util/random/random.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 using namespace NLastGetopt;
 using namespace NYdb;
diff --git a/examples/secondary_index_builtin/secondary_index.h b/examples/secondary_index_builtin/secondary_index.h
index 3e57744519..f100dd82d3 100644
--- a/examples/secondary_index_builtin/secondary_index.h
+++ b/examples/secondary_index_builtin/secondary_index.h
@@ -5,9 +5,9 @@
 
 #include <src/library/getopt/last_getopt.h>
 #include <string>
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/output.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #define TABLE_USERS "users"
 #define TABLE_SERIES "series"
diff --git a/examples/secondary_index_builtin/secondary_index_fill.cpp b/examples/secondary_index_builtin/secondary_index_fill.cpp
index cf17fce85d..9b2cedac1c 100644
--- a/examples/secondary_index_builtin/secondary_index_fill.cpp
+++ b/examples/secondary_index_builtin/secondary_index_fill.cpp
@@ -1,6 +1,6 @@
 #include "secondary_index.h"
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 using namespace NYdb;
 using namespace NYdb::NTable;
diff --git a/examples/ttl/util.h b/examples/ttl/util.h
index b5ecf51d64..cc1816357c 100644
--- a/examples/ttl/util.h
+++ b/examples/ttl/util.h
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/client/table/table.h>
 
 #include <src/util/folder/pathsplit.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NExample {
 
diff --git a/include/ydb-cpp-sdk/client/iam/common/iam.h b/include/ydb-cpp-sdk/client/iam/common/iam.h
index a3a0944345..a3f4491904 100644
--- a/include/ydb-cpp-sdk/client/iam/common/iam.h
+++ b/include/ydb-cpp-sdk/client/iam/common/iam.h
@@ -9,8 +9,8 @@
 #include <ydb-cpp-sdk/library/jwt/jwt.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
-#include <src/util/system/spinlock.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <fstream>
 
diff --git a/include/ydb-cpp-sdk/client/operation/operation.h b/include/ydb-cpp-sdk/client/operation/operation.h
index 614c88af35..48e95c9bdb 100644
--- a/include/ydb-cpp-sdk/client/operation/operation.h
+++ b/include/ydb-cpp-sdk/client/operation/operation.h
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/client/driver/driver.h>
 #include <ydb-cpp-sdk/client/types/operation/operation.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 namespace NOperation {
diff --git a/include/ydb-cpp-sdk/client/query/tx.h b/include/ydb-cpp-sdk/client/query/tx.h
index f3f4b7db67..2362e63cfd 100644
--- a/include/ydb-cpp-sdk/client/query/tx.h
+++ b/include/ydb-cpp-sdk/client/query/tx.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/client/types/fluent_settings_helpers.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <optional>
 
diff --git a/include/ydb-cpp-sdk/client/table/table.h b/include/ydb-cpp-sdk/client/table/table.h
index 0caff70e60..29766bfc3b 100644
--- a/include/ydb-cpp-sdk/client/table/table.h
+++ b/include/ydb-cpp-sdk/client/table/table.h
@@ -228,8 +228,8 @@ class TChangefeedDescription {
     TChangefeedDescription& WithInitialScan();
     // Attributes
     TChangefeedDescription& AddAttribute(const std::string& key, const std::string& value);
-    TChangefeedDescription& SetAttributes(const THashMap<std::string, std::string>& attrs);
-    TChangefeedDescription& SetAttributes(THashMap<std::string, std::string>&& attrs);
+    TChangefeedDescription& SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
+    TChangefeedDescription& SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
     // Value that will be emitted in the `awsRegion` field of the record in DynamoDBStreamsJson format
     TChangefeedDescription& WithAwsRegion(const std::string& value);
 
@@ -240,7 +240,7 @@ class TChangefeedDescription {
     bool GetVirtualTimestamps() const;
     const std::optional<TDuration>& GetResolvedTimestamps() const;
     bool GetInitialScan() const;
-    const THashMap<std::string, std::string>& GetAttributes() const;
+    const std::unordered_map<std::string, std::string>& GetAttributes() const;
     const std::string& GetAwsRegion() const;
 
     void SerializeTo(Ydb::Table::Changefeed& proto) const;
@@ -263,7 +263,7 @@ class TChangefeedDescription {
     std::optional<TDuration> ResolvedTimestamps_;
     std::optional<TDuration> RetentionPeriod_;
     bool InitialScan_ = false;
-    THashMap<std::string, std::string> Attributes_;
+    std::unordered_map<std::string, std::string> Attributes_;
     std::string AwsRegion_;
 };
 
@@ -520,7 +520,7 @@ class TTableDescription {
     const std::vector<TColumnFamilyDescription>& GetColumnFamilies() const;
 
     // Attributes
-    const THashMap<std::string, std::string>& GetAttributes() const;
+    const std::unordered_map<std::string, std::string>& GetAttributes() const;
 
     // Returns partitioning settings of the table
     const TPartitioningSettings& GetPartitioningSettings() const;
@@ -564,8 +564,8 @@ class TTableDescription {
     void SetStorageSettings(const TStorageSettings& settings);
     void AddColumnFamily(const TColumnFamilyDescription& desc);
     void AddAttribute(const std::string& key, const std::string& value);
-    void SetAttributes(const THashMap<std::string, std::string>& attrs);
-    void SetAttributes(THashMap<std::string, std::string>&& attrs);
+    void SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
+    void SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
     void SetCompactionPolicy(const std::string& name);
     void SetUniformPartitions(ui64 partitionsCount);
     void SetPartitionAtKeys(const TExplicitPartitions& keys);
@@ -787,8 +787,8 @@ class TTableBuilder {
     TTableBuilder& AddColumnFamily(const TColumnFamilyDescription& desc);
 
     TTableBuilder& AddAttribute(const std::string& key, const std::string& value);
-    TTableBuilder& SetAttributes(const THashMap<std::string, std::string>& attrs);
-    TTableBuilder& SetAttributes(THashMap<std::string, std::string>&& attrs);
+    TTableBuilder& SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
+    TTableBuilder& SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
 
     TTableBuilder& SetCompactionPolicy(const std::string& name);
 
@@ -1379,7 +1379,7 @@ class TAlterAttributesBuilder {
 
 private:
     TAlterTableSettings& Parent_;
-    THashMap<std::string, std::string> AlterAttributes_;
+    std::unordered_map<std::string, std::string> AlterAttributes_;
 };
 
 class TAlterPartitioningSettingsBuilder {
@@ -1422,7 +1422,7 @@ class TAlterPartitioningSettingsBuilder {
 
 struct TAlterTableSettings : public TOperationRequestSettings<TAlterTableSettings> {
     using TSelf = TAlterTableSettings;
-    using TAlterAttributes = THashMap<std::string, std::string>;
+    using TAlterAttributes = std::unordered_map<std::string, std::string>;
 
     TAlterTableSettings();
 
diff --git a/include/ydb-cpp-sdk/client/topic/topic.h b/include/ydb-cpp-sdk/client/topic/topic.h
index 001a98d0d5..e6d7fa0c51 100644
--- a/include/ydb-cpp-sdk/client/topic/topic.h
+++ b/include/ydb-cpp-sdk/client/topic/topic.h
@@ -7,11 +7,11 @@
 #include <ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h>
 #include <ydb-cpp-sdk/library/logger/log.h>
 #include <ydb-cpp-sdk/library/retry/retry_policy.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <exception>
 #include <variant>
@@ -626,7 +626,7 @@ struct TWriteSessionMeta: public TThrRefBase {
     using TPtr = TIntrusivePtr<TWriteSessionMeta>;
 
     //! User defined fields.
-    THashMap<std::string, std::string> Fields;
+    std::unordered_map<std::string, std::string> Fields;
 };
 
 struct TMessageMeta: public TThrRefBase {
diff --git a/include/ydb-cpp-sdk/client/types/exceptions/exceptions.h b/include/ydb-cpp-sdk/client/types/exceptions/exceptions.h
index 00055777f3..87325b57f0 100644
--- a/include/ydb-cpp-sdk/client/types/exceptions/exceptions.h
+++ b/include/ydb-cpp-sdk/client/types/exceptions/exceptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NYdb {
 
diff --git a/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h b/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h
index db22f93054..bb72c1bee2 100644
--- a/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h
+++ b/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/iterator/iterate_values.h>
 
-#include <src/util/generic/iterator_range.h>
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
 #include <string_view>
 #include <string>
 
diff --git a/include/ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h b/include/ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h
index 14b3efba9b..00784a5a21 100644
--- a/include/ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h
+++ b/include/ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/memory/alloc.h>
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 #include <type_traits>
 
diff --git a/include/ydb-cpp-sdk/library/coroutine/listener/listen.h b/include/ydb-cpp-sdk/library/coroutine/listener/listen.h
index 1206b7578b..2493859c65 100644
--- a/include/ydb-cpp-sdk/library/coroutine/listener/listen.h
+++ b/include/ydb-cpp-sdk/library/coroutine/listener/listen.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 struct TIpAddress;
diff --git a/include/ydb-cpp-sdk/library/grpc/client/grpc_client_low.h b/include/ydb-cpp-sdk/library/grpc/client/grpc_client_low.h
index 77685dbe32..4c9cdc5363 100644
--- a/include/ydb-cpp-sdk/library/grpc/client/grpc_client_low.h
+++ b/include/ydb-cpp-sdk/library/grpc/client/grpc_client_low.h
@@ -2,8 +2,8 @@
 
 #include "grpc_common.h"
 
-#include <src/util/thread/factory.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/thread/factory.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <grpc++/grpc++.h>
 #include <grpc++/support/async_stream.h>
 #include <grpc++/support/async_unary_call.h>
diff --git a/include/ydb-cpp-sdk/library/http/fetch/httpheader.h b/include/ydb-cpp-sdk/library/http/fetch/httpheader.h
index db04dcd970..46750a22ba 100644
--- a/include/ydb-cpp-sdk/library/http/fetch/httpheader.h
+++ b/include/ydb-cpp-sdk/library/http/fetch/httpheader.h
@@ -7,10 +7,10 @@
 #include <ydb-cpp-sdk/library/mime/types/mime.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <string>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
 
 #include <ctime>
 #include <cstdio>
diff --git a/include/ydb-cpp-sdk/library/http/io/headers.h b/include/ydb-cpp-sdk/library/http/io/headers.h
index bf466fd893..c42428eadf 100644
--- a/include/ydb-cpp-sdk/library/http/io/headers.h
+++ b/include/ydb-cpp-sdk/library/http/io/headers.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <string>
 #include <string_view>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 class IInputStream;
 class IOutputStream;
diff --git a/include/ydb-cpp-sdk/library/http/io/stream.h b/include/ydb-cpp-sdk/library/http/io/stream.h
index f76c944d7b..737b448e49 100644
--- a/include/ydb-cpp-sdk/library/http/io/stream.h
+++ b/include/ydb-cpp-sdk/library/http/io/stream.h
@@ -2,11 +2,11 @@
 
 #include "headers.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <span>
 #include <string>
 #include <string_view>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <memory>
 
diff --git a/include/ydb-cpp-sdk/library/http/server/conn.h b/include/ydb-cpp-sdk/library/http/server/conn.h
index d552d10048..8bb7d3bcf8 100644
--- a/include/ydb-cpp-sdk/library/http/server/conn.h
+++ b/include/ydb-cpp-sdk/library/http/server/conn.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/library/http/io/stream.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TSocket;
 
diff --git a/include/ydb-cpp-sdk/library/http/server/http.h b/include/ydb-cpp-sdk/library/http/server/http.h
index c6ade17015..23636f5036 100644
--- a/include/ydb-cpp-sdk/library/http/server/http.h
+++ b/include/ydb-cpp-sdk/library/http/server/http.h
@@ -3,10 +3,10 @@
 #include "conn.h"
 #include "options.h"
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 #include <ydb-cpp-sdk/library/http/io/stream.h>
-#include <src/util/memory/blob.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/memory/blob.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
 
diff --git a/include/ydb-cpp-sdk/library/http/server/options.h b/include/ydb-cpp-sdk/library/http/server/options.h
index 6ccf09d7fc..a100979ead 100644
--- a/include/ydb-cpp-sdk/library/http/server/options.h
+++ b/include/ydb-cpp-sdk/library/http/server/options.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/network/ip.h>
-#include <src/util/network/init.h>
-#include <src/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/init.h>
+#include <ydb-cpp-sdk/util/network/address.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
diff --git a/include/ydb-cpp-sdk/library/iterator/mapped.h b/include/ydb-cpp-sdk/library/iterator/mapped.h
index fd2b3f14c8..be43fe0336 100644
--- a/include/ydb-cpp-sdk/library/iterator/mapped.h
+++ b/include/ydb-cpp-sdk/library/iterator/mapped.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/iterator_range.h>
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <functional>
 #include <iterator>
diff --git a/include/ydb-cpp-sdk/library/json/common/defs.h b/include/ydb-cpp-sdk/library/json/common/defs.h
index 76dddd957c..ac428dee17 100644
--- a/include/ydb-cpp-sdk/library/json/common/defs.h
+++ b/include/ydb-cpp-sdk/library/json/common/defs.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string_view>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NJson {
     class TJsonException: public yexception {
diff --git a/include/ydb-cpp-sdk/library/json/json_reader.h b/include/ydb-cpp-sdk/library/json/json_reader.h
index 7947246427..6df4e01648 100644
--- a/include/ydb-cpp-sdk/library/json/json_reader.h
+++ b/include/ydb-cpp-sdk/library/json/json_reader.h
@@ -5,7 +5,7 @@
 #include <ydb-cpp-sdk/library/json/common/defs.h>
 #include <ydb-cpp-sdk/library/json/fast_sax/parser.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 namespace NJson {
     struct TJsonReaderConfig {
diff --git a/include/ydb-cpp-sdk/library/json/writer/json.h b/include/ydb-cpp-sdk/library/json/writer/json.h
index e1b9f975fa..04dd252668 100644
--- a/include/ydb-cpp-sdk/library/json/writer/json.h
+++ b/include/ydb-cpp-sdk/library/json/writer/json.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <vector>
 
diff --git a/include/ydb-cpp-sdk/library/json/writer/json_value.h b/include/ydb-cpp-sdk/library/json/writer/json_value.h
index 569a64f05d..e6a99f1a8a 100644
--- a/include/ydb-cpp-sdk/library/json/writer/json_value.h
+++ b/include/ydb-cpp-sdk/library/json/writer/json_value.h
@@ -2,10 +2,10 @@
 
 #include <ydb-cpp-sdk/library/json/common/defs.h>
 
-#include <src/util/generic/hash.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <unordered_map>
 
 namespace NJson {
     enum EJsonValueType {
@@ -33,7 +33,7 @@ namespace NJson {
         void Clear() noexcept;
 
     public:
-        typedef THashMap<std::string, TJsonValue> TMapType;
+        typedef std::unordered_map<std::string, TJsonValue> TMapType;
         typedef std::deque<TJsonValue> TArray;
 
         TJsonValue() noexcept = default;
@@ -265,10 +265,10 @@ namespace NJson {
             : TJsonValue(NJson::JSON_MAP)
         {}
 
-        TJsonMap(const std::initializer_list<std::pair<std::string, TJsonValue>>& list)
+        TJsonMap(const std::initializer_list<std::pair<const std::string, TJsonValue>>& list)
             : TJsonValue(NJson::JSON_MAP)
         {
-            GetMapSafe() = THashMap<std::string, TJsonValue>(list);
+            GetMapSafe() = std::unordered_map<std::string, TJsonValue>(list);
         }
     };
 
diff --git a/include/ydb-cpp-sdk/library/logger/backend.h b/include/ydb-cpp-sdk/library/logger/backend.h
index 31155c7ff0..aebe0cc83f 100644
--- a/include/ydb-cpp-sdk/library/logger/backend.h
+++ b/include/ydb-cpp-sdk/library/logger/backend.h
@@ -2,7 +2,7 @@
 
 #include "priority.h"
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <vector>
 #include <cstddef>
 
diff --git a/include/ydb-cpp-sdk/library/logger/element.h b/include/ydb-cpp-sdk/library/logger/element.h
index adc5456c14..f1d2e8d49c 100644
--- a/include/ydb-cpp-sdk/library/logger/element.h
+++ b/include/ydb-cpp-sdk/library/logger/element.h
@@ -4,8 +4,8 @@
 #include "record.h"
 
 
-#include <src/util/string/cast.h>
-#include <src/util/stream/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/tempbuf.h>
 
 
 class TLog;
diff --git a/include/ydb-cpp-sdk/library/logger/log.h b/include/ydb-cpp-sdk/library/logger/log.h
index ff81a5c885..bda4d0a647 100644
--- a/include/ydb-cpp-sdk/library/logger/log.h
+++ b/include/ydb-cpp-sdk/library/logger/log.h
@@ -6,7 +6,7 @@
 #include "record.h"
 #include "thread.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <functional>
 #include <cstdarg>
diff --git a/include/ydb-cpp-sdk/library/logger/thread.h b/include/ydb-cpp-sdk/library/logger/thread.h
index b02722a500..ba251e49e2 100644
--- a/include/ydb-cpp-sdk/library/logger/thread.h
+++ b/include/ydb-cpp-sdk/library/logger/thread.h
@@ -2,7 +2,7 @@
 
 #include "backend.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <functional>
 
diff --git a/include/ydb-cpp-sdk/library/monlib/counters/counters.h b/include/ydb-cpp-sdk/library/monlib/counters/counters.h
index 931c86f061..9cff24c30f 100644
--- a/include/ydb-cpp-sdk/library/monlib/counters/counters.h
+++ b/include/ydb-cpp-sdk/library/monlib/counters/counters.h
@@ -3,11 +3,11 @@
 #include <list>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/guard.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <map>
 #include <mutex>
diff --git a/include/ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h b/include/ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h
index 2ec5afe1ae..787cea2401 100644
--- a/include/ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h
+++ b/include/ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h
@@ -5,10 +5,10 @@
 
 #include <ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h>
 
-#include <src/util/generic/cast.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/string/cast.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
 #include <map>
 #include <functional>
diff --git a/include/ydb-cpp-sdk/library/monlib/encode/encoder.h b/include/ydb-cpp-sdk/library/monlib/encode/encoder.h
index 889afeee02..0b34daea37 100644
--- a/include/ydb-cpp-sdk/library/monlib/encode/encoder.h
+++ b/include/ydb-cpp-sdk/library/monlib/encode/encoder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_consumer.h>
 
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h b/include/ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h
index e493b989d1..d4739fd461 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 #include <span>
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/labels.h b/include/ydb-cpp-sdk/library/monlib/metrics/labels.h
index 86f7ddca04..58f14b6f70 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/labels.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/labels.h
@@ -2,14 +2,14 @@
 
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/digest/multi.h>
-#include <src/util/digest/sequence.h>
+#include <ydb-cpp-sdk/util/digest/multi.h>
+#include <ydb-cpp-sdk/util/digest/sequence.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
-#include <src/util/stream/output.h>
-#include <src/util/string/builder.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <optional>
 #include <type_traits>
@@ -410,6 +410,8 @@ namespace NMonitoring {
 
 template<>
 struct THash<NMonitoring::ILabelsPtr> {
+    using is_transparent = void;
+
     size_t operator()(const NMonitoring::ILabelsPtr& labels) const noexcept {
         return labels->Hash();
     }
@@ -421,6 +423,8 @@ struct THash<NMonitoring::ILabelsPtr> {
 
 template<typename TStringBackend>
 struct THash<NMonitoring::TLabelsImpl<TStringBackend>> {
+    using is_transparent = void;
+
     size_t operator()(const NMonitoring::TLabelsImpl<TStringBackend>& labels) const noexcept {
         return labels.Hash();
     }
@@ -428,6 +432,8 @@ struct THash<NMonitoring::TLabelsImpl<TStringBackend>> {
 
 template <typename TStringBackend>
 struct THash<NMonitoring::TLabelImpl<TStringBackend>> {
+    using is_transparent = void;
+
     inline size_t operator()(const NMonitoring::TLabelImpl<TStringBackend>& label) const noexcept {
         return label.Hash();
     }
@@ -454,15 +460,17 @@ bool operator==(const NMonitoring::ILabelsPtr& lhs, const NMonitoring::ILabels&
 
 template<>
 struct TEqualTo<NMonitoring::ILabelsPtr> {
-    bool operator()(const NMonitoring::ILabelsPtr& lhs, const NMonitoring::ILabelsPtr& rhs) {
+    using is_transparent = void;
+
+    bool operator()(const NMonitoring::ILabelsPtr& lhs, const NMonitoring::ILabelsPtr& rhs) const {
         return *lhs == *rhs;
     }
 
-    bool operator()(const NMonitoring::ILabelsPtr& lhs, const NMonitoring::ILabels& rhs) {
+    bool operator()(const NMonitoring::ILabelsPtr& lhs, const NMonitoring::ILabels& rhs) const {
         return *lhs == rhs;
     }
 
-    bool operator()(const NMonitoring::ILabels& lhs, const NMonitoring::ILabelsPtr& rhs) {
+    bool operator()(const NMonitoring::ILabels& lhs, const NMonitoring::ILabelsPtr& rhs) const {
         return lhs == *rhs;
     }
 };
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h b/include/ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h
index 0e9a301be2..b9fb8c26cd 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <vector>
 #include <cmath>
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/metric.h b/include/ydb-cpp-sdk/library/monlib/metrics/metric.h
index b1341e1407..97f39fabcb 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/metric.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/metric.h
@@ -3,7 +3,7 @@
 #include "metric_consumer.h"
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <functional>
 
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/metric_registry.h b/include/ydb-cpp-sdk/library/monlib/metrics/metric_registry.h
index be3b15f278..f479db6d82 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/metric_registry.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/metric_registry.h
@@ -3,7 +3,7 @@
 #include "labels.h"
 #include "metric.h"
 
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
 namespace NMonitoring {
     class IMetricFactory {
@@ -146,7 +146,8 @@ namespace NMonitoring {
 
     private:
         THolder<TRWMutex> Lock_ = MakeHolder<TRWMutex>();
-        THashMap<ILabelsPtr, IMetricPtr> Metrics_;
+        using TMapType = std::unordered_map<ILabelsPtr, IMetricPtr, THash<ILabelsPtr>, TEqualTo<ILabelsPtr>>;
+        TMapType Metrics_;
 
         template <typename TMetric, EMetricType type, typename TLabelsType, typename... Args>
         TMetric* Metric(TLabelsType&& labels, Args&&... args);
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/metric_type.h b/include/ydb-cpp-sdk/library/monlib/metrics/metric_type.h
index f8b42cca66..409178fa49 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/metric_type.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/metric_type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <string_view>
 
diff --git a/include/ydb-cpp-sdk/library/monlib/metrics/summary_snapshot.h b/include/ydb-cpp-sdk/library/monlib/metrics/summary_snapshot.h
index 0d659c2664..0d17832caf 100644
--- a/include/ydb-cpp-sdk/library/monlib/metrics/summary_snapshot.h
+++ b/include/ydb-cpp-sdk/library/monlib/metrics/summary_snapshot.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NMonitoring {
 
diff --git a/include/ydb-cpp-sdk/library/monlib/service/mon_service_http_request.h b/include/ydb-cpp-sdk/library/monlib/service/mon_service_http_request.h
index 8d3c8acfb2..00bb640842 100644
--- a/include/ydb-cpp-sdk/library/monlib/service/mon_service_http_request.h
+++ b/include/ydb-cpp-sdk/library/monlib/service/mon_service_http_request.h
@@ -2,7 +2,7 @@
 
 #include "service.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NMonitoring {
     class TMonService2;
diff --git a/include/ydb-cpp-sdk/library/monlib/service/monservice.h b/include/ydb-cpp-sdk/library/monlib/service/monservice.h
index e807bc3595..972b7da37b 100644
--- a/include/ydb-cpp-sdk/library/monlib/service/monservice.h
+++ b/include/ydb-cpp-sdk/library/monlib/service/monservice.h
@@ -7,7 +7,7 @@
 #include "pages/index_mon_page.h"
 #include "pages/mon_page.h"
 
-#include <src/util/system/progname.h>
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 #include <functional>
 
diff --git a/include/ydb-cpp-sdk/library/monlib/service/pages/mon_page.h b/include/ydb-cpp-sdk/library/monlib/service/pages/mon_page.h
index b12018064d..e5a86914b3 100644
--- a/include/ydb-cpp-sdk/library/monlib/service/pages/mon_page.h
+++ b/include/ydb-cpp-sdk/library/monlib/service/pages/mon_page.h
@@ -4,7 +4,7 @@
 #include <ydb-cpp-sdk/library/monlib/service/mon_service_http_request.h>
 
 #include <string>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NMonitoring {
     static const char HTTPOKTEXT[] = "HTTP/1.1 200 Ok\r\nContent-Type: text/plain\r\nConnection: Close\r\n\r\n";
diff --git a/include/ydb-cpp-sdk/library/retry/retry_policy.h b/include/ydb-cpp-sdk/library/retry/retry_policy.h
index 0fe6ad45cb..005e59480b 100644
--- a/include/ydb-cpp-sdk/library/retry/retry_policy.h
+++ b/include/ydb-cpp-sdk/library/retry/retry_policy.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <functional>
 #include <limits>
diff --git a/include/ydb-cpp-sdk/library/string_utils/misc/misc.h b/include/ydb-cpp-sdk/library/string_utils/misc/misc.h
index 7faaff2d34..f94f35382e 100644
--- a/include/ydb-cpp-sdk/library/string_utils/misc/misc.h
+++ b/include/ydb-cpp-sdk/library/string_utils/misc/misc.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
-#include <src/util/generic/yexception.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <optional>
 
diff --git a/include/ydb-cpp-sdk/library/threading/future/core/future-inl.h b/include/ydb-cpp-sdk/library/threading/future/core/future-inl.h
index 5f781d79c8..9fd0b89994 100644
--- a/include/ydb-cpp-sdk/library/threading/future/core/future-inl.h
+++ b/include/ydb-cpp-sdk/library/threading/future/core/future-inl.h
@@ -4,10 +4,10 @@
 #error "you should never include future-inl.h directly"
 #endif // INCLUDE_FUTURE_INL_H
 
-#include <src/util/generic/function.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/system/event.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <atomic>
 #include <mutex>
diff --git a/include/ydb-cpp-sdk/library/threading/future/core/future.h b/include/ydb-cpp-sdk/library/threading/future/core/future.h
index 64287937b8..21a157ef0f 100644
--- a/include/ydb-cpp-sdk/library/threading/future/core/future.h
+++ b/include/ydb-cpp-sdk/library/threading/future/core/future.h
@@ -3,7 +3,7 @@
 #include "fwd.h"
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <string_view>
 #include <optional>
diff --git a/include/ydb-cpp-sdk/library/threading/future/wait/wait_group-inl.h b/include/ydb-cpp-sdk/library/threading/future/wait/wait_group-inl.h
index f7ec281cc5..69b51a20c9 100644
--- a/include/ydb-cpp-sdk/library/threading/future/wait/wait_group-inl.h
+++ b/include/ydb-cpp-sdk/library/threading/future/wait/wait_group-inl.h
@@ -6,11 +6,11 @@
 
 #include "wait_policy.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <ydb-cpp-sdk/library/threading/future/core/future.h>
 
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <atomic>
 #include <exception>
diff --git a/include/ydb-cpp-sdk/library/threading/future/wait/wait_group.h b/include/ydb-cpp-sdk/library/threading/future/wait/wait_group.h
index 362497e231..9a7da6b67d 100644
--- a/include/ydb-cpp-sdk/library/threading/future/wait/wait_group.h
+++ b/include/ydb-cpp-sdk/library/threading/future/wait/wait_group.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/threading/future/core/future.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NThreading {
     namespace NWaitGroup::NImpl {
diff --git a/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue.h b/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue.h
index 997d0572ec..c69e342d12 100644
--- a/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue.h
+++ b/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue.h
@@ -3,7 +3,7 @@
 #include "yql_issue_id.h"
 
 #include <ydb-cpp-sdk/util/system/types.h>
-#include <src/util/generic/hash.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 #include <google/protobuf/message.h>
 
 #include <vector>
@@ -155,9 +155,9 @@ class TIssue: public TThrRefBase {
         return CombineHashes(
             CombineHashes(
                 (size_t)CombineHashes(IntHash(Position.Row), IntHash(Position.Column)),
-                ComputeHash(Position.File)
+                THash<std::string>{}(Position.File)
             ),
-            (size_t)CombineHashes((size_t)IntHash(static_cast<int>(IssueCode)), ComputeHash(Message)));
+            (size_t)CombineHashes((size_t)IntHash(static_cast<int>(IssueCode)), THash<std::string>{}(Message)));
     }
 
     TIssue& SetCode(TIssueCode id, ESeverity severity) {
diff --git a/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue_id.h b/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue_id.h
index 0f65b1816c..eebc463faf 100644
--- a/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue_id.h
+++ b/include/ydb-cpp-sdk/library/yql/public/issue/yql_issue_id.h
@@ -10,9 +10,9 @@
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/message.h>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 #ifdef _win_
 #ifdef GetMessage
diff --git a/include/ydb-cpp-sdk/library/yson/node/node.h b/include/ydb-cpp-sdk/library/yson/node/node.h
index 3b62b7718c..4fdc354f23 100644
--- a/include/ydb-cpp-sdk/library/yson/node/node.h
+++ b/include/ydb-cpp-sdk/library/yson/node/node.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <src/util/generic/bt_exception.h>
-#include <src/util/generic/hash.h>
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <cmath>
 #include <variant>
+#include <unordered_map>
 
 class IInputStream;
 class IOutputStream;
@@ -44,7 +44,7 @@ class TNode
     };
 
     using TListType = std::vector<TNode>;
-    using TMapType = THashMap<std::string, TNode>;
+    using TMapType = std::unordered_map<std::string, TNode>;
 
 private:
     struct TNull {
diff --git a/include/ydb-cpp-sdk/library/yson/public.h b/include/ydb-cpp-sdk/library/yson/public.h
index eaad670d2a..0b19485f04 100644
--- a/include/ydb-cpp-sdk/library/yson/public.h
+++ b/include/ydb-cpp-sdk/library/yson/public.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/library/yt/misc/enum.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <ydb-cpp-sdk/library/yt/yson_string/public.h>
 #include <ydb-cpp-sdk/library/yt/yson/public.h>
diff --git a/include/ydb-cpp-sdk/library/yson/writer.h b/include/ydb-cpp-sdk/library/yson/writer.h
index 8d60e4d594..10af2db123 100644
--- a/include/ydb-cpp-sdk/library/yson/writer.h
+++ b/include/ydb-cpp-sdk/library/yson/writer.h
@@ -4,7 +4,7 @@
 #include "token.h"
 #include "consumer.h"
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 class IOutputStream;
 class IZeroCopyInput;
diff --git a/include/ydb-cpp-sdk/library/yt/misc/enum-inl.h b/include/ydb-cpp-sdk/library/yt/misc/enum-inl.h
index c118eda607..92e0f442d7 100644
--- a/include/ydb-cpp-sdk/library/yt/misc/enum-inl.h
+++ b/include/ydb-cpp-sdk/library/yt/misc/enum-inl.h
@@ -5,10 +5,10 @@
 #include "enum.h"
 #endif
 
-#include <src/util/string/escape.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 
 #include <algorithm>
 #include <format>
diff --git a/include/ydb-cpp-sdk/util/datetime/base.h b/include/ydb-cpp-sdk/util/datetime/base.h
index b55c435643..389e39e46a 100644
--- a/include/ydb-cpp-sdk/util/datetime/base.h
+++ b/include/ydb-cpp-sdk/util/datetime/base.h
@@ -6,7 +6,7 @@
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <chrono>
 
diff --git a/include/ydb-cpp-sdk/util/datetime/systime.h b/include/ydb-cpp-sdk/util/datetime/systime.h
index 1ca20e91b4..df76bf7ab3 100644
--- a/include/ydb-cpp-sdk/util/datetime/systime.h
+++ b/include/ydb-cpp-sdk/util/datetime/systime.h
@@ -12,7 +12,7 @@ struct tm* GmTimeR(const time_t* timer, struct tm* tmbuf);
 std::string CTimeR(const time_t* timer);
 
 #ifdef _win_
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
     #include <winsock2.h>
 
 void FileTimeToTimeval(const FILETIME* ft, struct timeval* tv);
diff --git a/src/util/digest/multi.h b/include/ydb-cpp-sdk/util/digest/multi.h
similarity index 90%
rename from src/util/digest/multi.h
rename to include/ydb-cpp-sdk/util/digest/multi.h
index 9ff57f72da..0aeaa6bcaf 100644
--- a/src/util/digest/multi.h
+++ b/include/ydb-cpp-sdk/util/digest/multi.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "numeric.h"
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 template <typename TOne>
 constexpr size_t MultiHash(const TOne& one) noexcept {
diff --git a/src/util/digest/numeric.h b/include/ydb-cpp-sdk/util/digest/numeric.h
similarity index 97%
rename from src/util/digest/numeric.h
rename to include/ydb-cpp-sdk/util/digest/numeric.h
index 6614719454..7c1e2097d5 100644
--- a/src/util/digest/numeric.h
+++ b/include/ydb-cpp-sdk/util/digest/numeric.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/typelist.h>
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 /*
diff --git a/src/util/digest/sequence.h b/include/ydb-cpp-sdk/util/digest/sequence.h
similarity index 96%
rename from src/util/digest/sequence.h
rename to include/ydb-cpp-sdk/util/digest/sequence.h
index 4e27526a01..06f3252333 100644
--- a/src/util/digest/sequence.h
+++ b/include/ydb-cpp-sdk/util/digest/sequence.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "numeric.h"
-#include <src/util/generic/hash.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 #include <span>
 
diff --git a/src/util/generic/algorithm.h b/include/ydb-cpp-sdk/util/generic/algorithm.h
similarity index 99%
rename from src/util/generic/algorithm.h
rename to include/ydb-cpp-sdk/util/generic/algorithm.h
index 15a904ebd2..d381901e9e 100644
--- a/src/util/generic/algorithm.h
+++ b/include/ydb-cpp-sdk/util/generic/algorithm.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "is_in.h"
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <numeric>
 #include <algorithm>
diff --git a/src/util/generic/bt_exception.h b/include/ydb-cpp-sdk/util/generic/bt_exception.h
similarity index 79%
rename from src/util/generic/bt_exception.h
rename to include/ydb-cpp-sdk/util/generic/bt_exception.h
index 538015c958..78c3ec296e 100644
--- a/src/util/generic/bt_exception.h
+++ b/include/ydb-cpp-sdk/util/generic/bt_exception.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <utility>
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+
+#include <ydb-cpp-sdk/util/system/backtrace.h>
 
-#include <src/util/system/backtrace.h>
+#include <utility>
 
 template <class T>
 class TWithBackTrace: public T {
diff --git a/src/util/generic/cast.h b/include/ydb-cpp-sdk/util/generic/cast.h
similarity index 96%
rename from src/util/generic/cast.h
rename to include/ydb-cpp-sdk/util/generic/cast.h
index b69f2ddcb6..cb15f6375f 100644
--- a/src/util/generic/cast.h
+++ b/include/ydb-cpp-sdk/util/generic/cast.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
-#include <src/util/system/compat.h>
-#include <src/util/system/type_name.h>
-#include <src/util/system/unaligned_mem.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cstdlib>
 
diff --git a/src/util/generic/flags.h b/include/ydb-cpp-sdk/util/generic/flags.h
similarity index 99%
rename from src/util/generic/flags.h
rename to include/ydb-cpp-sdk/util/generic/flags.h
index b952ae97e1..ae46519488 100644
--- a/src/util/generic/flags.h
+++ b/include/ydb-cpp-sdk/util/generic/flags.h
@@ -4,7 +4,7 @@
 
 #include <ydb-cpp-sdk/util/system/types.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 class IOutputStream;
 namespace NPrivate {
diff --git a/src/util/generic/function.h b/include/ydb-cpp-sdk/util/generic/function.h
similarity index 98%
rename from src/util/generic/function.h
rename to include/ydb-cpp-sdk/util/generic/function.h
index b8fdf8bac6..a737b8d635 100644
--- a/src/util/generic/function.h
+++ b/include/ydb-cpp-sdk/util/generic/function.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "typelist.h"
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 
 #include <functional>
 
diff --git a/src/util/generic/fwd.h b/include/ydb-cpp-sdk/util/generic/fwd.h
similarity index 100%
rename from src/util/generic/fwd.h
rename to include/ydb-cpp-sdk/util/generic/fwd.h
diff --git a/src/util/generic/is_in.h b/include/ydb-cpp-sdk/util/generic/is_in.h
similarity index 100%
rename from src/util/generic/is_in.h
rename to include/ydb-cpp-sdk/util/generic/is_in.h
diff --git a/src/util/generic/iterator_range.h b/include/ydb-cpp-sdk/util/generic/iterator_range.h
similarity index 98%
rename from src/util/generic/iterator_range.h
rename to include/ydb-cpp-sdk/util/generic/iterator_range.h
index 19e9a2add7..de0bb66362 100644
--- a/src/util/generic/iterator_range.h
+++ b/include/ydb-cpp-sdk/util/generic/iterator_range.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <iterator>
 #include <utility>
diff --git a/src/util/generic/noncopyable.h b/include/ydb-cpp-sdk/util/generic/noncopyable.h
similarity index 100%
rename from src/util/generic/noncopyable.h
rename to include/ydb-cpp-sdk/util/generic/noncopyable.h
diff --git a/src/util/generic/ptr.h b/include/ydb-cpp-sdk/util/generic/ptr.h
similarity index 99%
rename from src/util/generic/ptr.h
rename to include/ydb-cpp-sdk/util/generic/ptr.h
index 14e0aa2413..080f4c31ce 100644
--- a/src/util/generic/ptr.h
+++ b/include/ydb-cpp-sdk/util/generic/ptr.h
@@ -2,9 +2,8 @@
 
 #include "fwd.h"
 #include "utility.h"
-#include "intrlist.h"
 #include "refcount.h"
-#include <ydb-cpp-sdk/util/generic/typetraits.h>
+#include "typetraits.h"
 #include "singleton.h"
 
 #include <type_traits>
@@ -12,7 +11,7 @@
 
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 template <class T, class U>
 using TGuardConversion = typename std::enable_if_t<std::is_convertible<U*, T*>::value>;
diff --git a/src/util/generic/refcount.h b/include/ydb-cpp-sdk/util/generic/refcount.h
similarity index 97%
rename from src/util/generic/refcount.h
rename to include/ydb-cpp-sdk/util/generic/refcount.h
index f0d6349508..9682846594 100644
--- a/src/util/generic/refcount.h
+++ b/include/ydb-cpp-sdk/util/generic/refcount.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <atomic>
 
diff --git a/src/util/generic/singleton.h b/include/ydb-cpp-sdk/util/generic/singleton.h
similarity index 98%
rename from src/util/generic/singleton.h
rename to include/ydb-cpp-sdk/util/generic/singleton.h
index 4208f13192..85f6be7b82 100644
--- a/src/util/generic/singleton.h
+++ b/include/ydb-cpp-sdk/util/generic/singleton.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/atexit.h>
+#include <ydb-cpp-sdk/util/system/atexit.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 
 #include <atomic>
diff --git a/include/ydb-cpp-sdk/util/generic/size_literals.h b/include/ydb-cpp-sdk/util/generic/size_literals.h
index d74dbb148b..d0ae652c20 100644
--- a/include/ydb-cpp-sdk/util/generic/size_literals.h
+++ b/include/ydb-cpp-sdk/util/generic/size_literals.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/system/types.h>
 #include <limits>
 
diff --git a/src/util/generic/store_policy.h b/include/ydb-cpp-sdk/util/generic/store_policy.h
similarity index 100%
rename from src/util/generic/store_policy.h
rename to include/ydb-cpp-sdk/util/generic/store_policy.h
diff --git a/src/util/generic/string_hash.h b/include/ydb-cpp-sdk/util/generic/string_hash.h
similarity index 100%
rename from src/util/generic/string_hash.h
rename to include/ydb-cpp-sdk/util/generic/string_hash.h
diff --git a/src/util/generic/typelist.h b/include/ydb-cpp-sdk/util/generic/typelist.h
similarity index 100%
rename from src/util/generic/typelist.h
rename to include/ydb-cpp-sdk/util/generic/typelist.h
diff --git a/src/util/generic/utility.h b/include/ydb-cpp-sdk/util/generic/utility.h
similarity index 100%
rename from src/util/generic/utility.h
rename to include/ydb-cpp-sdk/util/generic/utility.h
diff --git a/src/util/generic/xrange.h b/include/ydb-cpp-sdk/util/generic/xrange.h
similarity index 98%
rename from src/util/generic/xrange.h
rename to include/ydb-cpp-sdk/util/generic/xrange.h
index 37a25d0b54..dfea8827e1 100644
--- a/src/util/generic/xrange.h
+++ b/include/ydb-cpp-sdk/util/generic/xrange.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "utility.h"
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <iterator>
 
 /** @file
diff --git a/src/util/generic/yexception.h b/include/ydb-cpp-sdk/util/generic/yexception.h
similarity index 96%
rename from src/util/generic/yexception.h
rename to include/ydb-cpp-sdk/util/generic/yexception.h
index 88954f712d..669dc938d6 100644
--- a/src/util/generic/yexception.h
+++ b/include/ydb-cpp-sdk/util/generic/yexception.h
@@ -1,22 +1,21 @@
 #pragma once
 
-#include "bt_exception.h"
-#include "string.h"
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <ydb-cpp-sdk/util/generic/va_args.h>
-#include <utility>
 
-#include <src/util/stream/tempbuf.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/stream/tempbuf.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/error.h>
-#include <src/util/system/src_location.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/src_location.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
 
-#include <exception>
-
 #include <cstdio>
+#include <cstring>
+
+#include <exception>
+#include <utility>
 
 class TBackTrace;
 
diff --git a/src/util/memory/alloc.h b/include/ydb-cpp-sdk/util/memory/alloc.h
similarity index 100%
rename from src/util/memory/alloc.h
rename to include/ydb-cpp-sdk/util/memory/alloc.h
diff --git a/src/util/memory/blob.h b/include/ydb-cpp-sdk/util/memory/blob.h
similarity index 99%
rename from src/util/memory/blob.h
rename to include/ydb-cpp-sdk/util/memory/blob.h
index ceaf93187d..595c1246d4 100644
--- a/src/util/memory/blob.h
+++ b/include/ydb-cpp-sdk/util/memory/blob.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #include <string_view>
diff --git a/src/util/memory/tempbuf.h b/include/ydb-cpp-sdk/util/memory/tempbuf.h
similarity index 98%
rename from src/util/memory/tempbuf.h
rename to include/ydb-cpp-sdk/util/memory/tempbuf.h
index 501cffbd76..d915005e60 100644
--- a/src/util/memory/tempbuf.h
+++ b/include/ydb-cpp-sdk/util/memory/tempbuf.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 /*
  * This is really fast buffer for temporary data.
diff --git a/src/util/network/address.h b/include/ydb-cpp-sdk/util/network/address.h
similarity index 97%
rename from src/util/network/address.h
rename to include/ydb-cpp-sdk/util/network/address.h
index 1da84544a6..5e66958ad5 100644
--- a/src/util/network/address.h
+++ b/include/ydb-cpp-sdk/util/network/address.h
@@ -2,9 +2,9 @@
 
 #include "ip.h"
 #include "socket.h"
+#include "sock.h"
 
-#include <src/util/generic/ptr.h>
-#include <src/util/network/sock.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NAddr {
     class IRemoteAddr {
diff --git a/src/util/network/hostip.h b/include/ydb-cpp-sdk/util/network/hostip.h
similarity index 100%
rename from src/util/network/hostip.h
rename to include/ydb-cpp-sdk/util/network/hostip.h
diff --git a/src/util/network/init.h b/include/ydb-cpp-sdk/util/network/init.h
similarity index 92%
rename from src/util/network/init.h
rename to include/ydb-cpp-sdk/util/network/init.h
index 9cec4b75b1..60e76090db 100644
--- a/src/util/network/init.h
+++ b/include/ydb-cpp-sdk/util/network/init.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/error.h>
 
 #if defined(_unix_)
     #include <fcntl.h>
@@ -25,7 +25,7 @@ using SOCKET = int;
     #define INVALID_SOCKET -1
     #define WSAGetLastError() errno
 #elif defined(_win_)
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
     #include <io.h>
     #include <winsock2.h>
     #include <ws2tcpip.h>
diff --git a/src/util/network/ip.h b/include/ydb-cpp-sdk/util/network/ip.h
similarity index 94%
rename from src/util/network/ip.h
rename to include/ydb-cpp-sdk/util/network/ip.h
index 5d21ff9054..0e4548b53c 100644
--- a/src/util/network/ip.h
+++ b/include/ydb-cpp-sdk/util/network/ip.h
@@ -3,9 +3,9 @@
 #include "socket.h"
 #include "hostip.h"
 
-#include <src/util/system/error.h>
-#include <src/util/system/byteorder.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/byteorder.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <string>
 
diff --git a/src/util/network/sock.h b/include/ydb-cpp-sdk/util/network/sock.h
similarity index 97%
rename from src/util/network/sock.h
rename to include/ydb-cpp-sdk/util/network/sock.h
index b132c1c62e..b8c0993102 100644
--- a/src/util/network/sock.h
+++ b/include/ydb-cpp-sdk/util/network/sock.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <src/util/folder/path.h>
+#include <contrib/libs/libc_compat/string.h>
+
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/string/cast.h>
-#include <src/util/stream/output.h>
-#include <src/util/system/sysstat.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/sysstat.h>
 
 #if defined(_win_) || defined(_cygwin_)
-    #include <src/util/system/file.h>
+    #include <ydb-cpp-sdk/util/system/file.h>
 #else
     #include <sys/un.h>
     #include <sys/stat.h>
@@ -97,9 +98,9 @@ struct TSockAddrLocal: public ISockAddr {
         return std::string(Path);
     }
 
-    TFsPath ToPath() const {
-        return TFsPath(Path);
-    }
+    // TFsPath ToPath() const {
+    //     return TFsPath(Path);
+    // }
 
     int ResolveAddr() const {
         if (in.sin_port == 0) {
@@ -200,9 +201,9 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr {
         return std::string(sun_path);
     }
 
-    TFsPath ToPath() const {
-        return TFsPath(sun_path);
-    }
+    // TFsPath ToPath() const {
+    //     return TFsPath(sun_path);
+    // }
 
     int Bind(SOCKET s, ui16 mode) const override {
         (void)unlink(sun_path);
diff --git a/src/util/network/socket.h b/include/ydb-cpp-sdk/util/network/socket.h
similarity index 97%
rename from src/util/network/socket.h
rename to include/ydb-cpp-sdk/util/network/socket.h
index d4abeb0016..5cff164eb0 100644
--- a/src/util/network/socket.h
+++ b/include/ydb-cpp-sdk/util/network/socket.h
@@ -2,14 +2,14 @@
 
 #include "init.h"
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/error.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 #include <cerrno>
diff --git a/src/util/random/random.h b/include/ydb-cpp-sdk/util/random/random.h
similarity index 100%
rename from src/util/random/random.h
rename to include/ydb-cpp-sdk/util/random/random.h
diff --git a/src/util/str_stl.h b/include/ydb-cpp-sdk/util/str_stl.h
similarity index 97%
rename from src/util/str_stl.h
rename to include/ydb-cpp-sdk/util/str_stl.h
index df1db46fcd..f16ff8dc3d 100644
--- a/src/util/str_stl.h
+++ b/include/ydb-cpp-sdk/util/str_stl.h
@@ -2,10 +2,10 @@
 
 #include <contrib/libs/libc_compat/string.h>
 
-#include <src/util/memory/alloc.h>
-#include <src/util/digest/numeric.h>
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/string_hash.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/string_hash.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 #include <functional>
diff --git a/src/util/stream/debug.h b/include/ydb-cpp-sdk/util/stream/debug.h
similarity index 100%
rename from src/util/stream/debug.h
rename to include/ydb-cpp-sdk/util/stream/debug.h
diff --git a/src/util/stream/fwd.h b/include/ydb-cpp-sdk/util/stream/fwd.h
similarity index 100%
rename from src/util/stream/fwd.h
rename to include/ydb-cpp-sdk/util/stream/fwd.h
diff --git a/src/util/stream/input.h b/include/ydb-cpp-sdk/util/stream/input.h
similarity index 99%
rename from src/util/stream/input.h
rename to include/ydb-cpp-sdk/util/stream/input.h
index 3c5ab50d37..fb5ea8f269 100644
--- a/src/util/stream/input.h
+++ b/include/ydb-cpp-sdk/util/stream/input.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 class IOutputStream;
diff --git a/src/util/stream/mem.h b/include/ydb-cpp-sdk/util/stream/mem.h
similarity index 100%
rename from src/util/stream/mem.h
rename to include/ydb-cpp-sdk/util/stream/mem.h
diff --git a/src/util/stream/output.h b/include/ydb-cpp-sdk/util/stream/output.h
similarity index 99%
rename from src/util/stream/output.h
rename to include/ydb-cpp-sdk/util/stream/output.h
index 8a4b929033..0d1c0b14d1 100644
--- a/src/util/stream/output.h
+++ b/include/ydb-cpp-sdk/util/stream/output.h
@@ -2,7 +2,7 @@
 
 #include "fwd.h"
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 #include <string_view>
diff --git a/src/util/stream/str.h b/include/ydb-cpp-sdk/util/stream/str.h
similarity index 98%
rename from src/util/stream/str.h
rename to include/ydb-cpp-sdk/util/stream/str.h
index de2288e2e8..80da546d9b 100644
--- a/src/util/stream/str.h
+++ b/include/ydb-cpp-sdk/util/stream/str.h
@@ -3,8 +3,8 @@
 #include "zerocopy.h"
 #include "zerocopy_output.h"
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <string>
 
diff --git a/src/util/stream/tempbuf.h b/include/ydb-cpp-sdk/util/stream/tempbuf.h
similarity index 90%
rename from src/util/stream/tempbuf.h
rename to include/ydb-cpp-sdk/util/stream/tempbuf.h
index 8b5d965fbb..be75bb4d51 100644
--- a/src/util/stream/tempbuf.h
+++ b/include/ydb-cpp-sdk/util/stream/tempbuf.h
@@ -2,7 +2,7 @@
 
 #include "output.h"
 
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 
 class TTempBufOutput: public IOutputStream, public TTempBuf {
 public:
diff --git a/src/util/stream/zerocopy.h b/include/ydb-cpp-sdk/util/stream/zerocopy.h
similarity index 98%
rename from src/util/stream/zerocopy.h
rename to include/ydb-cpp-sdk/util/stream/zerocopy.h
index 2d743e1579..89730ce9a5 100644
--- a/src/util/stream/zerocopy.h
+++ b/include/ydb-cpp-sdk/util/stream/zerocopy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
diff --git a/src/util/stream/zerocopy_output.h b/include/ydb-cpp-sdk/util/stream/zerocopy_output.h
similarity index 97%
rename from src/util/stream/zerocopy_output.h
rename to include/ydb-cpp-sdk/util/stream/zerocopy_output.h
index 07b1bd30a0..3de3cf06d4 100644
--- a/src/util/stream/zerocopy_output.h
+++ b/include/ydb-cpp-sdk/util/stream/zerocopy_output.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include "output.h"
 
diff --git a/src/util/string/ascii.h b/include/ydb-cpp-sdk/util/string/ascii.h
similarity index 99%
rename from src/util/string/ascii.h
rename to include/ydb-cpp-sdk/util/string/ascii.h
index 6f1018d6b7..56b58e4831 100644
--- a/src/util/string/ascii.h
+++ b/include/ydb-cpp-sdk/util/string/ascii.h
@@ -3,7 +3,7 @@
 #include <contrib/libs/libc_compat/string.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 
 #include <string>
 
diff --git a/src/util/string/builder.h b/include/ydb-cpp-sdk/util/string/builder.h
similarity index 95%
rename from src/util/string/builder.h
rename to include/ydb-cpp-sdk/util/string/builder.h
index 68ab87b7b7..0070a80662 100644
--- a/src/util/string/builder.h
+++ b/include/ydb-cpp-sdk/util/string/builder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <utility>
 
 namespace NPrivateStringBuilder {
diff --git a/src/util/string/cast.h b/include/ydb-cpp-sdk/util/string/cast.h
similarity index 99%
rename from src/util/string/cast.h
rename to include/ydb-cpp-sdk/util/string/cast.h
index 6e7ca9a2f6..7eda085b50 100644
--- a/src/util/string/cast.h
+++ b/include/ydb-cpp-sdk/util/string/cast.h
@@ -3,9 +3,9 @@
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <algorithm>
 #include <optional>
diff --git a/src/util/string/escape.h b/include/ydb-cpp-sdk/util/string/escape.h
similarity index 100%
rename from src/util/string/escape.h
rename to include/ydb-cpp-sdk/util/string/escape.h
diff --git a/src/util/string/strip.h b/include/ydb-cpp-sdk/util/string/strip.h
similarity index 100%
rename from src/util/string/strip.h
rename to include/ydb-cpp-sdk/util/string/strip.h
diff --git a/src/util/string/subst.h b/include/ydb-cpp-sdk/util/string/subst.h
similarity index 98%
rename from src/util/string/subst.h
rename to include/ydb-cpp-sdk/util/string/subst.h
index 0f263c8ed2..99c8861860 100644
--- a/src/util/string/subst.h
+++ b/include/ydb-cpp-sdk/util/string/subst.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <string>
 #include <string_view>
diff --git a/src/util/system/atexit.h b/include/ydb-cpp-sdk/util/system/atexit.h
similarity index 100%
rename from src/util/system/atexit.h
rename to include/ydb-cpp-sdk/util/system/atexit.h
diff --git a/src/util/system/backtrace.h b/include/ydb-cpp-sdk/util/system/backtrace.h
similarity index 100%
rename from src/util/system/backtrace.h
rename to include/ydb-cpp-sdk/util/system/backtrace.h
diff --git a/src/util/system/byteorder.h b/include/ydb-cpp-sdk/util/system/byteorder.h
similarity index 98%
rename from src/util/system/byteorder.h
rename to include/ydb-cpp-sdk/util/system/byteorder.h
index e512e4ec6b..e0c79f47f3 100644
--- a/src/util/system/byteorder.h
+++ b/include/ydb-cpp-sdk/util/system/byteorder.h
@@ -13,7 +13,7 @@
         #include <machine/byte_order.h>
     #endif
 #else
-    #include <src/util/generic/utility.h>
+    #include <ydb-cpp-sdk/util/generic/utility.h>
 #endif
 
 #if defined(_linux_) && !defined(USE_GENERIC_ENDIAN_CVT)
diff --git a/src/util/system/compat.h b/include/ydb-cpp-sdk/util/system/compat.h
similarity index 100%
rename from src/util/system/compat.h
rename to include/ydb-cpp-sdk/util/system/compat.h
diff --git a/src/util/system/error.h b/include/ydb-cpp-sdk/util/system/error.h
similarity index 100%
rename from src/util/system/error.h
rename to include/ydb-cpp-sdk/util/system/error.h
diff --git a/src/util/system/event.h b/include/ydb-cpp-sdk/util/system/event.h
similarity index 98%
rename from src/util/system/event.h
rename to include/ydb-cpp-sdk/util/system/event.h
index 78acf37b8d..e38df874e4 100644
--- a/src/util/system/event.h
+++ b/include/ydb-cpp-sdk/util/system/event.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 struct TEventResetType {
diff --git a/src/util/system/fhandle.h b/include/ydb-cpp-sdk/util/system/fhandle.h
similarity index 100%
rename from src/util/system/fhandle.h
rename to include/ydb-cpp-sdk/util/system/fhandle.h
diff --git a/src/util/system/file.h b/include/ydb-cpp-sdk/util/system/file.h
similarity index 97%
rename from src/util/system/file.h
rename to include/ydb-cpp-sdk/util/system/file.h
index a3e51131d5..ed5b364145 100644
--- a/src/util/system/file.h
+++ b/include/ydb-cpp-sdk/util/system/file.h
@@ -3,10 +3,10 @@
 #include "fhandle.h"
 #include "flock.h"
 
-#include <src/util/generic/flags.h>
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <cstdio>
 #include <filesystem>
diff --git a/src/util/system/flock.h b/include/ydb-cpp-sdk/util/system/flock.h
similarity index 100%
rename from src/util/system/flock.h
rename to include/ydb-cpp-sdk/util/system/flock.h
diff --git a/src/util/system/guard.h b/include/ydb-cpp-sdk/util/system/guard.h
similarity index 98%
rename from src/util/system/guard.h
rename to include/ydb-cpp-sdk/util/system/guard.h
index c1cf8e3221..766a814bf2 100644
--- a/src/util/system/guard.h
+++ b/include/ydb-cpp-sdk/util/system/guard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 template <class T>
diff --git a/src/util/system/maxlen.h b/include/ydb-cpp-sdk/util/system/maxlen.h
similarity index 100%
rename from src/util/system/maxlen.h
rename to include/ydb-cpp-sdk/util/system/maxlen.h
diff --git a/src/util/system/progname.h b/include/ydb-cpp-sdk/util/system/progname.h
similarity index 86%
rename from src/util/system/progname.h
rename to include/ydb-cpp-sdk/util/system/progname.h
index b1b585f1a3..9f92d75667 100644
--- a/src/util/system/progname.h
+++ b/include/ydb-cpp-sdk/util/system/progname.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 void SetProgramName(const char* argv0);
 
diff --git a/src/util/system/rwlock.h b/include/ydb-cpp-sdk/util/system/rwlock.h
similarity index 95%
rename from src/util/system/rwlock.h
rename to include/ydb-cpp-sdk/util/system/rwlock.h
index 570326cbc8..c14177521d 100644
--- a/src/util/system/rwlock.h
+++ b/include/ydb-cpp-sdk/util/system/rwlock.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "guard.h"
+#include <ydb-cpp-sdk/util/system/guard.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TRWMutex {
 public:
diff --git a/src/util/system/spin_wait.h b/include/ydb-cpp-sdk/util/system/spin_wait.h
similarity index 100%
rename from src/util/system/spin_wait.h
rename to include/ydb-cpp-sdk/util/system/spin_wait.h
diff --git a/src/util/system/spinlock.h b/include/ydb-cpp-sdk/util/system/spinlock.h
similarity index 100%
rename from src/util/system/spinlock.h
rename to include/ydb-cpp-sdk/util/system/spinlock.h
diff --git a/src/util/system/src_location.h b/include/ydb-cpp-sdk/util/system/src_location.h
similarity index 92%
rename from src/util/system/src_location.h
rename to include/ydb-cpp-sdk/util/system/src_location.h
index 46ac62ab38..3abdaff6c4 100644
--- a/src/util/system/src_location.h
+++ b/include/ydb-cpp-sdk/util/system/src_location.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src_root.h"
+#include <ydb-cpp-sdk/util/system/src_root.h>
 
 #include <string_view>
 
diff --git a/src/util/system/src_root.h b/include/ydb-cpp-sdk/util/system/src_root.h
similarity index 100%
rename from src/util/system/src_root.h
rename to include/ydb-cpp-sdk/util/system/src_root.h
diff --git a/src/util/system/sysstat.h b/include/ydb-cpp-sdk/util/system/sysstat.h
similarity index 100%
rename from src/util/system/sysstat.h
rename to include/ydb-cpp-sdk/util/system/sysstat.h
diff --git a/src/util/system/type_name.h b/include/ydb-cpp-sdk/util/system/type_name.h
similarity index 94%
rename from src/util/system/type_name.h
rename to include/ydb-cpp-sdk/util/system/type_name.h
index ede463423d..b47b8b16ee 100644
--- a/src/util/system/type_name.h
+++ b/include/ydb-cpp-sdk/util/system/type_name.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 #include <typeindex>
 #include <typeinfo>
diff --git a/src/util/system/unaligned_mem.h b/include/ydb-cpp-sdk/util/system/unaligned_mem.h
similarity index 96%
rename from src/util/system/unaligned_mem.h
rename to include/ydb-cpp-sdk/util/system/unaligned_mem.h
index f226959eac..64e1459207 100644
--- a/src/util/system/unaligned_mem.h
+++ b/include/ydb-cpp-sdk/util/system/unaligned_mem.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
-#include <string.h>
+#include <cstring>
 #include <type_traits>
 
 // The following code used to have smart tricks assuming that unaligned reads and writes are OK on x86. This assumption
diff --git a/src/util/system/win_undef.h b/include/ydb-cpp-sdk/util/system/win_undef.h
similarity index 100%
rename from src/util/system/win_undef.h
rename to include/ydb-cpp-sdk/util/system/win_undef.h
diff --git a/src/util/system/winint.h b/include/ydb-cpp-sdk/util/system/winint.h
similarity index 88%
rename from src/util/system/winint.h
rename to include/ydb-cpp-sdk/util/system/winint.h
index 020de9bb58..eaf3fb163b 100644
--- a/src/util/system/winint.h
+++ b/include/ydb-cpp-sdk/util/system/winint.h
@@ -13,4 +13,4 @@
     #include <windows.h>
 #endif
 
-#include <src/util/system/win_undef.h>
+#include <ydb-cpp-sdk/util/system/win_undef.h>
diff --git a/src/util/system/yassert.h b/include/ydb-cpp-sdk/util/system/yassert.h
similarity index 100%
rename from src/util/system/yassert.h
rename to include/ydb-cpp-sdk/util/system/yassert.h
diff --git a/src/util/thread/factory.h b/include/ydb-cpp-sdk/util/thread/factory.h
similarity index 96%
rename from src/util/thread/factory.h
rename to include/ydb-cpp-sdk/util/thread/factory.h
index 5e43ce1db1..e2e9fc0e00 100644
--- a/src/util/thread/factory.h
+++ b/include/ydb-cpp-sdk/util/thread/factory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <functional>
 
 class IThreadFactory {
diff --git a/src/util/thread/pool.h b/include/ydb-cpp-sdk/util/thread/pool.h
similarity index 98%
rename from src/util/thread/pool.h
rename to include/ydb-cpp-sdk/util/thread/pool.h
index a498e22046..1e83d8e6ee 100644
--- a/src/util/thread/pool.h
+++ b/include/ydb-cpp-sdk/util/thread/pool.h
@@ -2,10 +2,10 @@
 
 #include "factory.h"
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <string>
 
diff --git a/src/util/ysaveload.h b/include/ydb-cpp-sdk/util/ysaveload.h
similarity index 98%
rename from src/util/ysaveload.h
rename to include/ydb-cpp-sdk/util/ysaveload.h
index 5c0dfb2b5f..7ec4a02307 100644
--- a/src/util/ysaveload.h
+++ b/include/ydb-cpp-sdk/util/ysaveload.h
@@ -1,20 +1,21 @@
 #pragma once
 
-#include <queue>
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/algorithm.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 
 #include <deque>
 #include <list>
 #include <map>
+#include <queue>
 #include <set>
 #include <string>
 #include <unordered_set>
+#include <unordered_map>
 
 #ifndef __NVCC__
     // cuda is compiled in C++14 mode at the time
@@ -585,6 +586,10 @@ template <class K, class T, class C, class A>
 class TSerializer<std::multimap<K, T, C, A>>: public TMapSerializer<std::multimap<K, T, C, A>, true> {
 };
 
+template <class K, class T, class C, class A>
+class TSerializer<std::unordered_map<K, T, C, A>>: public TMapSerializer<std::unordered_map<K, T, C, A>, true> {
+};
+
 template <class T1, class T2, class T3, class T4, class T5>
 class TSerializer<THashMap<T1, T2, T3, T4, T5>>: public TMapSerializer<THashMap<T1, T2, T3, T4, T5>, false> {
 };
diff --git a/src/api/proto_output/proto_output.cpp b/src/api/proto_output/proto_output.cpp
index e822a0cf1e..281eaf4cdb 100644
--- a/src/api/proto_output/proto_output.cpp
+++ b/src/api/proto_output/proto_output.cpp
@@ -1,4 +1,4 @@
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <src/api/protos/ydb_value.pb.h>
 #include <src/api/protos/ydb_topic.pb.h>
diff --git a/src/client/coordination/coordination.cpp b/src/client/coordination/coordination.cpp
index dd5992e656..b41ede72bc 100644
--- a/src/client/coordination/coordination.cpp
+++ b/src/client/coordination/coordination.cpp
@@ -9,6 +9,7 @@
 #include <src/client/common_client/impl/client.h>
 
 #include <src/util/random/entropy.h>
+#include <src/util/generic/mapfindptr.h>
 
 namespace NYdb {
 namespace NCoordination {
@@ -28,6 +29,8 @@ using TResultPromise = TPromise<TResult<T>>;
 template<class T>
 inline TResultPromise<T> NewResultPromise() {
     return NewPromise<TResult<T>>();
+
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -307,7 +310,7 @@ class TSessionContext : public TThrRefBase {
         std::string Name;
         TIntrusivePtr<TSemaphoreOp> LastSentOp;
         TIntrusivePtr<TSemaphoreOp> LastAckedOp;
-        THashMap<ui64, TIntrusivePtr<TSemaphoreOp>> WaitingOps;
+        std::unordered_map<ui64, TIntrusivePtr<TSemaphoreOp>> WaitingOps;
         std::deque<TIntrusivePtr<TSemaphoreOp>> OpQueue;
         bool Restoring = false;
 
@@ -780,7 +783,7 @@ class TSessionContext : public TThrRefBase {
             TResultPromise<bool>* supersededPromise,
             TResultPromise<bool>* resultPromise)
     {
-        auto* state = SemaphoreByReqId.Value(reqId, nullptr);
+        auto* state = MapValue(SemaphoreByReqId, reqId, nullptr);
         if (!state) {
             return false;
         }
@@ -834,7 +837,7 @@ class TSessionContext : public TThrRefBase {
     }
 
     void DoSemaphoreEnqueueOp(const std::string& name, TIntrusivePtr<TSemaphoreOp> op) {
-        TSemaphoreState* state = Semaphores.FindPtr(name);
+        TSemaphoreState* state = MapFindPtr(Semaphores, name);
         if (!state) {
             state = &Semaphores[name];
             state->Name = name;
@@ -1537,7 +1540,7 @@ class TSessionContext : public TThrRefBase {
                 std::function<void()> acceptedCallback;
                 {
                     std::lock_guard guard(Lock);
-                    if (auto* state = SemaphoreByReqId.Value(reqId, nullptr)) {
+                    if (auto* state = MapValue(SemaphoreByReqId, reqId, nullptr)) {
                         auto op = state->LastSentOp;
                         Y_ABORT_UNLESS(op && op->ReqId == reqId && op->OpType == SEM_OP_ACQUIRE,
                             "Received AcquireSemaphorePending for an unexpected request");
@@ -1762,10 +1765,10 @@ class TSessionContext : public TThrRefBase {
     IQueueClientContextPtr ConnectContext;
     IQueueClientContextPtr ConnectTimeoutContext;
 
-    THashMap<std::string, TSemaphoreState> Semaphores;
-    THashMap<ui64, TSemaphoreState*> SemaphoreByReqId;
+    std::unordered_map<std::string, TSemaphoreState> Semaphores;
+    std::unordered_map<ui64, TSemaphoreState*> SemaphoreByReqId;
     std::deque<THolder<TSimpleOp>> PendingRequests;
-    THashMap<ui64, THolder<TSimpleOp>> SentRequests;
+    std::unordered_map<ui64, THolder<TSimpleOp>> SentRequests;
     TResultPromise<void> ReconnectPromise;
 
     // These are used to manage session timeout
diff --git a/src/client/export/export.cpp b/src/client/export/export.cpp
index 849fc2d393..44205433b9 100644
--- a/src/client/export/export.cpp
+++ b/src/client/export/export.cpp
@@ -13,7 +13,7 @@
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/timestamp.pb.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 namespace NYdb {
 namespace NExport {
diff --git a/src/client/federated_topic/impl/federation_observer.h b/src/client/federated_topic/impl/federation_observer.h
index c0f4135d3f..f18e739c1b 100644
--- a/src/client/federated_topic/impl/federation_observer.h
+++ b/src/client/federated_topic/impl/federation_observer.h
@@ -11,7 +11,7 @@
 #include <src/client/common_client/impl/client.h>
 #include <ydb-cpp-sdk/client/federated_topic/federated_topic.h>
 
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 #include <src/util/generic/hash.h>
 
 #include <deque>
diff --git a/src/client/impl/ydb_endpoints/endpoints.cpp b/src/client/impl/ydb_endpoints/endpoints.cpp
index 427b4c4baa..ce596819f7 100644
--- a/src/client/impl/ydb_endpoints/endpoints.cpp
+++ b/src/client/impl/ydb_endpoints/endpoints.cpp
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
 #include <src/library/string_utils/quote/quote.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <set>
 #include <unordered_set>
diff --git a/src/client/impl/ydb_internal/grpc_connections/actions.h b/src/client/impl/ydb_internal/grpc_connections/actions.h
index cc88435c1b..75ce27de44 100644
--- a/src/client/impl/ydb_internal/grpc_connections/actions.h
+++ b/src/client/impl/ydb_internal/grpc_connections/actions.h
@@ -9,7 +9,7 @@
 
 #include <ydb-cpp-sdk/library/grpc/client/grpc_client_low.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <grpc++/alarm.h>
 
diff --git a/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h
index 2825407a47..b9b080f92d 100644
--- a/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h
+++ b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h
@@ -4,7 +4,7 @@
 #include <src/client/impl/ydb_internal/session_client/session_client.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <functional>
 
diff --git a/src/client/impl/ydb_internal/logger/log.cpp b/src/client/impl/ydb_internal/logger/log.cpp
index 351c8c5376..5f178a358d 100644
--- a/src/client/impl/ydb_internal/logger/log.cpp
+++ b/src/client/impl/ydb_internal/logger/log.cpp
@@ -1,10 +1,10 @@
 #define INCLUDE_YDB_INTERNAL_H
 #include "log.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/client/impl/ydb_internal/plain_status/status.cpp b/src/client/impl/ydb_internal/plain_status/status.cpp
index a61071bd74..20346d4f0a 100644
--- a/src/client/impl/ydb_internal/plain_status/status.cpp
+++ b/src/client/impl/ydb_internal/plain_status/status.cpp
@@ -1,7 +1,7 @@
 #define INCLUDE_YDB_INTERNAL_H
 #include "status.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/client/impl/ydb_internal/retry/retry.cpp b/src/client/impl/ydb_internal/retry/retry.cpp
index 5e810b3fcb..b5ac180369 100644
--- a/src/client/impl/ydb_internal/retry/retry.cpp
+++ b/src/client/impl/ydb_internal/retry/retry.cpp
@@ -1,5 +1,5 @@
 #include "retry.h"
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 #include <ydb-cpp-sdk/client/retry/retry.h>
 #include <src/client/common_client/impl/iface.h>
 
diff --git a/src/client/impl/ydb_internal/retry/retry.h b/src/client/impl/ydb_internal/retry/retry.h
index 5d19736cb7..5f501de916 100644
--- a/src/client/impl/ydb_internal/retry/retry.h
+++ b/src/client/impl/ydb_internal/retry/retry.h
@@ -7,7 +7,7 @@
 #include <ydb-cpp-sdk/library/threading/future/core/fwd.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <src/util/datetime/cputimer.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/system/types.h>
 
 #include <functional>
diff --git a/src/client/impl/ydb_internal/retry/retry_async.h b/src/client/impl/ydb_internal/retry/retry_async.h
index 3b616c05d9..42a37ffcc1 100644
--- a/src/client/impl/ydb_internal/retry/retry_async.h
+++ b/src/client/impl/ydb_internal/retry/retry_async.h
@@ -2,7 +2,7 @@
 
 #include <src/client/impl/ydb_internal/retry/retry.h>
 
-#include <src/util/generic/function.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
 
 namespace NYdb::NRetry::Async {
 
diff --git a/src/client/impl/ydb_internal/session_pool/session_pool.cpp b/src/client/impl/ydb_internal/session_pool/session_pool.cpp
index fffe508c49..155db1a6bb 100644
--- a/src/client/impl/ydb_internal/session_pool/session_pool.cpp
+++ b/src/client/impl/ydb_internal/session_pool/session_pool.cpp
@@ -7,7 +7,7 @@
 #include <ydb-cpp-sdk/client/resources/ydb_resources.h>
 #include <ydb-cpp-sdk/client/types/operation/operation.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 namespace NYdb {
 namespace NSessionPool {
diff --git a/src/client/impl/ydb_internal/thread_pool/pool.h b/src/client/impl/ydb_internal/thread_pool/pool.h
index 03d7061f36..2c69a320ff 100644
--- a/src/client/impl/ydb_internal/thread_pool/pool.h
+++ b/src/client/impl/ydb_internal/thread_pool/pool.h
@@ -2,7 +2,7 @@
 
 #include <src/client/impl/ydb_internal/internal_header.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <memory>
 
diff --git a/src/client/impl/ydb_internal/value_helpers/helpers.cpp b/src/client/impl/ydb_internal/value_helpers/helpers.cpp
index c88bc7a5e2..0bb6a1b322 100644
--- a/src/client/impl/ydb_internal/value_helpers/helpers.cpp
+++ b/src/client/impl/ydb_internal/value_helpers/helpers.cpp
@@ -2,9 +2,9 @@
 #include "helpers.h"
 #include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/client/params/params.cpp b/src/client/params/params.cpp
index 40be665f81..e872273c52 100644
--- a/src/client/params/params.cpp
+++ b/src/client/params/params.cpp
@@ -6,7 +6,7 @@
 
 #include <ydb-cpp-sdk/client/types/fatal_error_handlers/handlers.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/client/persqueue_core/impl/callback_context.h b/src/client/persqueue_core/impl/callback_context.h
index 5265a8f352..9ac3cf1573 100644
--- a/src/client/persqueue_core/impl/callback_context.h
+++ b/src/client/persqueue_core/impl/callback_context.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <ydb-cpp-sdk/library/threading/future/core/future.h>
-#include <src/util/system/guard.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <memory>
 #include <shared_mutex>
diff --git a/src/client/persqueue_core/impl/common.h b/src/client/persqueue_core/impl/common.h
index 7b7372bf2c..f2764b5cfd 100644
--- a/src/client/persqueue_core/impl/common.h
+++ b/src/client/persqueue_core/impl/common.h
@@ -3,7 +3,7 @@
 #include <src/client/persqueue_core/persqueue.h>
 #include <src/client/common_client/impl/client.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <queue>
 #include <condition_variable>
diff --git a/src/client/persqueue_core/impl/counters_logger.h b/src/client/persqueue_core/impl/counters_logger.h
index 4fb7108dbe..35980e3d43 100644
--- a/src/client/persqueue_core/impl/counters_logger.h
+++ b/src/client/persqueue_core/impl/counters_logger.h
@@ -8,7 +8,7 @@
 #include <src/client/persqueue_core/impl/callback_context.h>
 #include <src/client/persqueue_core/impl/log_lazy.h>
 
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 namespace NYdb::NPersQueue {
 
diff --git a/src/client/persqueue_core/impl/persqueue.cpp b/src/client/persqueue_core/impl/persqueue.cpp
index cc85156a90..943ff5ff0e 100644
--- a/src/client/persqueue_core/impl/persqueue.cpp
+++ b/src/client/persqueue_core/impl/persqueue.cpp
@@ -5,9 +5,9 @@
 
 #include <src/library/persqueue/obfuscate/obfuscate.h>
 
-#include <src/util/random/random.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 namespace NYdb::NPersQueue {
 
diff --git a/src/client/persqueue_core/impl/read_session.cpp b/src/client/persqueue_core/impl/read_session.cpp
index e8e82a8b77..aeb7b84afb 100644
--- a/src/client/persqueue_core/impl/read_session.cpp
+++ b/src/client/persqueue_core/impl/read_session.cpp
@@ -11,9 +11,9 @@
 #include <src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h>
 #include <src/util/generic/guid.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 #include <variant>
 
diff --git a/src/client/persqueue_core/impl/read_session.h b/src/client/persqueue_core/impl/read_session.h
index 6d96b602ad..e815e72217 100644
--- a/src/client/persqueue_core/impl/read_session.h
+++ b/src/client/persqueue_core/impl/read_session.h
@@ -13,7 +13,7 @@
 
 #include <src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h>
 
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 #include <src/util/generic/hash.h>
 #include <src/util/generic/hash_multi_map.h>
 
diff --git a/src/client/persqueue_core/impl/read_session.ipp b/src/client/persqueue_core/impl/read_session.ipp
index 72bdc084b4..650970495f 100644
--- a/src/client/persqueue_core/impl/read_session.ipp
+++ b/src/client/persqueue_core/impl/read_session.ipp
@@ -17,9 +17,9 @@
 #include <src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h>
 #include <src/util/generic/guid.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 #include <utility>
 #include <variant>
diff --git a/src/client/persqueue_core/impl/write_session.cpp b/src/client/persqueue_core/impl/write_session.cpp
index 96645f16ef..4758a19f0b 100644
--- a/src/client/persqueue_core/impl/write_session.cpp
+++ b/src/client/persqueue_core/impl/write_session.cpp
@@ -5,8 +5,8 @@
 
 #include <src/library/string_utils/url/url.h>
 
-#include <src/util/generic/store_policy.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/stream/buffer.h>
 
 
diff --git a/src/client/persqueue_core/impl/write_session_impl.cpp b/src/client/persqueue_core/impl/write_session_impl.cpp
index cd1f46170f..0fdfa7a913 100644
--- a/src/client/persqueue_core/impl/write_session_impl.cpp
+++ b/src/client/persqueue_core/impl/write_session_impl.cpp
@@ -4,8 +4,8 @@
 #include <src/client/persqueue_core/persqueue.h>
 #include <src/library/string_utils/url/url.h>
 
-#include <src/util/generic/store_policy.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/stream/buffer.h>
 
 
diff --git a/src/client/persqueue_core/persqueue.h b/src/client/persqueue_core/persqueue.h
index 66f563f105..af6d885610 100644
--- a/src/client/persqueue_core/persqueue.h
+++ b/src/client/persqueue_core/persqueue.h
@@ -6,14 +6,14 @@
 #include <ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h>
 #include <ydb-cpp-sdk/library/logger/log.h>
 #include <ydb-cpp-sdk/library/retry/retry_policy.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
-#include <src/util/string/builder.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <exception>
 #include <variant>
diff --git a/src/client/persqueue_core/ut/basic_usage_ut.cpp b/src/client/persqueue_core/ut/basic_usage_ut.cpp
index 168c1a2e08..576a67effe 100644
--- a/src/client/persqueue_core/ut/basic_usage_ut.cpp
+++ b/src/client/persqueue_core/ut/basic_usage_ut.cpp
@@ -4,11 +4,11 @@
 #include <ydb-cpp-sdk/library/threading/future/future.h>
 #include <src/library/threading/future/async.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/string/join.h>
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/stream/zlib.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 #include <atomic>
 #include <format>
diff --git a/src/client/persqueue_core/ut/ut_utils/test_utils.h b/src/client/persqueue_core/ut/ut_utils/test_utils.h
index b8e7db3b2d..7789a51ed7 100644
--- a/src/client/persqueue_core/ut/ut_utils/test_utils.h
+++ b/src/client/persqueue_core/ut/ut_utils/test_utils.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 #include <src/library/threading/chunk_queue/queue.h>
 #include <src/util/generic/overloaded.h>
diff --git a/src/client/persqueue_public/codecs/codecs.cpp b/src/client/persqueue_public/codecs/codecs.cpp
index f06635c268..c565b6d3d3 100644
--- a/src/client/persqueue_public/codecs/codecs.cpp
+++ b/src/client/persqueue_public/codecs/codecs.cpp
@@ -1,7 +1,7 @@
 #include <src/library/streams/zstd/zstd.h>
 #include <src/util/stream/buffer.h>
 #include <src/util/stream/zlib.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 #include "codecs.h"
 
diff --git a/src/client/persqueue_public/codecs/codecs.h b/src/client/persqueue_public/codecs/codecs.h
index 456dfa5ffe..a843889739 100644
--- a/src/client/persqueue_public/codecs/codecs.h
+++ b/src/client/persqueue_public/codecs/codecs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/api/protos/ydb_persqueue_v1.pb.h>
 #include <src/client/persqueue_core/persqueue.h>
 #include <ydb-cpp-sdk/client/topic/topic.h>
diff --git a/src/client/result/result.cpp b/src/client/result/result.cpp
index 55b525085e..e66e53afce 100644
--- a/src/client/result/result.cpp
+++ b/src/client/result/result.cpp
@@ -5,7 +5,7 @@
 #include <src/api/protos/ydb_common.pb.h>
 #include <src/api/protos/ydb_value.pb.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/generic/mapfindptr.h>
 
diff --git a/src/client/table/impl/client_session.cpp b/src/client/table/impl/client_session.cpp
index acff281cca..524528f5dd 100644
--- a/src/client/table/impl/client_session.cpp
+++ b/src/client/table/impl/client_session.cpp
@@ -1,7 +1,7 @@
 #include "client_session.h"
 #include "data_query.h"
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace NYdb {
 namespace NTable {
diff --git a/src/client/table/impl/readers.h b/src/client/table/impl/readers.h
index 9f14d364c0..00ff9111b4 100644
--- a/src/client/table/impl/readers.h
+++ b/src/client/table/impl/readers.h
@@ -5,7 +5,7 @@
 #include <src/api/grpc/ydb_table_v1.grpc.pb.h>
 #include <ydb-cpp-sdk/client/proto/accessor.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include "client_session.h"
 #include "data_query.h"
diff --git a/src/client/table/table.cpp b/src/client/table/table.cpp
index 7f9ca85581..64fcf981b7 100644
--- a/src/client/table/table.cpp
+++ b/src/client/table/table.cpp
@@ -25,7 +25,7 @@
 #include <src/library/cache/cache.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 #include <src/util/string/join.h>
 
 #include <map>
@@ -477,11 +477,11 @@ class TTableDescription::TImpl {
         Attributes_[key] = value;
     }
 
-    void SetAttributes(const THashMap<std::string, std::string>& attrs) {
+    void SetAttributes(const std::unordered_map<std::string, std::string>& attrs) {
         Attributes_ = attrs;
     }
 
-    void SetAttributes(THashMap<std::string, std::string>&& attrs) {
+    void SetAttributes(std::unordered_map<std::string, std::string>&& attrs) {
         Attributes_ = std::move(attrs);
     }
 
@@ -578,7 +578,7 @@ class TTableDescription::TImpl {
         return ColumnFamilies_;
     }
 
-    const THashMap<std::string, std::string>& GetAttributes() const {
+    const std::unordered_map<std::string, std::string>& GetAttributes() const {
         return Attributes_;
     }
 
@@ -626,7 +626,7 @@ class TTableDescription::TImpl {
     std::vector<TPartitionStats> PartitionStats_;
     TTableStats TableStats;
     std::vector<TColumnFamilyDescription> ColumnFamilies_;
-    THashMap<std::string, std::string> Attributes_;
+    std::unordered_map<std::string, std::string> Attributes_;
     std::string CompactionPolicy_;
     std::optional<ui64> UniformPartitions_;
     std::optional<TExplicitPartitions> PartitionAtKeys_;
@@ -777,11 +777,11 @@ void TTableDescription::AddAttribute(const std::string& key, const std::string&
     Impl_->AddAttribute(key, value);
 }
 
-void TTableDescription::SetAttributes(const THashMap<std::string, std::string>& attrs) {
+void TTableDescription::SetAttributes(const std::unordered_map<std::string, std::string>& attrs) {
     Impl_->SetAttributes(attrs);
 }
 
-void TTableDescription::SetAttributes(THashMap<std::string, std::string>&& attrs) {
+void TTableDescription::SetAttributes(std::unordered_map<std::string, std::string>&& attrs) {
     Impl_->SetAttributes(std::move(attrs));
 }
 
@@ -845,7 +845,7 @@ const std::vector<TColumnFamilyDescription>& TTableDescription::GetColumnFamilie
     return Impl_->GetColumnFamilies();
 }
 
-const THashMap<std::string, std::string>& TTableDescription::GetAttributes() const {
+const std::unordered_map<std::string, std::string>& TTableDescription::GetAttributes() const {
     return Impl_->GetAttributes();
 }
 
@@ -1238,12 +1238,12 @@ TTableBuilder& TTableBuilder::AddAttribute(const std::string& key, const std::st
     return *this;
 }
 
-TTableBuilder& TTableBuilder::SetAttributes(const THashMap<std::string, std::string>& attrs) {
+TTableBuilder& TTableBuilder::SetAttributes(const std::unordered_map<std::string, std::string>& attrs) {
     TableDescription_.SetAttributes(attrs);
     return *this;
 }
 
-TTableBuilder& TTableBuilder::SetAttributes(THashMap<std::string, std::string>&& attrs) {
+TTableBuilder& TTableBuilder::SetAttributes(std::unordered_map<std::string, std::string>&& attrs) {
     TableDescription_.SetAttributes(std::move(attrs));
     return *this;
 }
@@ -2362,12 +2362,12 @@ TChangefeedDescription& TChangefeedDescription::AddAttribute(const std::string&
     return *this;
 }
 
-TChangefeedDescription& TChangefeedDescription::SetAttributes(const THashMap<std::string, std::string>& attrs) {
+TChangefeedDescription& TChangefeedDescription::SetAttributes(const std::unordered_map<std::string, std::string>& attrs) {
     Attributes_ = attrs;
     return *this;
 }
 
-TChangefeedDescription& TChangefeedDescription::SetAttributes(THashMap<std::string, std::string>&& attrs) {
+TChangefeedDescription& TChangefeedDescription::SetAttributes(std::unordered_map<std::string, std::string>&& attrs) {
     Attributes_ = std::move(attrs);
     return *this;
 }
@@ -2405,7 +2405,7 @@ bool TChangefeedDescription::GetInitialScan() const {
     return InitialScan_;
 }
 
-const THashMap<std::string, std::string>& TChangefeedDescription::GetAttributes() const {
+const std::unordered_map<std::string, std::string>& TChangefeedDescription::GetAttributes() const {
     return Attributes_;
 }
 
diff --git a/src/client/topic/codecs/codecs.cpp b/src/client/topic/codecs/codecs.cpp
index c4108bef3b..a6d8c3d08f 100644
--- a/src/client/topic/codecs/codecs.cpp
+++ b/src/client/topic/codecs/codecs.cpp
@@ -1,7 +1,7 @@
 #include <src/library/streams/zstd/zstd.h>
 #include <src/util/stream/buffer.h>
 #include <src/util/stream/zlib.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 #include "codecs.h"
 
diff --git a/src/client/topic/codecs/codecs.h b/src/client/topic/codecs/codecs.h
index e2373896b1..6ad51219b9 100644
--- a/src/client/topic/codecs/codecs.h
+++ b/src/client/topic/codecs/codecs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/api/protos/ydb_topic.pb.h>
 #include <ydb-cpp-sdk/client/topic/topic.h>
 
diff --git a/src/client/topic/impl/event_handlers.cpp b/src/client/topic/impl/event_handlers.cpp
index 08e482eb3c..0f7c034512 100644
--- a/src/client/topic/impl/event_handlers.cpp
+++ b/src/client/topic/impl/event_handlers.cpp
@@ -87,8 +87,8 @@ class TGracefulReleasingSimpleDataHandlers : public TThrRefBase {
     TAdaptiveLock Lock; // For the case when user gave us multithreaded executor.
     const std::function<void(TReadSessionEvent::TDataReceivedEvent&)> DataHandler;
     const bool CommitAfterProcessing;
-    THashMap<ui64, TDisjointIntervalTree<ui64>> PartitionStreamToUncommittedOffsets; // Partition stream id -> set of offsets.
-    THashMap<ui64, TReadSessionEvent::TStopPartitionSessionEvent> UnconfirmedDestroys; // Partition stream id -> destroy events.
+    std::unordered_map<ui64, TDisjointIntervalTree<ui64>> PartitionStreamToUncommittedOffsets; // Partition stream id -> set of offsets.
+    std::unordered_map<ui64, TReadSessionEvent::TStopPartitionSessionEvent> UnconfirmedDestroys; // Partition stream id -> destroy events.
 };
 
 TReadSessionSettings::TEventHandlers& TReadSessionSettings::TEventHandlers::SimpleDataHandlers(std::function<void(TReadSessionEvent::TDataReceivedEvent&)> dataHandler,
diff --git a/src/client/topic/impl/executor.h b/src/client/topic/impl/executor.h
index ca1b2ce754..9d9b1a1dc9 100644
--- a/src/client/topic/impl/executor.h
+++ b/src/client/topic/impl/executor.h
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/client/topic/topic.h>
 #include <src/client/common_client/impl/client.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 
 namespace NYdb::NTopic {
diff --git a/src/client/topic/impl/topic.cpp b/src/client/topic/impl/topic.cpp
index 95795e7060..d544eab2c6 100644
--- a/src/client/topic/impl/topic.cpp
+++ b/src/client/topic/impl/topic.cpp
@@ -6,9 +6,9 @@
 
 #include <src/library/persqueue/obfuscate/obfuscate.h>
 
-#include <src/util/random/random.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 namespace NYdb::NTopic {
 
diff --git a/src/client/topic/impl/write_session_impl.cpp b/src/client/topic/impl/write_session_impl.cpp
index 4a81aede6b..b67348ce51 100644
--- a/src/client/topic/impl/write_session_impl.cpp
+++ b/src/client/topic/impl/write_session_impl.cpp
@@ -7,8 +7,8 @@
 
 #include <google/protobuf/util/time_util.h>
 
-#include <src/util/generic/store_policy.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/stream/buffer.h>
 #include <src/util/generic/guid.h>
 
diff --git a/src/client/types/credentials/credentials.cpp b/src/client/types/credentials/credentials.cpp
index 3ea3138140..161faf1123 100644
--- a/src/client/types/credentials/credentials.cpp
+++ b/src/client/types/credentials/credentials.cpp
@@ -1,5 +1,5 @@
 #include <ydb-cpp-sdk/client/types/credentials/credentials.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace NYdb {
 
diff --git a/src/client/types/credentials/login/login.cpp b/src/client/types/credentials/login/login.cpp
index bf589b26f6..e4c24d6f08 100644
--- a/src/client/types/credentials/login/login.cpp
+++ b/src/client/types/credentials/login/login.cpp
@@ -7,7 +7,7 @@
 #include <src/library/login/login.h>
 #include <src/library/security/util.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace NYdb {
 
diff --git a/src/client/value/value.cpp b/src/client/value/value.cpp
index f94713be3b..ad9c38aebb 100644
--- a/src/client/value/value.cpp
+++ b/src/client/value/value.cpp
@@ -10,14 +10,14 @@
 #include <src/api/protos/ydb_value.pb.h>
 
 #include <ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/library/yql/public/decimal/yql_decimal.h>
 #include <src/library/uuid/uuid.h>
 
 #include <src/util/generic/mapfindptr.h>
 #include <src/util/generic/bitmap.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/json_value/ydb_json_value.cpp b/src/json_value/ydb_json_value.cpp
index 33af406949..00d4816868 100644
--- a/src/json_value/ydb_json_value.cpp
+++ b/src/json_value/ydb_json_value.cpp
@@ -1,8 +1,8 @@
 #include <ydb-cpp-sdk/json_value/ydb_json_value.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/library/string_utils/base64/base64.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/json/json_reader.h>
 
 namespace NYdb {
diff --git a/src/library/blockcodecs/codecs/brotli/brotli.cpp b/src/library/blockcodecs/codecs/brotli/brotli.cpp
index ad9594b893..620006c371 100644
--- a/src/library/blockcodecs/codecs/brotli/brotli.cpp
+++ b/src/library/blockcodecs/codecs/brotli/brotli.cpp
@@ -2,7 +2,7 @@
 #include <src/library/blockcodecs/core/common.h>
 #include <src/library/blockcodecs/core/register.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <brotli/encode.h>
 #include <brotli/decode.h>
diff --git a/src/library/blockcodecs/codecs/lz4/lz4.cpp b/src/library/blockcodecs/codecs/lz4/lz4.cpp
index d85eed1d0e..2b93b9f9d1 100644
--- a/src/library/blockcodecs/codecs/lz4/lz4.cpp
+++ b/src/library/blockcodecs/codecs/lz4/lz4.cpp
@@ -2,7 +2,7 @@
 #include <src/library/blockcodecs/core/common.h>
 #include <src/library/blockcodecs/core/register.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <lz4.h>
 #include <lz4hc.h>
diff --git a/src/library/blockcodecs/codecs/zstd/zstd.cpp b/src/library/blockcodecs/codecs/zstd/zstd.cpp
index 5b5d5d10d9..515bbfa2b8 100644
--- a/src/library/blockcodecs/codecs/zstd/zstd.cpp
+++ b/src/library/blockcodecs/codecs/zstd/zstd.cpp
@@ -2,7 +2,7 @@
 #include <src/library/blockcodecs/core/common.h>
 #include <src/library/blockcodecs/core/register.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #define ZSTD_STATIC_LINKING_ONLY
 #include <zstd.h>
diff --git a/src/library/blockcodecs/codecs_ut.cpp b/src/library/blockcodecs/codecs_ut.cpp
index 7c18898c62..fd90831f46 100644
--- a/src/library/blockcodecs/codecs_ut.cpp
+++ b/src/library/blockcodecs/codecs_ut.cpp
@@ -3,9 +3,9 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <src/util/string/join.h>
-#include <src/util/digest/multi.h>
+#include <ydb-cpp-sdk/util/digest/multi.h>
 
 Y_UNIT_TEST_SUITE(TBlockCodecsTest) {
     using namespace NBlockCodecs;
diff --git a/src/library/blockcodecs/core/codecs.cpp b/src/library/blockcodecs/core/codecs.cpp
index e4ee1b6e27..5d1fabb9fc 100644
--- a/src/library/blockcodecs/core/codecs.cpp
+++ b/src/library/blockcodecs/core/codecs.cpp
@@ -2,18 +2,18 @@
 #include "common.h"
 #include "register.h"
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 #include <src/util/stream/null.h>
-#include <src/util/stream/mem.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/join.h>
 #include <src/util/system/align.h>
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/generic/mem_copy.h>
 
 using namespace NBlockCodecs;
diff --git a/src/library/blockcodecs/core/codecs.h b/src/library/blockcodecs/core/codecs.h
index 6355fa86c6..037ea57291 100644
--- a/src/library/blockcodecs/core/codecs.h
+++ b/src/library/blockcodecs/core/codecs.h
@@ -4,7 +4,7 @@
 #include <string_view>
 #include <string>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NBlockCodecs {
     struct TData: public std::string_view {
diff --git a/src/library/blockcodecs/core/common.h b/src/library/blockcodecs/core/common.h
index fdb4aacd23..4620834eb4 100644
--- a/src/library/blockcodecs/core/common.h
+++ b/src/library/blockcodecs/core/common.h
@@ -2,18 +2,18 @@
 
 #include "codecs.h"
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 #include <src/util/stream/null.h>
-#include <src/util/stream/mem.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/join.h>
 #include <src/util/system/align.h>
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/generic/mem_copy.h>
 
 namespace NBlockCodecs {
diff --git a/src/library/blockcodecs/core/stream.cpp b/src/library/blockcodecs/core/stream.cpp
index 5a4b370d00..0b3bce9933 100644
--- a/src/library/blockcodecs/core/stream.cpp
+++ b/src/library/blockcodecs/core/stream.cpp
@@ -3,11 +3,11 @@
 
 #include <src/util/digest/murmur.h>
 #include <src/util/generic/scope.h>
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/stream/mem.h>
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 using namespace NBlockCodecs;
 
diff --git a/src/library/blockcodecs/core/stream.h b/src/library/blockcodecs/core/stream.h
index c26e152f3a..a6fc910667 100644
--- a/src/library/blockcodecs/core/stream.h
+++ b/src/library/blockcodecs/core/stream.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <src/util/stream/walk.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
 #include <src/util/generic/buffer.h>
 
 namespace NBlockCodecs {
diff --git a/src/library/build_info/sandbox.cpp.in b/src/library/build_info/sandbox.cpp.in
index da108d46ad..73a8768886 100644
--- a/src/library/build_info/sandbox.cpp.in
+++ b/src/library/build_info/sandbox.cpp.in
@@ -1,7 +1,7 @@
 #include <src/library/build_info/sandbox.h>
 #include <src/library/string_utils/base64/base64.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <string>
 
 extern "C" const char* GetSandboxTaskId() {
diff --git a/src/library/cache/cache.h b/src/library/cache/cache.h
index fd9391b8fd..598d3e22e7 100644
--- a/src/library/cache/cache.h
+++ b/src/library/cache/cache.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <utility>
 #include <unordered_set>
 
diff --git a/src/library/cache/thread_safe_cache.h b/src/library/cache/thread_safe_cache.h
index 1e41e89bc4..1164667410 100644
--- a/src/library/cache/thread_safe_cache.h
+++ b/src/library/cache/thread_safe_cache.h
@@ -2,9 +2,9 @@
 
 #include "cache.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
 namespace NPrivate {
     // We are interested in getters promotion policy _here_ because of Read-Write-Lock optimizations.
diff --git a/src/library/case_insensitive_string/case_insensitive_char_traits.cpp b/src/library/case_insensitive_string/case_insensitive_char_traits.cpp
index 3e6d8a8145..cba433358e 100644
--- a/src/library/case_insensitive_string/case_insensitive_char_traits.cpp
+++ b/src/library/case_insensitive_string/case_insensitive_char_traits.cpp
@@ -1,7 +1,7 @@
 #include "case_insensitive_char_traits.h"
 #include "case_insensitive_string.h"
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 int TCaseInsensitiveCharTraits::compare(const char* s1, const char* s2, std::size_t n) {
     while (n-- != 0) {
diff --git a/src/library/cgiparam/cgiparam.cpp b/src/library/cgiparam/cgiparam.cpp
index fa84e78890..2f402ad406 100644
--- a/src/library/cgiparam/cgiparam.cpp
+++ b/src/library/cgiparam/cgiparam.cpp
@@ -3,7 +3,7 @@
 #include <src/library/string_utils/scan/scan.h>
 #include <src/library/string_utils/quote/quote.h>
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <string>
 
diff --git a/src/library/charset/ci_string.h b/src/library/charset/ci_string.h
index 6630924b2d..a3af9e7423 100644
--- a/src/library/charset/ci_string.h
+++ b/src/library/charset/ci_string.h
@@ -3,7 +3,7 @@
 #include "codepage.h"
 
 #include <string>
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 // Same as std::string but uses CASE INSENSITIVE comparator and hash. Use with care.
 class TCiString: public std::string {
diff --git a/src/library/charset/codepage.cpp b/src/library/charset/codepage.cpp
index 7cf66fe80f..9774f1156e 100644
--- a/src/library/charset/codepage.cpp
+++ b/src/library/charset/codepage.cpp
@@ -1,16 +1,16 @@
 #include "ci_string.h"
 #include "codepage.h"
 
-#include <src/util/string/cast.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <src/util/string/util.h>
 #include <src/util/system/hi_lo.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/generic/hash.h>
 #include <string>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/memory/pool.h>
 
 #include <cstring>
diff --git a/src/library/charset/codepage.h b/src/library/charset/codepage.h
index 1ecd748d47..abb499209b 100644
--- a/src/library/charset/codepage.h
+++ b/src/library/charset/codepage.h
@@ -9,8 +9,8 @@
 #include <src/util/charset/utf8.h>
 #include <string>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 struct CodePage;
diff --git a/src/library/charset/codepage_ut.cpp b/src/library/charset/codepage_ut.cpp
index 9012acd567..1154514b7d 100644
--- a/src/library/charset/codepage_ut.cpp
+++ b/src/library/charset/codepage_ut.cpp
@@ -4,7 +4,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/charset/utf8.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #if defined(_MSC_VER)
 #pragma warning(disable : 4309) /*truncation of constant value*/
diff --git a/src/library/charset/cp_encrec.cpp b/src/library/charset/cp_encrec.cpp
index 86d0b4da06..9aa0c890b3 100644
--- a/src/library/charset/cp_encrec.cpp
+++ b/src/library/charset/cp_encrec.cpp
@@ -1,6 +1,6 @@
 #include "codepage.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 void Encoder::Tr(const wchar32* in, char* out, size_t len) const {
     while (len--)
diff --git a/src/library/charset/iconv.h b/src/library/charset/iconv.h
index acd6c4a95d..0f5338ab00 100644
--- a/src/library/charset/iconv.h
+++ b/src/library/charset/iconv.h
@@ -2,7 +2,7 @@
 
 #include "codepage.h"
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 // WARNING: Do not use this functions - use functions from wide.h or recyr.hh instead.
 
diff --git a/src/library/charset/recyr.hh b/src/library/charset/recyr.hh
index 8d17fb3ad6..240cf21816 100644
--- a/src/library/charset/recyr.hh
+++ b/src/library/charset/recyr.hh
@@ -3,8 +3,8 @@
 #include <cstdlib>
 
 #include <src/util/charset/recode_result.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include "codepage.h"
 #include "doccodes.h"
diff --git a/src/library/charset/recyr_int.hh b/src/library/charset/recyr_int.hh
index 50b221e4da..7acb1bab91 100644
--- a/src/library/charset/recyr_int.hh
+++ b/src/library/charset/recyr_int.hh
@@ -2,7 +2,7 @@
 
 #include <src/util/charset/recode_result.h>
 #include <src/util/charset/utf8.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <string>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
diff --git a/src/library/charset/recyr_int_ut.cpp b/src/library/charset/recyr_int_ut.cpp
index 424a3267c5..60f96c42a5 100644
--- a/src/library/charset/recyr_int_ut.cpp
+++ b/src/library/charset/recyr_int_ut.cpp
@@ -5,7 +5,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/charset/utf8.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 class TRecyr_intTest: public TTestBase {
 private:
diff --git a/src/library/charset/wide_ut.cpp b/src/library/charset/wide_ut.cpp
index d4ccef57e7..c2a1df0c3f 100644
--- a/src/library/charset/wide_ut.cpp
+++ b/src/library/charset/wide_ut.cpp
@@ -5,7 +5,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/charset/utf8.h>
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 
 #include <algorithm>
 #include <unordered_set>
diff --git a/src/library/colorizer/colors.cpp b/src/library/colorizer/colors.cpp
index d31f7ec30c..a4f5d9759e 100644
--- a/src/library/colorizer/colors.cpp
+++ b/src/library/colorizer/colors.cpp
@@ -1,7 +1,7 @@
 #include "colors.h"
 
-#include <src/util/stream/output.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <iostream>
 
diff --git a/src/library/colorizer/output.cpp b/src/library/colorizer/output.cpp
index 6985df1137..4799f16f56 100644
--- a/src/library/colorizer/output.cpp
+++ b/src/library/colorizer/output.cpp
@@ -1,6 +1,6 @@
 #include "output.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 using namespace NColorizer;
 
diff --git a/src/library/colorizer/ut/colorizer_ut.cpp b/src/library/colorizer/ut/colorizer_ut.cpp
index 96d62aab88..dd60102b37 100644
--- a/src/library/colorizer/ut/colorizer_ut.cpp
+++ b/src/library/colorizer/ut/colorizer_ut.cpp
@@ -1,9 +1,9 @@
 #include <src/library/colorizer/colors.h>
 
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 Y_UNIT_TEST_SUITE(ColorizerTest) {
     Y_UNIT_TEST(BasicTest) {
diff --git a/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h b/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h
index 7a5d2ba9cf..8cbd6d48a1 100644
--- a/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h
+++ b/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <type_traits>
 #include <map>
diff --git a/src/library/containers/intrusive_rb_tree/rb_tree.h b/src/library/containers/intrusive_rb_tree/rb_tree.h
index 95219b1bea..e58240a609 100644
--- a/src/library/containers/intrusive_rb_tree/rb_tree.h
+++ b/src/library/containers/intrusive_rb_tree/rb_tree.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 using TRbTreeColorType = bool;
 
diff --git a/src/library/containers/paged_vector/paged_vector.h b/src/library/containers/paged_vector/paged_vector.h
index e0e8c2e205..85a73c0ed2 100644
--- a/src/library/containers/paged_vector/paged_vector.h
+++ b/src/library/containers/paged_vector/paged_vector.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/memory/alloc.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <iterator>
 #include <vector>
diff --git a/src/library/coroutine/engine/cont_poller.h b/src/library/coroutine/engine/cont_poller.h
index a4b9fb49e4..93e624ef89 100644
--- a/src/library/coroutine/engine/cont_poller.h
+++ b/src/library/coroutine/engine/cont_poller.h
@@ -8,7 +8,7 @@
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <src/util/memory/pool.h>
 #include <src/util/memory/smallobj.h>
-#include <src/util/network/init.h>
+#include <ydb-cpp-sdk/util/network/init.h>
 
 #include <cerrno>
 
diff --git a/src/library/coroutine/engine/coroutine_ut.cpp b/src/library/coroutine/engine/coroutine_ut.cpp
index f617dc2ef8..c103e43b65 100644
--- a/src/library/coroutine/engine/coroutine_ut.cpp
+++ b/src/library/coroutine/engine/coroutine_ut.cpp
@@ -5,12 +5,12 @@
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/system/pipe.h>
 #include <src/util/system/env.h>
 #include <src/util/system/info.h>
 #include <src/util/system/thread.h>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 #include <src/util/generic/serialized_enum.h>
 
 #include <iostream>
diff --git a/src/library/coroutine/engine/impl.cpp b/src/library/coroutine/engine/impl.cpp
index 9944763f79..eb285afd95 100644
--- a/src/library/coroutine/engine/impl.cpp
+++ b/src/library/coroutine/engine/impl.cpp
@@ -6,8 +6,8 @@
 #include <src/util/generic/scope.h>
 #include <src/util/thread/singleton.h>
 #include <src/util/stream/format.h>
-#include <src/util/stream/output.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 TCont::TJoinWait::TJoinWait(TCont& c) noexcept
     : Cont_(c)
diff --git a/src/library/coroutine/engine/impl.h b/src/library/coroutine/engine/impl.h
index a6bc6ca6f2..fd041b29e9 100644
--- a/src/library/coroutine/engine/impl.h
+++ b/src/library/coroutine/engine/impl.h
@@ -10,11 +10,11 @@
 
 #include <src/library/containers/intrusive_rb_tree/rb_tree.h>
 
-#include <src/util/system/error.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/intrlist.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/function.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
 
 #include <optional>
 
diff --git a/src/library/coroutine/engine/iostatus.h b/src/library/coroutine/engine/iostatus.h
index d57efad13d..401c2571d6 100644
--- a/src/library/coroutine/engine/iostatus.h
+++ b/src/library/coroutine/engine/iostatus.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 class TIOStatus {
 public:
diff --git a/src/library/coroutine/engine/network.cpp b/src/library/coroutine/engine/network.cpp
index 627c3196af..b249afeafa 100644
--- a/src/library/coroutine/engine/network.cpp
+++ b/src/library/coroutine/engine/network.cpp
@@ -2,7 +2,7 @@
 #include "network.h"
 
 #include <src/util/generic/scope.h>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 
 #include <sys/uio.h>
 
diff --git a/src/library/coroutine/engine/network.h b/src/library/coroutine/engine/network.h
index e2441d188e..8529e0c4e8 100644
--- a/src/library/coroutine/engine/network.h
+++ b/src/library/coroutine/engine/network.h
@@ -3,10 +3,10 @@
 #include "iostatus.h"
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/network/init.h>
+#include <ydb-cpp-sdk/util/network/init.h>
 #include <src/util/network/iovec.h>
 #include <src/util/network/nonblock.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 
 class TCont;
 
diff --git a/src/library/coroutine/engine/poller.cpp b/src/library/coroutine/engine/poller.cpp
index 310121d7f6..1dfd3eb693 100644
--- a/src/library/coroutine/engine/poller.cpp
+++ b/src/library/coroutine/engine/poller.cpp
@@ -3,8 +3,8 @@
 
 #include <src/util/memory/smallobj.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace {
     using TChange = IPollerFace::TChange;
diff --git a/src/library/coroutine/engine/poller.h b/src/library/coroutine/engine/poller.h
index 52ada77647..afd89e81e8 100644
--- a/src/library/coroutine/engine/poller.h
+++ b/src/library/coroutine/engine/poller.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/network/pollerimpl.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
diff --git a/src/library/coroutine/engine/sockpool.h b/src/library/coroutine/engine/sockpool.h
index 009563edff..022877ecd0 100644
--- a/src/library/coroutine/engine/sockpool.h
+++ b/src/library/coroutine/engine/sockpool.h
@@ -3,8 +3,8 @@
 #include "impl.h"
 #include "network.h"
 
-#include <src/util/network/address.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 
 #include <mutex>
 
diff --git a/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp b/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp
index d7a9a97f66..a92f073703 100644
--- a/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp
+++ b/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp
@@ -1,7 +1,7 @@
 #include <benchmark/benchmark.h>
 
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <src/library/coroutine/engine/stack/stack_allocator.h>
 #include <src/library/coroutine/engine/stack/stack_guards.h>
diff --git a/src/library/coroutine/engine/stack/stack.h b/src/library/coroutine/engine/stack/stack.h
index 8fe61c93cc..ae854e0833 100644
--- a/src/library/coroutine/engine/stack/stack.h
+++ b/src/library/coroutine/engine/stack/stack.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <span>
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <cstdint>
 
diff --git a/src/library/coroutine/engine/stack/stack_allocator.h b/src/library/coroutine/engine/stack/stack_allocator.h
index c6c1beeb81..519a13218a 100644
--- a/src/library/coroutine/engine/stack/stack_allocator.h
+++ b/src/library/coroutine/engine/stack/stack_allocator.h
@@ -3,8 +3,8 @@
 #include "stack.h"
 #include "stack_common.h"
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <span>
 #include <cstdint>
diff --git a/src/library/coroutine/engine/stack/stack_guards.h b/src/library/coroutine/engine/stack/stack_guards.h
index a71f8b9066..eca295b7a4 100644
--- a/src/library/coroutine/engine/stack/stack_guards.h
+++ b/src/library/coroutine/engine/stack/stack_guards.h
@@ -2,7 +2,7 @@
 
 #include "stack_common.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <string_view>
 #include <span>
 #include <src/util/system/protect.h>
diff --git a/src/library/coroutine/engine/stack/stack_pool.h b/src/library/coroutine/engine/stack/stack_pool.h
index f07f7009f7..4680f4b648 100644
--- a/src/library/coroutine/engine/stack/stack_pool.h
+++ b/src/library/coroutine/engine/stack/stack_pool.h
@@ -3,8 +3,8 @@
 #include "stack.h"
 #include "stack_common.h"
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 
 
diff --git a/src/library/coroutine/engine/stack/stack_utils.cpp b/src/library/coroutine/engine/stack/stack_utils.cpp
index cbe49994b7..e5f4516326 100644
--- a/src/library/coroutine/engine/stack/stack_utils.cpp
+++ b/src/library/coroutine/engine/stack/stack_utils.cpp
@@ -1,7 +1,7 @@
 #include "stack_utils.h"
 
 #include <src/util/generic/scope.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #ifdef _linux_
 #include <sys/mman.h>
diff --git a/src/library/coroutine/engine/trampoline.cpp b/src/library/coroutine/engine/trampoline.cpp
index 196ccc0a17..70708ef2f0 100644
--- a/src/library/coroutine/engine/trampoline.cpp
+++ b/src/library/coroutine/engine/trampoline.cpp
@@ -6,7 +6,7 @@
 #include <src/util/system/info.h>
 #include <src/util/system/protect.h>
 #include <src/util/system/valgrind.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cstdlib>
 #include <src/util/stream/format.h>
diff --git a/src/library/coroutine/engine/trampoline.h b/src/library/coroutine/engine/trampoline.h
index a5905e8ae0..08c2e51f25 100644
--- a/src/library/coroutine/engine/trampoline.h
+++ b/src/library/coroutine/engine/trampoline.h
@@ -3,8 +3,8 @@
 #include "stack/stack_common.h"
 #include "stack/stack.h"
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/system/context.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
diff --git a/src/library/coroutine/listener/listen.cpp b/src/library/coroutine/listener/listen.cpp
index b3a420292e..dc7dadf0ea 100644
--- a/src/library/coroutine/listener/listen.cpp
+++ b/src/library/coroutine/listener/listen.cpp
@@ -3,8 +3,8 @@
 #include <src/library/coroutine/engine/impl.h>
 #include <src/library/coroutine/engine/network.h>
 
-#include <src/util/network/ip.h>
-#include <src/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/address.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 #include <src/util/generic/intrlist.h>
 
diff --git a/src/library/cppparser/parser.cpp b/src/library/cppparser/parser.cpp
index 34e6c2eeb4..e53c976cda 100644
--- a/src/library/cppparser/parser.cpp
+++ b/src/library/cppparser/parser.cpp
@@ -1,6 +1,6 @@
 #include <src/util/generic/hash.h>
-#include <src/util/string/cast.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <unordered_set>
 
 #include "parser.h"
diff --git a/src/library/cppparser/parser.h b/src/library/cppparser/parser.h
index 6d283d2c08..bd96be8702 100644
--- a/src/library/cppparser/parser.h
+++ b/src/library/cppparser/parser.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <string>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 class TCppSaxParser: public IOutputStream {
 public:
diff --git a/src/library/cpuid_check/cpu_id_check.cpp b/src/library/cpuid_check/cpu_id_check.cpp
index 148ab46847..29ebef2ce4 100644
--- a/src/library/cpuid_check/cpu_id_check.cpp
+++ b/src/library/cpuid_check/cpu_id_check.cpp
@@ -1,4 +1,4 @@
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <src/util/system/cpu_id.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
diff --git a/src/library/dbg_output/dump.h b/src/library/dbg_output/dump.h
index 573d54427d..37e9c6db7d 100644
--- a/src/library/dbg_output/dump.h
+++ b/src/library/dbg_output/dump.h
@@ -6,7 +6,7 @@
 #include "colorscheme.h"
 
 #include <src/util/stream/format.h>
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 #include <utility>
 #include <unordered_set>
 
diff --git a/src/library/dbg_output/dumpers.h b/src/library/dbg_output/dumpers.h
index 746d57a6a4..660926fde5 100644
--- a/src/library/dbg_output/dumpers.h
+++ b/src/library/dbg_output/dumpers.h
@@ -2,7 +2,7 @@
 
 #include "engine.h"
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <list>
 #include <map>
diff --git a/src/library/dbg_output/engine.cpp b/src/library/dbg_output/engine.cpp
index ad6ada654b..f5e48f05a0 100644
--- a/src/library/dbg_output/engine.cpp
+++ b/src/library/dbg_output/engine.cpp
@@ -1,7 +1,7 @@
 #include "engine.h"
 
-#include <src/util/string/cast.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #if !defined(DBGDUMP_INLINE_IF_INCLUDED)
 #define DBGDUMP_INLINE_IF_INCLUDED
diff --git a/src/library/dbg_output/engine.h b/src/library/dbg_output/engine.h
index 936faa80d5..e87781fcd9 100644
--- a/src/library/dbg_output/engine.h
+++ b/src/library/dbg_output/engine.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <string>
 #include <utility>
diff --git a/src/library/dbg_output/ut/dbg_output_ut.cpp b/src/library/dbg_output/ut/dbg_output_ut.cpp
index 3cdb48aba6..628d29164f 100644
--- a/src/library/dbg_output/ut/dbg_output_ut.cpp
+++ b/src/library/dbg_output/ut/dbg_output_ut.cpp
@@ -1,9 +1,9 @@
 #include <src/library/dbg_output/dump.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
-#include <src/util/string/builder.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <src/util/generic/map.h>
 
 namespace {
diff --git a/src/library/diff/diff.h b/src/library/diff/diff.h
index 2a154ba9f4..8b15824b56 100644
--- a/src/library/diff/diff.h
+++ b/src/library/diff/diff.h
@@ -2,12 +2,12 @@
 
 #include <src/library/lcs/lcs_via_lis.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 #include <string_view>
 #include <span>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/string/split.h>
 
 namespace NDiff {
diff --git a/src/library/digest/argonish/argon2.h b/src/library/digest/argonish/argon2.h
index d34d27140f..1421682c7a 100644
--- a/src/library/digest/argonish/argon2.h
+++ b/src/library/digest/argonish/argon2.h
@@ -2,7 +2,7 @@
 
 #include "common.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 namespace NArgonish {
diff --git a/src/library/digest/argonish/blake2b.h b/src/library/digest/argonish/blake2b.h
index dcb0464a6b..2dd404c0bc 100644
--- a/src/library/digest/argonish/blake2b.h
+++ b/src/library/digest/argonish/blake2b.h
@@ -2,7 +2,7 @@
 
 #include "common.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NArgonish {
     /**
diff --git a/src/library/digest/argonish/factory/factory.cpp b/src/library/digest/argonish/factory/factory.cpp
index dee5c6c7d1..98aff805b5 100644
--- a/src/library/digest/argonish/factory/factory.cpp
+++ b/src/library/digest/argonish/factory/factory.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #include <src/util/system/cpu_id.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NArgonish {
     static EInstructionSet GetBestSet() {
diff --git a/src/library/digest/argonish/internal/argon2/argon2_base.h b/src/library/digest/argonish/internal/argon2/argon2_base.h
index 79b42260b4..961ed13bfe 100644
--- a/src/library/digest/argonish/internal/argon2/argon2_base.h
+++ b/src/library/digest/argonish/internal/argon2/argon2_base.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/internal/blake2b/blake2b.h>
 #include <src/library/threading/poor_man_openmp/thread_helper.h>
diff --git a/src/library/digest/argonish/internal/blake2b/blake2b.h b/src/library/digest/argonish/internal/blake2b/blake2b.h
index 613fe40d64..60ef8a6112 100644
--- a/src/library/digest/argonish/internal/blake2b/blake2b.h
+++ b/src/library/digest/argonish/internal/blake2b/blake2b.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <src/library/digest/argonish/blake2b.h>
 
diff --git a/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h
index b181dc7776..acba78a803 100644
--- a/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h
+++ b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/blake2b.h>
 #include <src/library/digest/argonish/internal/proxies/macro/proxy_macros.h>
diff --git a/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h
index c52fba79ba..1a4dca2117 100644
--- a/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h
+++ b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/blake2b.h>
 #include <src/library/digest/argonish/internal/proxies/macro/proxy_macros.h>
diff --git a/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h
index 2b0c9f16da..a9894d48b0 100644
--- a/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h
+++ b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/blake2b.h>
 #include <src/library/digest/argonish/internal/proxies/macro/proxy_macros.h>
diff --git a/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h
index 96100e3ad2..adfef39fa7 100644
--- a/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h
+++ b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/blake2b.h>
 #include <src/library/digest/argonish/internal/proxies/macro/proxy_macros.h>
diff --git a/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h
index 18d5ad69f7..b7f13ab8ea 100644
--- a/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h
+++ b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/library/digest/argonish/argon2.h>
 #include <src/library/digest/argonish/blake2b.h>
 #include <src/library/digest/argonish/internal/proxies/macro/proxy_macros.h>
diff --git a/src/library/digest/lower_case/hash_ops.cpp b/src/library/digest/lower_case/hash_ops.cpp
index ed96cd81be..f96f580131 100644
--- a/src/library/digest/lower_case/hash_ops.cpp
+++ b/src/library/digest/lower_case/hash_ops.cpp
@@ -2,7 +2,7 @@
 #include "lciter.h"
 #include "hash_ops.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 size_t TCIOps::operator()(const std::string_view& s) const noexcept {
     return FnvCaseLess(s, (size_t)0xBEE);
diff --git a/src/library/digest/lower_case/lciter.h b/src/library/digest/lower_case/lciter.h
index 1a00963e9f..0b95453ec2 100644
--- a/src/library/digest/lower_case/lciter.h
+++ b/src/library/digest/lower_case/lciter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 #include <iterator>
 
diff --git a/src/library/digest/md5/md5.cpp b/src/library/digest/md5/md5.cpp
index b2fc87533d..c51887f108 100644
--- a/src/library/digest/md5/md5.cpp
+++ b/src/library/digest/md5/md5.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/string_utils/base64/base64.h>
 
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 #include <src/util/stream/file.h>
 #include <src/util/string/hex.h>
 
diff --git a/src/library/digest/murmur/murmur.h b/src/library/digest/murmur/murmur.h
index 29d1c1afad..bd0cba5666 100644
--- a/src/library/digest/murmur/murmur.h
+++ b/src/library/digest/murmur/murmur.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 
 /*
  * https://sites.google.com/site/murmurhash/
diff --git a/src/library/getopt/small/completer.cpp b/src/library/getopt/small/completer.cpp
index b49211df0e..f17b7c14ef 100644
--- a/src/library/getopt/small/completer.cpp
+++ b/src/library/getopt/small/completer.cpp
@@ -2,7 +2,7 @@
 
 #include "completion_generator.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
 using NLastGetopt::NEscaping::Q;
diff --git a/src/library/getopt/small/completer.h b/src/library/getopt/small/completer.h
index 5423f03bbf..16c0731441 100644
--- a/src/library/getopt/small/completer.h
+++ b/src/library/getopt/small/completer.h
@@ -2,7 +2,7 @@
 
 #include "formatted_output.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NLastGetopt::NComp {
     class ICompleter;
diff --git a/src/library/getopt/small/formatted_output.cpp b/src/library/getopt/small/formatted_output.cpp
index ec1912e351..fa8c1a865b 100644
--- a/src/library/getopt/small/formatted_output.cpp
+++ b/src/library/getopt/small/formatted_output.cpp
@@ -1,7 +1,7 @@
 #include "formatted_output.h"
 
-#include <src/util/memory/tempbuf.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 #include <iostream>
 
diff --git a/src/library/getopt/small/formatted_output.h b/src/library/getopt/small/formatted_output.h
index 5e367c6d80..d437e570ca 100644
--- a/src/library/getopt/small/formatted_output.h
+++ b/src/library/getopt/small/formatted_output.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <vector>
 
diff --git a/src/library/getopt/small/last_getopt.h b/src/library/getopt/small/last_getopt.h
index 0b8e23a094..506f07da6f 100644
--- a/src/library/getopt/small/last_getopt.h
+++ b/src/library/getopt/small/last_getopt.h
@@ -4,8 +4,8 @@
 #include "last_getopt_easy_setup.h"
 #include "last_getopt_parse_result.h"
 
-#include <src/util/generic/function.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <src/util/string/split.h>
 
 /// see some documentation in
diff --git a/src/library/getopt/small/last_getopt_opt.h b/src/library/getopt/small/last_getopt_opt.h
index 57c8c5ddce..848eccb2ed 100644
--- a/src/library/getopt/small/last_getopt_opt.h
+++ b/src/library/getopt/small/last_getopt_opt.h
@@ -5,7 +5,7 @@
 
 #include <src/util/generic/mapfindptr.h>
 #include <src/util/string/join.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 #include <optional>
 #include <unordered_set>
diff --git a/src/library/getopt/small/last_getopt_opts.cpp b/src/library/getopt/small/last_getopt_opts.cpp
index 05efa48967..cb21f67baa 100644
--- a/src/library/getopt/small/last_getopt_opts.cpp
+++ b/src/library/getopt/small/last_getopt_opts.cpp
@@ -6,7 +6,7 @@
 #include <src/library/colorizer/colors.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/stream/format.h>
 
 #include <sstream>
diff --git a/src/library/getopt/small/last_getopt_parser.cpp b/src/library/getopt/small/last_getopt_parser.cpp
index 4cec3f119e..6626d853c0 100644
--- a/src/library/getopt/small/last_getopt_parser.cpp
+++ b/src/library/getopt/small/last_getopt_parser.cpp
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 #include <src/library/colorizer/colors.h>
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 namespace NLastGetopt {
     void TOptsParser::Init(const TOpts* opts, int argc, const char* argv[]) {
diff --git a/src/library/getopt/small/last_getopt_support.h b/src/library/getopt/small/last_getopt_support.h
index 342b8bb798..a95f32bbfe 100644
--- a/src/library/getopt/small/last_getopt_support.h
+++ b/src/library/getopt/small/last_getopt_support.h
@@ -2,11 +2,11 @@
 
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <string>
 
diff --git a/src/library/getopt/small/modchooser.cpp b/src/library/getopt/small/modchooser.cpp
index 5108696d22..190ea29ba1 100644
--- a/src/library/getopt/small/modchooser.cpp
+++ b/src/library/getopt/small/modchooser.cpp
@@ -6,7 +6,7 @@
 #include <src/library/colorizer/colors.h>
 
 #include <src/util/folder/path.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 class PtrWrapper: public TMainClass {
 public:
diff --git a/src/library/getopt/small/opt.cpp b/src/library/getopt/small/opt.cpp
index 8964de9d0e..698d4c4835 100644
--- a/src/library/getopt/small/opt.cpp
+++ b/src/library/getopt/small/opt.cpp
@@ -1,6 +1,6 @@
 #include "opt.h"
 
-#include <src/util/system/progname.h>
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 #include <ctype.h>
 
diff --git a/src/library/getopt/small/opt.h b/src/library/getopt/small/opt.h
index 346e6c5f44..dc91cb9f75 100644
--- a/src/library/getopt/small/opt.h
+++ b/src/library/getopt/small/opt.h
@@ -2,8 +2,8 @@
 
 #include "last_getopt.h"
 
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 // implementation of Opt class using last getopt
 
diff --git a/src/library/getopt/small/wrap.cpp b/src/library/getopt/small/wrap.cpp
index ed3a316cdc..e6c0f88407 100644
--- a/src/library/getopt/small/wrap.cpp
+++ b/src/library/getopt/small/wrap.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/colorizer/colors.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <src/util/charset/utf8.h>
 
 namespace NLastGetopt {
diff --git a/src/library/getopt/small/ygetopt.h b/src/library/getopt/small/ygetopt.h
index 43b4957f9c..c9122abf1d 100644
--- a/src/library/getopt/small/ygetopt.h
+++ b/src/library/getopt/small/ygetopt.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TGetOpt {
 public:
diff --git a/src/library/getopt/ut/last_getopt_ut.cpp b/src/library/getopt/ut/last_getopt_ut.cpp
index 78ca506655..b14178298f 100644
--- a/src/library/getopt/ut/last_getopt_ut.cpp
+++ b/src/library/getopt/ut/last_getopt_ut.cpp
@@ -4,7 +4,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <ydb-cpp-sdk/util/generic/array_size.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <src/util/string/vector.h>
 #include <src/util/string/split.h>
 
diff --git a/src/library/getopt/ut/modchooser_ut.cpp b/src/library/getopt/ut/modchooser_ut.cpp
index 6045a9a47b..3dca4529cf 100644
--- a/src/library/getopt/ut/modchooser_ut.cpp
+++ b/src/library/getopt/ut/modchooser_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 void ValidateArgcArgv(int argc, const char** argv) {
     UNIT_ASSERT_EQUAL(argc, 1);
diff --git a/src/library/grpc/client/grpc_client_low.cpp b/src/library/grpc/client/grpc_client_low.cpp
index d0e8de8b44..19fadfccee 100644
--- a/src/library/grpc/client/grpc_client_low.cpp
+++ b/src/library/grpc/client/grpc_client_low.cpp
@@ -4,7 +4,7 @@
 #include <ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h>
 
 #include <src/util/system/thread.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #if !defined(_WIN32) && !defined(_WIN64)
 #include <sys/types.h>
diff --git a/src/library/http/fetch/http_digest.cpp b/src/library/http/fetch/http_digest.cpp
index 1e49170105..f167d2bce3 100644
--- a/src/library/http/fetch/http_digest.cpp
+++ b/src/library/http/fetch/http_digest.cpp
@@ -1,8 +1,8 @@
 #include "http_digest.h"
 
 #include <src/library/digest/md5/md5.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 /************************************************************/
 /************************************************************/
diff --git a/src/library/http/fetch/http_digest.h b/src/library/http/fetch/http_digest.h
index 4393d837ab..38c536c74c 100644
--- a/src/library/http/fetch/http_digest.h
+++ b/src/library/http/fetch/http_digest.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/http/fetch/httpheader.h>
 
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <ydb-cpp-sdk/library/http/misc/httpcodes.h>
 
 class httpDigestHandler {
diff --git a/src/library/http/fetch/http_socket.cpp b/src/library/http/fetch/http_socket.cpp
index 2218655179..e5e6bcc196 100644
--- a/src/library/http/fetch/http_socket.cpp
+++ b/src/library/http/fetch/http_socket.cpp
@@ -7,8 +7,8 @@
 
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>
-#include <src/util/network/init.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/init.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 
 #include <mutex>
 
diff --git a/src/library/http/fetch/httpagent.h b/src/library/http/fetch/httpagent.h
index 59baa083a1..c4f0b44ef4 100644
--- a/src/library/http/fetch/httpagent.h
+++ b/src/library/http/fetch/httpagent.h
@@ -6,11 +6,11 @@
 
 #include <src/library/uri/http_url.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/network/hostip.h>
-#include <src/util/network/ip.h>
-#include <src/util/network/sock.h>
+#include <ydb-cpp-sdk/util/network/hostip.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/sock.h>
 #include <src/util/generic/scope.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <ydb-cpp-sdk/library/http/fetch/exthttpcodes.h>
 #include "sockhandler.h"
diff --git a/src/library/http/fetch/httpfsm.h b/src/library/http/fetch/httpfsm.h
index 081ee309b3..95dd718393 100644
--- a/src/library/http/fetch/httpfsm.h
+++ b/src/library/http/fetch/httpfsm.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/http/fetch/httpheader.h>
 
-#include <src/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
 #include <src/util/datetime/parser.h>
 
 #include <time.h>
diff --git a/src/library/http/fetch/httpfsm_ut.cpp b/src/library/http/fetch/httpfsm_ut.cpp
index 17f07d415b..adac26edef 100644
--- a/src/library/http/fetch/httpfsm_ut.cpp
+++ b/src/library/http/fetch/httpfsm_ut.cpp
@@ -2,7 +2,7 @@
 #include "library-htfetch_ut_hreflang_in.h"
 #include "library-htfetch_ut_hreflang_out.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/library/charset/doccodes.h>
 #include <src/library/testing/unittest/registar.h>
 
diff --git a/src/library/http/fetch/httpload.h b/src/library/http/fetch/httpload.h
index d8f8bd5a64..9a6635942e 100644
--- a/src/library/http/fetch/httpload.h
+++ b/src/library/http/fetch/httpload.h
@@ -4,8 +4,8 @@
 #include "httpparser.h"
 #include "http_digest.h"
 
-#include <src/util/system/compat.h>
-#include <src/util/network/ip.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
 #include <src/library/uri/http_url.h>
 #include <ydb-cpp-sdk/library/http/misc/httpcodes.h>
 
diff --git a/src/library/http/fetch/httpparser.h b/src/library/http/fetch/httpparser.h
index 3bf282faea..950353351b 100644
--- a/src/library/http/fetch/httpparser.h
+++ b/src/library/http/fetch/httpparser.h
@@ -4,7 +4,7 @@
 #include <ydb-cpp-sdk/library/http/fetch/httpheader.h>
 
 #include <ydb-cpp-sdk/library/mime/types/mime.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/library/http/misc/httpcodes.h>
 
 template <size_t headermax = 100 << 10, size_t bodymax = 1 << 20>
diff --git a/src/library/http/fetch/httpzreader.h b/src/library/http/fetch/httpzreader.h
index 166dbc83d5..cd17e24b12 100644
--- a/src/library/http/fetch/httpzreader.h
+++ b/src/library/http/fetch/httpzreader.h
@@ -5,7 +5,7 @@
 #include <ydb-cpp-sdk/library/http/fetch/exthttpcodes.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <zlib.h>
 
diff --git a/src/library/http/fetch/sockhandler.h b/src/library/http/fetch/sockhandler.h
index f5ef245ac0..a30da9b929 100644
--- a/src/library/http/fetch/sockhandler.h
+++ b/src/library/http/fetch/sockhandler.h
@@ -4,13 +4,13 @@
 
 #include <src/util/generic/buffer.h>
 
-#include <src/util/network/address.h>
-#include <src/util/network/ip.h>
-#include <src/util/network/socket.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cerrno>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 class TAddrList: public std::vector<NAddr::IRemoteAddrRef> {
 private:
diff --git a/src/library/http/io/benchmark/main.cpp b/src/library/http/io/benchmark/main.cpp
index d9a7f364b8..f2b6e675a0 100644
--- a/src/library/http/io/benchmark/main.cpp
+++ b/src/library/http/io/benchmark/main.cpp
@@ -2,7 +2,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 void FindHeaderFirstMatch(benchmark::State& state) {
     THttpHeaders headers;
diff --git a/src/library/http/io/chunk.h b/src/library/http/io/chunk.h
index c208f01f11..abb180cf89 100644
--- a/src/library/http/io/chunk.h
+++ b/src/library/http/io/chunk.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <optional>
 
diff --git a/src/library/http/io/compression.cpp b/src/library/http/io/compression.cpp
index 2240ef0fa0..098877ac1d 100644
--- a/src/library/http/io/compression.cpp
+++ b/src/library/http/io/compression.cpp
@@ -4,7 +4,7 @@
 #include <src/library/streams/lz/lz.h>
 #endif
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 #include <src/library/streams/brotli/brotli.h>
 #include <src/library/streams/lzma/lzma.h>
diff --git a/src/library/http/io/fuzz/main.cpp b/src/library/http/io/fuzz/main.cpp
index b11dc60707..7d20b777d8 100644
--- a/src/library/http/io/fuzz/main.cpp
+++ b/src/library/http/io/fuzz/main.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/library/http/io/stream.h>
 
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) {
     TMemoryInput mi(data, size);
diff --git a/src/library/http/io/headers.cpp b/src/library/http/io/headers.cpp
index 6bd8f3a892..a637a73d5f 100644
--- a/src/library/http/io/headers.cpp
+++ b/src/library/http/io/headers.cpp
@@ -1,8 +1,8 @@
 #include <ydb-cpp-sdk/library/http/io/stream.h>
 
 #include <src/library/string_utils/stream/stream.h>
-#include <src/util/string/strip.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 static inline std::string_view Trim(const char* b, const char* e) noexcept {
     return StripString(std::string_view(b, e));
diff --git a/src/library/http/io/list_codings/main.cpp b/src/library/http/io/list_codings/main.cpp
index 107773ef1b..9fe7bcf66b 100644
--- a/src/library/http/io/list_codings/main.cpp
+++ b/src/library/http/io/list_codings/main.cpp
@@ -1,5 +1,5 @@
 #include <ydb-cpp-sdk/library/http/io/stream.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 int main() {
     for (auto codec : SupportedCodings()) {
diff --git a/src/library/http/io/stream.cpp b/src/library/http/io/stream.cpp
index 7f851e20f7..036e6e6c79 100644
--- a/src/library/http/io/stream.cpp
+++ b/src/library/http/io/stream.cpp
@@ -12,11 +12,11 @@
 #include <src/util/stream/null.h>
 #include <src/util/stream/tee.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <unordered_set>
 
diff --git a/src/library/http/io/stream_ut.cpp b/src/library/http/io/stream_ut.cpp
index 51e11f22ab..2e298f7783 100644
--- a/src/library/http/io/stream_ut.cpp
+++ b/src/library/http/io/stream_ut.cpp
@@ -6,9 +6,9 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/testing/unittest/tests_data.h>
 
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/stream/file.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/tee.h>
 #include <src/util/stream/zlib.h>
 #include <src/util/stream/null.h>
diff --git a/src/library/http/misc/httpdate.cpp b/src/library/http/misc/httpdate.cpp
index 558a74d271..da49d7a2c5 100644
--- a/src/library/http/misc/httpdate.cpp
+++ b/src/library/http/misc/httpdate.cpp
@@ -35,8 +35,8 @@
 #include <cstring>
 #include <ctime>
 
-#include <src/util/system/compat.h>   /* stricmp */
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/compat.h>   /* stricmp */
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include "httpdate.h"
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
diff --git a/src/library/http/misc/httpreqdata.cpp b/src/library/http/misc/httpreqdata.cpp
index 12f44b3cce..f296e2462d 100644
--- a/src/library/http/misc/httpreqdata.cpp
+++ b/src/library/http/misc/httpreqdata.cpp
@@ -1,10 +1,10 @@
 #include "httpreqdata.h"
 
 #include <src/library/case_insensitive_string/case_insensitive_string.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include <src/util/string/join.h>
 #include <src/util/system/datetime.h>
 
diff --git a/src/library/http/misc/httpreqdata.h b/src/library/http/misc/httpreqdata.h
index 60abf0d955..91b9f774c5 100644
--- a/src/library/http/misc/httpreqdata.h
+++ b/src/library/http/misc/httpreqdata.h
@@ -4,10 +4,10 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <ydb-cpp-sdk/library/cgiparam/cgiparam.h>
-#include <src/util/network/address.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/generic/hash.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 using THttpHeadersContainer = THashMap<std::string, std::string, TCIOps, TCIOps>;
diff --git a/src/library/http/misc/parsed_request.cpp b/src/library/http/misc/parsed_request.cpp
index 6b78050491..1e2a9b111c 100644
--- a/src/library/http/misc/parsed_request.cpp
+++ b/src/library/http/misc/parsed_request.cpp
@@ -2,10 +2,10 @@
 
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/string/escape.h>
-#include <src/util/string/strip.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 static inline std::string_view StripLeft(const std::string_view& s) noexcept {
     const char* b = s.begin();
diff --git a/src/library/http/server/conn.cpp b/src/library/http/server/conn.cpp
index d0fe37d9a9..0a9bf419d4 100644
--- a/src/library/http/server/conn.cpp
+++ b/src/library/http/server/conn.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/http/server/conn.h>
 
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/stream/buffered.h>
 
 class THttpServerConn::TImpl {
diff --git a/src/library/http/server/http.cpp b/src/library/http/server/http.cpp
index fc2d6b4a0f..5577a54642 100644
--- a/src/library/http/server/http.cpp
+++ b/src/library/http/server/http.cpp
@@ -5,17 +5,17 @@
 
 #include <src/util/generic/buffer.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/network/address.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/network/poller.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
-#include <src/util/system/compat.h> // stricmp, strnicmp, strlwr, strupr, stpcpy
+#include <ydb-cpp-sdk/util/system/compat.h> // stricmp, strnicmp, strlwr, strupr, stpcpy
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/system/pipe.h>
 #include <src/util/system/thread.h>
-#include <src/util/thread/factory.h>
+#include <ydb-cpp-sdk/util/thread/factory.h>
 
 #include <cerrno>
 #include <cstring>
diff --git a/src/library/http/server/http_ex.cpp b/src/library/http/server/http_ex.cpp
index ce9825b253..91d3531e02 100644
--- a/src/library/http/server/http_ex.cpp
+++ b/src/library/http/server/http_ex.cpp
@@ -1,7 +1,7 @@
 #include "http_ex.h"
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/stream/null.h>
 
 bool THttpClientRequestExtension::Parse(char* req, TBaseServerRequestData& rd) {
diff --git a/src/library/http/server/http_ut.cpp b/src/library/http/server/http_ut.cpp
index cf09d3e490..7366e8d155 100644
--- a/src/library/http/server/http_ut.cpp
+++ b/src/library/http/server/http_ut.cpp
@@ -4,11 +4,11 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/testing/unittest/tests_data.h>
 
-#include <src/util/generic/cast.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/zlib.h>
 #include <src/util/system/datetime.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <mutex>
 
diff --git a/src/library/http/server/options.cpp b/src/library/http/server/options.cpp
index 3b6d12235a..5c8367a092 100644
--- a/src/library/http/server/options.cpp
+++ b/src/library/http/server/options.cpp
@@ -1,10 +1,10 @@
 #include <ydb-cpp-sdk/library/http/server/options.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/digest/numeric.h>
-#include <src/util/network/ip.h>
-#include <src/util/network/socket.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <unordered_set>
 
 using TAddr = THttpServerOptions::TAddr;
diff --git a/src/library/http/server/response.cpp b/src/library/http/server/response.cpp
index 0d93aa5907..e998b620a1 100644
--- a/src/library/http/server/response.cpp
+++ b/src/library/http/server/response.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/http/server/response.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 THttpResponse& THttpResponse::AddMultipleHeaders(const THttpHeaders& headers) {
     for (THttpHeaders::TConstIterator i = headers.Begin(); i != headers.End(); ++i) {
diff --git a/src/library/http/server/response_ut.cpp b/src/library/http/server/response_ut.cpp
index 8d6f030b59..e897e1d1ae 100644
--- a/src/library/http/server/response_ut.cpp
+++ b/src/library/http/server/response_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 Y_UNIT_TEST_SUITE(TestHttpResponse) {
     Y_UNIT_TEST(TestCodeOnly) {
diff --git a/src/library/http/simple/http_client.h b/src/library/http/simple/http_client.h
index cf3a33ff21..6e0b4057c5 100644
--- a/src/library/http/simple/http_client.h
+++ b/src/library/http/simple/http_client.h
@@ -4,8 +4,8 @@
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 
 #include <ydb-cpp-sdk/library/http/io/stream.h>
 #include <ydb-cpp-sdk/library/http/misc/httpcodes.h>
diff --git a/src/library/http/simple/ut/http_ut.cpp b/src/library/http/simple/ut/http_ut.cpp
index 7df47f3381..bec65ea192 100644
--- a/src/library/http/simple/ut/http_ut.cpp
+++ b/src/library/http/simple/ut/http_ut.cpp
@@ -6,7 +6,7 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/testing/unittest/tests_data.h>
 
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/system/thread.h>
 
 #include <thread>
diff --git a/src/library/iterator/cartesian_product.h b/src/library/iterator/cartesian_product.h
index 2ea524f8d4..6e1315f3f6 100644
--- a/src/library/iterator/cartesian_product.h
+++ b/src/library/iterator/cartesian_product.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <tuple>
 
diff --git a/src/library/iterator/concatenate.h b/src/library/iterator/concatenate.h
index bfdc645b3c..701eac5074 100644
--- a/src/library/iterator/concatenate.h
+++ b/src/library/iterator/concatenate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <iterator>
 #include <tuple>
diff --git a/src/library/iterator/enumerate.h b/src/library/iterator/enumerate.h
index 9efee9fabd..109f150e13 100644
--- a/src/library/iterator/enumerate.h
+++ b/src/library/iterator/enumerate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <limits>
 #include <tuple>
diff --git a/src/library/iterator/filtering.h b/src/library/iterator/filtering.h
index 325bb0bb51..4ef3e3d764 100644
--- a/src/library/iterator/filtering.h
+++ b/src/library/iterator/filtering.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/iterator_range.h>
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 #include <iterator>
 
 
diff --git a/src/library/iterator/functools.h b/src/library/iterator/functools.h
index 5d62cdbf40..bf43db4cd1 100644
--- a/src/library/iterator/functools.h
+++ b/src/library/iterator/functools.h
@@ -8,7 +8,7 @@
 #include "zip.h"
 
 #include <src/util/generic/adaptor.h>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 
 #include <tuple>
 #include <algorithm>
diff --git a/src/library/iterator/ut/functools_ut.cpp b/src/library/iterator/ut/functools_ut.cpp
index e73822d025..a95a1787f4 100644
--- a/src/library/iterator/ut/functools_ut.cpp
+++ b/src/library/iterator/ut/functools_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/gtest/gtest.h>
 
 
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 #include <src/util/generic/adaptor.h>
 
 #include <set>
diff --git a/src/library/iterator/ut/iterate_values_ut.cpp b/src/library/iterator/ut/iterate_values_ut.cpp
index 7c16743c71..ffaa6fbfe9 100644
--- a/src/library/iterator/ut/iterate_values_ut.cpp
+++ b/src/library/iterator/ut/iterate_values_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/gtest/gtest.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 #include <map>
 #include <unordered_map>
diff --git a/src/library/iterator/zip.h b/src/library/iterator/zip.h
index c40a302d2e..32dd0de7e0 100644
--- a/src/library/iterator/zip.h
+++ b/src/library/iterator/zip.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 #include <algorithm>
 #include <tuple>
diff --git a/src/library/json/fast_sax/parser.rl6 b/src/library/json/fast_sax/parser.rl6
index 67ddb3bb07..abb1fbaa36 100644
--- a/src/library/json/fast_sax/parser.rl6
+++ b/src/library/json/fast_sax/parser.rl6
@@ -1,8 +1,8 @@
 #include <src/library/json/fast_sax/unescape.h>
 #include <ydb-cpp-sdk/library/json/fast_sax/parser.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/generic/buffer.h>
 #include <string_view>
 #include <src/util/generic/ymath.h>
diff --git a/src/library/json/fast_sax/unescape.cpp b/src/library/json/fast_sax/unescape.cpp
index 6d2b88ab72..b47900a772 100644
--- a/src/library/json/fast_sax/unescape.cpp
+++ b/src/library/json/fast_sax/unescape.cpp
@@ -1,6 +1,6 @@
 #include "unescape.h"
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 std::string_view UnescapeJsonUnicode(std::string_view data, char* scratch) {
     return std::string_view(scratch, UnescapeC(data.data(), data.size(), scratch));
diff --git a/src/library/json/fuzzy_test/main.cpp b/src/library/json/fuzzy_test/main.cpp
index 01e01e50b0..accd5e66eb 100644
--- a/src/library/json/fuzzy_test/main.cpp
+++ b/src/library/json/fuzzy_test/main.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/library/json/json_reader.h>
 
-#include <src/util/random/random.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) {
     const auto json = std::string((const char*)data, size);
diff --git a/src/library/json/json_prettifier.cpp b/src/library/json/json_prettifier.cpp
index c40ae7929d..798c04fd2a 100644
--- a/src/library/json/json_prettifier.cpp
+++ b/src/library/json/json_prettifier.cpp
@@ -1,8 +1,8 @@
 #include "json_prettifier.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/memory/pool.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <src/util/string/util.h>
 
 #include <src/library/string_utils/relaxed_escaper/relaxed_escaper.h>
diff --git a/src/library/json/json_reader.cpp b/src/library/json/json_reader.cpp
index 3fd1bfad34..280367ffd0 100644
--- a/src/library/json/json_reader.cpp
+++ b/src/library/json/json_reader.cpp
@@ -6,10 +6,10 @@
 #include <rapidjson/error/error.h>
 #include <rapidjson/reader.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/generic/stack.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NJson {
     namespace {
diff --git a/src/library/json/json_writer.cpp b/src/library/json/json_writer.cpp
index 2d4c533734..4483d8b67c 100644
--- a/src/library/json/json_writer.cpp
+++ b/src/library/json/json_writer.cpp
@@ -1,6 +1,6 @@
 #include "json_writer.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/charset/utf8.h>
 
diff --git a/src/library/json/json_writer.h b/src/library/json/json_writer.h
index 08530dfda2..28ceadd16b 100644
--- a/src/library/json/json_writer.h
+++ b/src/library/json/json_writer.h
@@ -6,7 +6,7 @@
 
 #include <ydb-cpp-sdk/library/json/writer/json.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/generic/hash.h>
 
 #include <string>
diff --git a/src/library/json/rapidjson_helpers.h b/src/library/json/rapidjson_helpers.h
index b4f907fc08..a199f51f0f 100644
--- a/src/library/json/rapidjson_helpers.h
+++ b/src/library/json/rapidjson_helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/stream/input.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <string_view>
 
diff --git a/src/library/json/ut/json_reader_fast_ut.cpp b/src/library/json/ut/json_reader_fast_ut.cpp
index 7c8d3ba0cd..6837d7c72b 100644
--- a/src/library/json/ut/json_reader_fast_ut.cpp
+++ b/src/library/json/ut/json_reader_fast_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/library/string_utils/relaxed_escaper/relaxed_escaper.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <iostream>
 
diff --git a/src/library/json/ut/json_reader_ut.cpp b/src/library/json/ut/json_reader_ut.cpp
index 24a4c3321a..22533b8009 100644
--- a/src/library/json/ut/json_reader_ut.cpp
+++ b/src/library/json/ut/json_reader_ut.cpp
@@ -2,7 +2,7 @@
 #include <src/library/json/json_writer.h>
 
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 using namespace NJson;
 
diff --git a/src/library/json/ut/json_saveload_ut.cpp b/src/library/json/ut/json_saveload_ut.cpp
index 385c9e21f5..843d11fbe8 100644
--- a/src/library/json/ut/json_saveload_ut.cpp
+++ b/src/library/json/ut/json_saveload_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/util/stream/buffer.h>
 #include <src/util/generic/buffer.h>
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 Y_UNIT_TEST_SUITE(JsonSaveLoad) {
     Y_UNIT_TEST(Serialize) {
diff --git a/src/library/json/ut/json_writer_ut.cpp b/src/library/json/ut/json_writer_ut.cpp
index f895205073..c34b352997 100644
--- a/src/library/json/ut/json_writer_ut.cpp
+++ b/src/library/json/ut/json_writer_ut.cpp
@@ -1,7 +1,7 @@
 #include <src/library/json/json_writer.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 using namespace NJson;
 
diff --git a/src/library/json/writer/json.cpp b/src/library/json/writer/json.cpp
index 141ec969ab..54fc075100 100644
--- a/src/library/json/writer/json.cpp
+++ b/src/library/json/writer/json.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/json/writer/json.h>
 
 #include <ydb-cpp-sdk/library/json/json_value.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/strspn.h>
 #include <src/util/generic/ymath.h>
 
diff --git a/src/library/json/writer/json_value.cpp b/src/library/json/writer/json_value.cpp
index b8e9f1fd73..db7505ccf7 100644
--- a/src/library/json/writer/json_value.cpp
+++ b/src/library/json/writer/json_value.cpp
@@ -1,20 +1,20 @@
 #include <ydb-cpp-sdk/library/json/writer/json_value.h>
 #include <ydb-cpp-sdk/library/json/writer/json.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
 #include <src/util/generic/ymath.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/stream/output.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/type.h>
 #include <src/util/string/vector.h>
-#include <src/util/system/yassert.h>
-#include <src/util/ysaveload.h>
-#include <src/util/generic/bt_exception.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
 
 static bool
 AreJsonMapsEqual(const NJson::TJsonValue& lhs, const NJson::TJsonValue& rhs) {
diff --git a/src/library/json/writer/json_value_ut.cpp b/src/library/json/writer/json_value_ut.cpp
index b9c8a94ecd..c3425a823f 100644
--- a/src/library/json/writer/json_value_ut.cpp
+++ b/src/library/json/writer/json_value_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 using namespace NJson;
 
diff --git a/src/library/jwt/jwt.cpp b/src/library/jwt/jwt.cpp
index fd0a9b13fe..c30b44024e 100644
--- a/src/library/jwt/jwt.cpp
+++ b/src/library/jwt/jwt.cpp
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/library/jwt/jwt.h>
 
 #include <ydb-cpp-sdk/library/json/json_reader.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/src/library/lcs/lcs_via_lis.h b/src/library/lcs/lcs_via_lis.h
index e1f8708299..7452048d7c 100644
--- a/src/library/lcs/lcs_via_lis.h
+++ b/src/library/lcs/lcs_via_lis.h
@@ -2,10 +2,10 @@
 
 #include <src/library/containers/paged_vector/paged_vector.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/hash.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/memory/pool.h>
 
 namespace NLCS {
diff --git a/src/library/lcs/lcs_via_lis_ut.cpp b/src/library/lcs/lcs_via_lis_ut.cpp
index 858bdc1833..d7c066d370 100644
--- a/src/library/lcs/lcs_via_lis_ut.cpp
+++ b/src/library/lcs/lcs_via_lis_ut.cpp
@@ -1,4 +1,4 @@
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/string/util.h>
 #include <src/library/testing/unittest/registar.h>
 #include "lcs_via_lis.h"
diff --git a/src/library/logger/backend.cpp b/src/library/logger/backend.cpp
index 9e89a34089..d33f388d87 100644
--- a/src/library/logger/backend.cpp
+++ b/src/library/logger/backend.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <mutex>
 
diff --git a/src/library/logger/backend_creator.cpp b/src/library/logger/backend_creator.cpp
index 4764b1951c..ce548888d9 100644
--- a/src/library/logger/backend_creator.cpp
+++ b/src/library/logger/backend_creator.cpp
@@ -1,9 +1,9 @@
 #include "backend_creator.h"
 #include "stream.h"
 #include "uninitialized_creator.h"
-#include <src/util/system/yassert.h>
-#include <src/util/stream/debug.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/debug.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <iostream>
 
diff --git a/src/library/logger/backend_creator.h b/src/library/logger/backend_creator.h
index b9f2a1ab11..24cbca855a 100644
--- a/src/library/logger/backend_creator.h
+++ b/src/library/logger/backend_creator.h
@@ -4,8 +4,8 @@
 #include <src/library/object_factory/object_factory.h>
 #include <ydb-cpp-sdk/library/json/json_value.h>
 
-#include <src/util/generic/ptr.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 class ILogBackendCreator {
 public:
diff --git a/src/library/logger/composite.h b/src/library/logger/composite.h
index a9367aaa0f..518a15f5b7 100644
--- a/src/library/logger/composite.h
+++ b/src/library/logger/composite.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/library/logger/backend.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 
 class TCompositeLogBackend: public TLogBackend {
diff --git a/src/library/logger/element_ut.cpp b/src/library/logger/element_ut.cpp
index ec2d457faa..1489f048e3 100644
--- a/src/library/logger/element_ut.cpp
+++ b/src/library/logger/element_ut.cpp
@@ -3,8 +3,8 @@
 #include "stream.h"
 
 #include <string>
-#include <src/util/stream/str.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <utility>
 
 #include <src/library/testing/unittest/registar.h>
diff --git a/src/library/logger/file.cpp b/src/library/logger/file.cpp
index 6222739383..86640416dd 100644
--- a/src/library/logger/file.cpp
+++ b/src/library/logger/file.cpp
@@ -1,8 +1,8 @@
 #include "file.h"
 #include <ydb-cpp-sdk/library/logger/record.h>
 
-#include <src/util/system/file.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
 /*
  * file log
diff --git a/src/library/logger/file.h b/src/library/logger/file.h
index 405dc572b9..a7586cf620 100644
--- a/src/library/logger/file.h
+++ b/src/library/logger/file.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TFileLogBackend: public TLogBackend {
 public:
diff --git a/src/library/logger/filter.h b/src/library/logger/filter.h
index 356de2526f..787956bd67 100644
--- a/src/library/logger/filter.h
+++ b/src/library/logger/filter.h
@@ -4,7 +4,7 @@
 #include <ydb-cpp-sdk/library/logger/record.h>
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TFilteredLogBackend: public TLogBackend {
     THolder<TLogBackend> Backend;
diff --git a/src/library/logger/log.cpp b/src/library/logger/log.cpp
index f599070b39..4d9723316b 100644
--- a/src/library/logger/log.cpp
+++ b/src/library/logger/log.cpp
@@ -5,7 +5,7 @@
 #include "stream.h"
 #include <ydb-cpp-sdk/library/logger/thread.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/generic/scope.h>
 
 #include <iostream>
diff --git a/src/library/logger/log_ut.cpp b/src/library/logger/log_ut.cpp
index 55c6f8f05e..8022320858 100644
--- a/src/library/logger/log_ut.cpp
+++ b/src/library/logger/log_ut.cpp
@@ -3,9 +3,9 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/system/fs.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 #include <src/util/system/yield.h>
-#include <src/util/memory/blob.h>
+#include <ydb-cpp-sdk/util/memory/blob.h>
 #include <src/util/stream/file.h>
 #include <string>
 
diff --git a/src/library/logger/reopen.h b/src/library/logger/reopen.h
index d71ef81912..0294cdae40 100644
--- a/src/library/logger/reopen.h
+++ b/src/library/logger/reopen.h
@@ -3,8 +3,8 @@
 #include <ydb-cpp-sdk/library/logger/log.h>
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 
 #include <atomic>
diff --git a/src/library/logger/rotating_file.cpp b/src/library/logger/rotating_file.cpp
index c389b364ee..87817f0591 100644
--- a/src/library/logger/rotating_file.cpp
+++ b/src/library/logger/rotating_file.cpp
@@ -2,11 +2,11 @@
 #include "file.h"
 #include <ydb-cpp-sdk/library/logger/record.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/util/system/fstat.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 #include <src/util/system/fs.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
 
diff --git a/src/library/logger/rotating_file.h b/src/library/logger/rotating_file.h
index eec889916c..437f16da5c 100644
--- a/src/library/logger/rotating_file.h
+++ b/src/library/logger/rotating_file.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TRotatingFileLogBackend: public TLogBackend {
 public:
diff --git a/src/library/logger/stream.cpp b/src/library/logger/stream.cpp
index 46aec0e16c..1913a867b4 100644
--- a/src/library/logger/stream.cpp
+++ b/src/library/logger/stream.cpp
@@ -1,9 +1,9 @@
 #include "stream.h"
 #include <ydb-cpp-sdk/library/logger/record.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <ostream>
 
diff --git a/src/library/logger/sync_page_cache_file.cpp b/src/library/logger/sync_page_cache_file.cpp
index 6846d22754..43cba8bab3 100644
--- a/src/library/logger/sync_page_cache_file.cpp
+++ b/src/library/logger/sync_page_cache_file.cpp
@@ -2,8 +2,8 @@
 #include <ydb-cpp-sdk/library/logger/record.h>
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/info.h>
 #include <src/util/system/align.h>
 
diff --git a/src/library/logger/sync_page_cache_file.h b/src/library/logger/sync_page_cache_file.h
index 30bfbc57cc..32e756f193 100644
--- a/src/library/logger/sync_page_cache_file.h
+++ b/src/library/logger/sync_page_cache_file.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/logger/backend.h>
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TSyncPageCacheFileLogBackend final: public TLogBackend {
 public:
diff --git a/src/library/logger/system.cpp b/src/library/logger/system.cpp
index fadcd0f61c..309824b32d 100644
--- a/src/library/logger/system.cpp
+++ b/src/library/logger/system.cpp
@@ -1,9 +1,9 @@
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/null.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #if defined(_unix_)
 #include <syslog.h>
diff --git a/src/library/logger/thread.cpp b/src/library/logger/thread.cpp
index 3f434fe671..e060ee3c10 100644
--- a/src/library/logger/thread.cpp
+++ b/src/library/logger/thread.cpp
@@ -1,11 +1,11 @@
 #include <ydb-cpp-sdk/library/logger/thread.h>
 #include <ydb-cpp-sdk/library/logger/record.h>
 
-#include <src/util/thread/pool.h>
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/memory/addstorage.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 class TThreadedLogBackend::TImpl {
     class TRec: public IObjectInQueue, public TAdditionalStorage<TRec>, public TLogRecord {
diff --git a/src/library/logger/uninitialized_creator.cpp b/src/library/logger/uninitialized_creator.cpp
index abbd7c52a2..6a9d77663b 100644
--- a/src/library/logger/uninitialized_creator.cpp
+++ b/src/library/logger/uninitialized_creator.cpp
@@ -3,7 +3,7 @@
 #include "thread_creator.h"
 #include "file_creator.h"
 #include "null_creator.h"
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 THolder<TLogBackend> TLogBackendCreatorUninitialized::DoCreateLogBackend() const {
     return Slave->CreateLogBackend();
diff --git a/src/library/login/login.cpp b/src/library/login/login.cpp
index 0bf2640fb1..a82f5356e8 100644
--- a/src/library/login/login.cpp
+++ b/src/library/login/login.cpp
@@ -1,6 +1,6 @@
 #include <jwt-cpp/jwt.h>
 #include <src/library/digest/argonish/argon2.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/library/string_utils/base64/base64.h>
 #include <ydb-cpp-sdk/library/json/json_value.h>
 #include <ydb-cpp-sdk/library/json/json_reader.h>
@@ -9,9 +9,9 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/string/builder.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/hex.h>
 
 #include <deque>
diff --git a/src/library/monlib/dynamic_counters/contention_ut.cpp b/src/library/monlib/dynamic_counters/contention_ut.cpp
index ca0e2d97fa..de5178063a 100644
--- a/src/library/monlib/dynamic_counters/contention_ut.cpp
+++ b/src/library/monlib/dynamic_counters/contention_ut.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h>
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/system/thread.h>
 
 using namespace NMonitoring;
diff --git a/src/library/monlib/dynamic_counters/counters.cpp b/src/library/monlib/dynamic_counters/counters.cpp
index c755689086..2da780710a 100644
--- a/src/library/monlib/dynamic_counters/counters.cpp
+++ b/src/library/monlib/dynamic_counters/counters.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h>
 
 #include <src/library/monlib/service/pages/templates.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 
 using namespace NMonitoring;
 
diff --git a/src/library/monlib/dynamic_counters/encode.cpp b/src/library/monlib/dynamic_counters/encode.cpp
index 958f113e8d..e2c6a1606c 100644
--- a/src/library/monlib/dynamic_counters/encode.cpp
+++ b/src/library/monlib/dynamic_counters/encode.cpp
@@ -5,7 +5,7 @@
 #include <src/library/monlib/encode/spack/spack_v1.h>
 #include <src/library/monlib/encode/prometheus/prometheus.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 namespace NMonitoring {
     namespace {
diff --git a/src/library/monlib/dynamic_counters/golovan_page.h b/src/library/monlib/dynamic_counters/golovan_page.h
index 179c1373cf..2e0085e665 100644
--- a/src/library/monlib/dynamic_counters/golovan_page.h
+++ b/src/library/monlib/dynamic_counters/golovan_page.h
@@ -4,7 +4,7 @@
 
 #include <ydb-cpp-sdk/library/monlib/service/pages/mon_page.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <functional>
 
diff --git a/src/library/monlib/dynamic_counters/page.h b/src/library/monlib/dynamic_counters/page.h
index 28f8a1bdda..5187a2d1b9 100644
--- a/src/library/monlib/dynamic_counters/page.h
+++ b/src/library/monlib/dynamic_counters/page.h
@@ -4,7 +4,7 @@
 
 #include <src/library/monlib/service/pages/pre_mon_page.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <functional>
 
diff --git a/src/library/monlib/encode/buffered/buffered_encoder_base.cpp b/src/library/monlib/encode/buffered/buffered_encoder_base.cpp
index fcdad1fd69..c4d529bd84 100644
--- a/src/library/monlib/encode/buffered/buffered_encoder_base.cpp
+++ b/src/library/monlib/encode/buffered/buffered_encoder_base.cpp
@@ -1,9 +1,9 @@
 #include "buffered_encoder_base.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/string/join.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NMonitoring {
 
diff --git a/src/library/monlib/encode/buffered/buffered_encoder_base.h b/src/library/monlib/encode/buffered/buffered_encoder_base.h
index 509ff60288..e1a1afe490 100644
--- a/src/library/monlib/encode/buffered/buffered_encoder_base.h
+++ b/src/library/monlib/encode/buffered/buffered_encoder_base.h
@@ -8,7 +8,7 @@
 #include <src/library/monlib/metrics/metric_value.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 
 
 namespace NMonitoring {
diff --git a/src/library/monlib/encode/encoder_state.h b/src/library/monlib/encode/encoder_state.h
index 8480f581f9..f2ef94c1b4 100644
--- a/src/library/monlib/encode/encoder_state.h
+++ b/src/library/monlib/encode/encoder_state.h
@@ -3,7 +3,7 @@
 #include "encoder_state_enum.h"
 
 #include <tools/enum_parser/enum_serialization_runtime/serialized_enum.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 
 namespace NMonitoring {
diff --git a/src/library/monlib/encode/format.cpp b/src/library/monlib/encode/format.cpp
index 859ed4db11..df83ae7f70 100644
--- a/src/library/monlib/encode/format.cpp
+++ b/src/library/monlib/encode/format.cpp
@@ -2,11 +2,11 @@
 
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 #include <src/util/string/split.h>
-#include <src/util/string/strip.h>
-#include <src/util/stream/output.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace NMonitoring {
     static ECompression CompressionFromHeader(std::string_view value) {
diff --git a/src/library/monlib/encode/format_ut.cpp b/src/library/monlib/encode/format_ut.cpp
index e48da09aa2..049740d032 100644
--- a/src/library/monlib/encode/format_ut.cpp
+++ b/src/library/monlib/encode/format_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <string>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <array>
 
diff --git a/src/library/monlib/encode/json/json_decoder.cpp b/src/library/monlib/encode/json/json_decoder.cpp
index 3b3a7e4fcd..a0ad1d4018 100644
--- a/src/library/monlib/encode/json/json_decoder.cpp
+++ b/src/library/monlib/encode/json/json_decoder.cpp
@@ -7,10 +7,10 @@
 
 #include <ydb-cpp-sdk/library/json/json_reader.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <limits>
 
diff --git a/src/library/monlib/encode/json/json_encoder.cpp b/src/library/monlib/encode/json/json_encoder.cpp
index 2db02497a0..5ea85bb495 100644
--- a/src/library/monlib/encode/json/json_encoder.cpp
+++ b/src/library/monlib/encode/json/json_encoder.cpp
@@ -10,7 +10,7 @@
 #include <ydb-cpp-sdk/library/json/writer/json.h>
 
 #include <src/util/charset/utf8.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 namespace NMonitoring {
     namespace {
diff --git a/src/library/monlib/encode/json/json_ut.cpp b/src/library/monlib/encode/json/json_ut.cpp
index 22921d3794..8e1af07ebc 100644
--- a/src/library/monlib/encode/json/json_ut.cpp
+++ b/src/library/monlib/encode/json/json_ut.cpp
@@ -7,8 +7,8 @@
 #include <ydb-cpp-sdk/library/resource/resource.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <iostream>
 #include <limits>
diff --git a/src/library/monlib/encode/prometheus/fuzz/main.cpp b/src/library/monlib/encode/prometheus/fuzz/main.cpp
index 07edcbb65a..f7064321a3 100644
--- a/src/library/monlib/encode/prometheus/fuzz/main.cpp
+++ b/src/library/monlib/encode/prometheus/fuzz/main.cpp
@@ -1,7 +1,7 @@
 #include <src/library/monlib/encode/prometheus/prometheus.h>
 #include <src/library/monlib/encode/fake/fake.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 
 extern "C" int LLVMFuzzerTestOneInput(const ui8* buf, size_t size) {
diff --git a/src/library/monlib/encode/prometheus/prometheus.h b/src/library/monlib/encode/prometheus/prometheus.h
index 663b8685e7..7a0f8b8cdd 100644
--- a/src/library/monlib/encode/prometheus/prometheus.h
+++ b/src/library/monlib/encode/prometheus/prometheus.h
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/library/monlib/encode/encoder.h>
 #include <ydb-cpp-sdk/library/monlib/encode/format.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 
 namespace NMonitoring {
diff --git a/src/library/monlib/encode/prometheus/prometheus_decoder.cpp b/src/library/monlib/encode/prometheus/prometheus_decoder.cpp
index 63703dbd22..4e11f8a33c 100644
--- a/src/library/monlib/encode/prometheus/prometheus_decoder.cpp
+++ b/src/library/monlib/encode/prometheus/prometheus_decoder.cpp
@@ -4,12 +4,12 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h>
 #include <ydb-cpp-sdk/library/monlib/metrics/metric.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <src/util/generic/hash.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 #include <cmath>
 
diff --git a/src/library/monlib/encode/prometheus/prometheus_encoder.cpp b/src/library/monlib/encode/prometheus/prometheus_encoder.cpp
index f1a13cbc36..727a6cddcc 100644
--- a/src/library/monlib/encode/prometheus/prometheus_encoder.cpp
+++ b/src/library/monlib/encode/prometheus/prometheus_encoder.cpp
@@ -6,7 +6,7 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/labels.h>
 #include <src/library/monlib/metrics/metric_value.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <unordered_set>
 
 
diff --git a/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp b/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp
index f5e9b5411f..93363d94c9 100644
--- a/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp
+++ b/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp
@@ -6,7 +6,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 using namespace NMonitoring;
 
diff --git a/src/library/monlib/encode/spack/compression.cpp b/src/library/monlib/encode/spack/compression.cpp
index d7b29bba1c..71a95d61d7 100644
--- a/src/library/monlib/encode/spack/compression.cpp
+++ b/src/library/monlib/encode/spack/compression.cpp
@@ -1,12 +1,12 @@
 #include "compression.h"
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/cast.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/scope.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 #include <src/util/stream/format.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/walk.h>
 
 #include <lz4.h>
diff --git a/src/library/monlib/encode/spack/compression.h b/src/library/monlib/encode/spack/compression.h
index 267ae0a1e7..eb8b79a418 100644
--- a/src/library/monlib/encode/spack/compression.h
+++ b/src/library/monlib/encode/spack/compression.h
@@ -2,8 +2,8 @@
 
 #include "spack_v1.h"
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NMonitoring {
 
diff --git a/src/library/monlib/encode/spack/fuzz/main.cpp b/src/library/monlib/encode/spack/fuzz/main.cpp
index db5f9b93ef..230de4ddd8 100644
--- a/src/library/monlib/encode/spack/fuzz/main.cpp
+++ b/src/library/monlib/encode/spack/fuzz/main.cpp
@@ -1,7 +1,7 @@
 #include <src/library/monlib/encode/spack/spack_v1.h>
 #include <src/library/monlib/encode/fake/fake.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 
 extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) {
diff --git a/src/library/monlib/encode/spack/spack_v1.h b/src/library/monlib/encode/spack/spack_v1.h
index 77575ac1b6..cadfbdad9d 100644
--- a/src/library/monlib/encode/spack/spack_v1.h
+++ b/src/library/monlib/encode/spack/spack_v1.h
@@ -4,7 +4,7 @@
 #include <ydb-cpp-sdk/library/monlib/encode/format.h>
 #include <ydb-cpp-sdk/library/monlib/metrics/metric.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 //
 // format specification available here:
diff --git a/src/library/monlib/encode/spack/spack_v1_decoder.cpp b/src/library/monlib/encode/spack/spack_v1_decoder.cpp
index fe416beaa4..a9f6ed8ad0 100644
--- a/src/library/monlib/encode/spack/spack_v1_decoder.cpp
+++ b/src/library/monlib/encode/spack/spack_v1_decoder.cpp
@@ -7,7 +7,7 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_collector.h>
 #include <ydb-cpp-sdk/library/monlib/metrics/metric.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/generic/buffer.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 #include <src/util/stream/format.h>
diff --git a/src/library/monlib/encode/spack/spack_v1_encoder.cpp b/src/library/monlib/encode/spack/spack_v1_encoder.cpp
index 8ca9de7d20..9889388461 100644
--- a/src/library/monlib/encode/spack/spack_v1_encoder.cpp
+++ b/src/library/monlib/encode/spack/spack_v1_encoder.cpp
@@ -4,9 +4,9 @@
 
 #include <src/library/monlib/encode/buffered/buffered_encoder_base.h>
 
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #ifndef _little_endian_
 #error Unsupported platform
diff --git a/src/library/monlib/encode/spack/varint.cpp b/src/library/monlib/encode/spack/varint.cpp
index 98cd6bb065..4f0d4a8194 100644
--- a/src/library/monlib/encode/spack/varint.cpp
+++ b/src/library/monlib/encode/spack/varint.cpp
@@ -1,8 +1,8 @@
 #include "varint.h"
 
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NMonitoring {
     ui32 WriteVarUInt32(IOutputStream* output, ui32 value) {
diff --git a/src/library/monlib/metrics/atomics_array.h b/src/library/monlib/metrics/atomics_array.h
index ba0b5ce21a..c4dfce017a 100644
--- a/src/library/monlib/metrics/atomics_array.h
+++ b/src/library/monlib/metrics/atomics_array.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <atomic>
 
diff --git a/src/library/monlib/metrics/ewma.h b/src/library/monlib/metrics/ewma.h
index 8a57547d7f..100fda7b6d 100644
--- a/src/library/monlib/metrics/ewma.h
+++ b/src/library/monlib/metrics/ewma.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <atomic>
 
diff --git a/src/library/monlib/metrics/fake.h b/src/library/monlib/metrics/fake.h
index 26460b0e52..be72dfc62c 100644
--- a/src/library/monlib/metrics/fake.h
+++ b/src/library/monlib/metrics/fake.h
@@ -3,6 +3,8 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/metric.h>
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
 
+#include <src/util/generic/hash.h>
+
 namespace NMonitoring {
     class TFakeMetricRegistry: public IMetricRegistry {
     public:
diff --git a/src/library/monlib/metrics/fake_ut.cpp b/src/library/monlib/metrics/fake_ut.cpp
index b3a84f5282..a86686802e 100644
--- a/src/library/monlib/metrics/fake_ut.cpp
+++ b/src/library/monlib/metrics/fake_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 using namespace NMonitoring;
 
diff --git a/src/library/monlib/metrics/histogram_collector_explicit.cpp b/src/library/monlib/metrics/histogram_collector_explicit.cpp
index 83a12a11d9..82607b1988 100644
--- a/src/library/monlib/metrics/histogram_collector_explicit.cpp
+++ b/src/library/monlib/metrics/histogram_collector_explicit.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_collector.h>
 #include "atomics_array.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 namespace NMonitoring {
diff --git a/src/library/monlib/metrics/histogram_collector_exponential.cpp b/src/library/monlib/metrics/histogram_collector_exponential.cpp
index 0943fedda0..8a2969098c 100644
--- a/src/library/monlib/metrics/histogram_collector_exponential.cpp
+++ b/src/library/monlib/metrics/histogram_collector_exponential.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_collector.h>
 #include "atomics_array.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 namespace NMonitoring {
diff --git a/src/library/monlib/metrics/histogram_collector_linear.cpp b/src/library/monlib/metrics/histogram_collector_linear.cpp
index b458b66c6f..cb3caf3160 100644
--- a/src/library/monlib/metrics/histogram_collector_linear.cpp
+++ b/src/library/monlib/metrics/histogram_collector_linear.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_collector.h>
 #include "atomics_array.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 #include <cmath>
diff --git a/src/library/monlib/metrics/histogram_snapshot.cpp b/src/library/monlib/metrics/histogram_snapshot.cpp
index 894b327e5b..59e4b20dae 100644
--- a/src/library/monlib/metrics/histogram_snapshot.cpp
+++ b/src/library/monlib/metrics/histogram_snapshot.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/histogram_snapshot.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <iostream>
 
diff --git a/src/library/monlib/metrics/labels.cpp b/src/library/monlib/metrics/labels.cpp
index 77538c2dcf..34e60e76bb 100644
--- a/src/library/monlib/metrics/labels.cpp
+++ b/src/library/monlib/metrics/labels.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/labels.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/string/split.h>
 
 static void OutputLabels(IOutputStream& out, const NMonitoring::ILabels& labels) {
diff --git a/src/library/monlib/metrics/log_histogram_collector.h b/src/library/monlib/metrics/log_histogram_collector.h
index 714a704875..b2d3b62f97 100644
--- a/src/library/monlib/metrics/log_histogram_collector.h
+++ b/src/library/monlib/metrics/log_histogram_collector.h
@@ -2,9 +2,9 @@
 
 #include <ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h>
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 #include <mutex>
diff --git a/src/library/monlib/metrics/log_histogram_snapshot.cpp b/src/library/monlib/metrics/log_histogram_snapshot.cpp
index 0a426c2bed..19f192473a 100644
--- a/src/library/monlib/metrics/log_histogram_snapshot.cpp
+++ b/src/library/monlib/metrics/log_histogram_snapshot.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <iostream>
 
diff --git a/src/library/monlib/metrics/metric_consumer.cpp b/src/library/monlib/metrics/metric_consumer.cpp
index ac3f73f7cf..7ca90d0a9e 100644
--- a/src/library/monlib/metrics/metric_consumer.cpp
+++ b/src/library/monlib/metrics/metric_consumer.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_consumer.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NMonitoring {
     void IMetricConsumer::OnLabel(ui32 name, ui32 value) {
diff --git a/src/library/monlib/metrics/metric_registry.cpp b/src/library/monlib/metrics/metric_registry.cpp
index fdb51c6975..d974e41d70 100644
--- a/src/library/monlib/metrics/metric_registry.cpp
+++ b/src/library/monlib/metrics/metric_registry.cpp
@@ -202,7 +202,7 @@ namespace NMonitoring {
 
             TWriteGuard g{*Lock_};
             // decltype(Metrics_)::iterator breaks build on windows
-            THashMap<ILabelsPtr, IMetricPtr>::iterator it;
+            TMapType::iterator it;
             if constexpr (!std::is_convertible_v<TLabelsType, ILabelsPtr>) {
                 it = Metrics_.emplace(new TLabels{std::forward<TLabelsType>(labels)}, std::move(metric)).first;
             } else {
@@ -215,7 +215,10 @@ namespace NMonitoring {
 
     void TMetricRegistry::RemoveMetric(const ILabels& labels) noexcept {
         TWriteGuard g{*Lock_};
-        Metrics_.erase(labels);
+        auto it = Metrics_.find(labels);
+        if (it != Metrics_.end()) { 
+            Metrics_.erase(it);
+        }
     }
 
     void TMetricRegistry::Accept(TInstant time, IMetricConsumer* consumer) const {
diff --git a/src/library/monlib/metrics/metric_registry_ut.cpp b/src/library/monlib/metrics/metric_registry_ut.cpp
index 4d248e7156..1c512ebeec 100644
--- a/src/library/monlib/metrics/metric_registry_ut.cpp
+++ b/src/library/monlib/metrics/metric_registry_ut.cpp
@@ -6,7 +6,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 using namespace NMonitoring;
 
diff --git a/src/library/monlib/metrics/metric_type.cpp b/src/library/monlib/metrics/metric_type.cpp
index f8458a208d..b0cff6f843 100644
--- a/src/library/monlib/metrics/metric_type.cpp
+++ b/src/library/monlib/metrics/metric_type.cpp
@@ -1,8 +1,8 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_type.h>
 
 #include <string_view>
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NMonitoring {
     std::string_view MetricTypeToStr(EMetricType type) {
diff --git a/src/library/monlib/metrics/metric_value.h b/src/library/monlib/metrics/metric_value.h
index 6eba150369..03a16a3296 100644
--- a/src/library/monlib/metrics/metric_value.h
+++ b/src/library/monlib/metrics/metric_value.h
@@ -6,9 +6,9 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/log_histogram_snapshot.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/generic/ymath.h>
 
 namespace NMonitoring {
diff --git a/src/library/monlib/metrics/summary_collector_ut.cpp b/src/library/monlib/metrics/summary_collector_ut.cpp
index 74db3132b6..bf61638af3 100644
--- a/src/library/monlib/metrics/summary_collector_ut.cpp
+++ b/src/library/monlib/metrics/summary_collector_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <numeric>
 #include <algorithm>
diff --git a/src/library/monlib/metrics/summary_snapshot.cpp b/src/library/monlib/metrics/summary_snapshot.cpp
index 2b06332ccd..bef73ee8a5 100644
--- a/src/library/monlib/metrics/summary_snapshot.cpp
+++ b/src/library/monlib/metrics/summary_snapshot.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/library/monlib/metrics/summary_snapshot.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <iostream>
 
diff --git a/src/library/monlib/service/format.h b/src/library/monlib/service/format.h
index 86908c4d10..08a7e578fd 100644
--- a/src/library/monlib/service/format.h
+++ b/src/library/monlib/service/format.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/monlib/encode/format.h>
 
-#include <src/util/string/ascii.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 namespace NMonitoring {
diff --git a/src/library/monlib/service/monservice.cpp b/src/library/monlib/service/monservice.cpp
index a087d799e5..464f6f6dbf 100644
--- a/src/library/monlib/service/monservice.cpp
+++ b/src/library/monlib/service/monservice.cpp
@@ -3,7 +3,7 @@
 #include <src/library/string_utils/base64/base64.h>
 #include <src/library/svnversion/svnversion.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/system/hostname.h>
 
 #include <google/protobuf/text_format.h>
diff --git a/src/library/monlib/service/pages/index_mon_page.cpp b/src/library/monlib/service/pages/index_mon_page.cpp
index 1bd5bd9584..837bdc7b7b 100644
--- a/src/library/monlib/service/pages/index_mon_page.cpp
+++ b/src/library/monlib/service/pages/index_mon_page.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/library/monlib/service/pages/index_mon_page.h>
 
-#include <src/util/generic/cast.h>
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 using namespace NMonitoring;
 
diff --git a/src/library/monlib/service/pages/templates.h b/src/library/monlib/service/pages/templates.h
index e20f71c441..33504ba9df 100644
--- a/src/library/monlib/service/pages/templates.h
+++ b/src/library/monlib/service/pages/templates.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #define WITH_SCOPED(var, value) WITH_SCOPED_I(var, value, Y_GENERATE_UNIQUE_ID(WITH_SCOPED_LABEL_))
diff --git a/src/library/monlib/service/service.cpp b/src/library/monlib/service/service.cpp
index 6d2c15bb1b..89cde77b5b 100644
--- a/src/library/monlib/service/service.cpp
+++ b/src/library/monlib/service/service.cpp
@@ -8,9 +8,9 @@
 #include <src/library/logger/all.h>
 
 #include <src/util/generic/buffer.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <src/util/stream/buffer.h>
-#include <src/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
 #include <src/util/string/vector.h>
 
 namespace NMonitoring {
diff --git a/src/library/object_factory/object_factory.h b/src/library/object_factory/object_factory.h
index 02f03a1c6b..6e51861b85 100644
--- a/src/library/object_factory/object_factory.h
+++ b/src/library/object_factory/object_factory.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <src/util/system/guard.h>
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 #include <src/util/generic/set.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <algorithm>
 #include <map>
diff --git a/src/library/openssl/holders/holder.h b/src/library/openssl/holders/holder.h
index 7ef2b03a25..9f985fb97e 100644
--- a/src/library/openssl/holders/holder.h
+++ b/src/library/openssl/holders/holder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NOpenSSL {
 
diff --git a/src/library/openssl/init/init.cpp b/src/library/openssl/init/init.cpp
index c04eb53824..2395720e83 100644
--- a/src/library/openssl/init/init.cpp
+++ b/src/library/openssl/init/init.cpp
@@ -1,15 +1,15 @@
 #include "init.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/buffer.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/system/thread.h>
 
 #include <src/util/random/entropy.h>
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
diff --git a/src/library/openssl/io/stream.cpp b/src/library/openssl/io/stream.cpp
index f84b42547e..27d7a20038 100644
--- a/src/library/openssl/io/stream.cpp
+++ b/src/library/openssl/io/stream.cpp
@@ -1,7 +1,7 @@
 #include "stream.h"
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <src/library/openssl/init/init.h>
 #include <src/library/openssl/method/io.h>
diff --git a/src/library/openssl/io/stream.h b/src/library/openssl/io/stream.h
index 3c5dae617d..c3f93123ed 100644
--- a/src/library/openssl/io/stream.h
+++ b/src/library/openssl/io/stream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <optional>
 
diff --git a/src/library/openssl/method/io.cpp b/src/library/openssl/method/io.cpp
index d42a62c60b..c2106af5a7 100644
--- a/src/library/openssl/method/io.cpp
+++ b/src/library/openssl/method/io.cpp
@@ -1,9 +1,9 @@
 #include "io.h"
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace {
     using NOpenSSL::TAbstractIO;
diff --git a/src/library/operation_id/operation_id.cpp b/src/library/operation_id/operation_id.cpp
index d7bb78bc1c..0c2d12b4bf 100644
--- a/src/library/operation_id/operation_id.cpp
+++ b/src/library/operation_id/operation_id.cpp
@@ -5,8 +5,8 @@
 #include <ydb-cpp-sdk/library/cgiparam/cgiparam.h>
 #include <src/library/uri/uri.h>
 
-#include <src/util/generic/yexception.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace NKikimr {
 namespace NOperationId {
diff --git a/src/library/persqueue/obfuscate/obfuscate.cpp b/src/library/persqueue/obfuscate/obfuscate.cpp
index 6053a70e09..501ec12dfe 100644
--- a/src/library/persqueue/obfuscate/obfuscate.cpp
+++ b/src/library/persqueue/obfuscate/obfuscate.cpp
@@ -1,6 +1,6 @@
 #include "obfuscate.h"
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 namespace NPersQueue {
 
diff --git a/src/library/persqueue/topic_parser_public/topic_parser.cpp b/src/library/persqueue/topic_parser_public/topic_parser.cpp
index 4d1b01d0cd..0358748cfe 100644
--- a/src/library/persqueue/topic_parser_public/topic_parser.cpp
+++ b/src/library/persqueue/topic_parser_public/topic_parser.cpp
@@ -1,6 +1,6 @@
 #include "topic_parser.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/folder/path.h>
 
diff --git a/src/library/resource/registry.cpp b/src/library/resource/registry.cpp
index 3507460fbf..61942a2e09 100644
--- a/src/library/resource/registry.cpp
+++ b/src/library/resource/registry.cpp
@@ -3,10 +3,10 @@
 #include <src/library/blockcodecs/core/codecs.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <iostream>
 
diff --git a/src/library/resource/resource.cpp b/src/library/resource/resource.cpp
index cd9c125de7..ea89f871ac 100644
--- a/src/library/resource/resource.cpp
+++ b/src/library/resource/resource.cpp
@@ -2,8 +2,8 @@
 
 #include "registry.h"
 
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 
 using namespace NResource;
 
diff --git a/src/library/retry/retry.cpp b/src/library/retry/retry.cpp
index 5a1ed50903..0d3d0f2b45 100644
--- a/src/library/retry/retry.cpp
+++ b/src/library/retry/retry.cpp
@@ -1,6 +1,6 @@
 #include "retry.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace {
 class TRetryOptionsWithRetCodePolicy : public IRetryPolicy<bool> {
diff --git a/src/library/retry/retry.h b/src/library/retry/retry.h
index 9b1c986272..ab64aa5a77 100644
--- a/src/library/retry/retry.h
+++ b/src/library/retry/retry.h
@@ -7,7 +7,7 @@
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <functional>
 
diff --git a/src/library/retry/utils.cpp b/src/library/retry/utils.cpp
index c020dd5d6b..9cd8d06e44 100644
--- a/src/library/retry/utils.cpp
+++ b/src/library/retry/utils.cpp
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 TDuration NRetryPrivate::AddRandomDelta(TDuration maxDelta) {
     if (maxDelta == TDuration::Zero()) {
diff --git a/src/library/security/util.h b/src/library/security/util.h
index 2dd0044bfd..c364fbf3df 100644
--- a/src/library/security/util.h
+++ b/src/library/security/util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 namespace NKikimr {
diff --git a/src/library/streams/brotli/brotli.cpp b/src/library/streams/brotli/brotli.cpp
index ed9715e36f..53c04e38d1 100644
--- a/src/library/streams/brotli/brotli.cpp
+++ b/src/library/streams/brotli/brotli.cpp
@@ -3,7 +3,7 @@
 #include <brotli/decode.h>
 #include <brotli/encode.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/memory/addstorage.h>
 
 namespace {
diff --git a/src/library/streams/brotli/brotli.h b/src/library/streams/brotli/brotli.h
index dac484fa03..cbb9dada0f 100644
--- a/src/library/streams/brotli/brotli.h
+++ b/src/library/streams/brotli/brotli.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 /**
  * @addtogroup Streams_Archs
diff --git a/src/library/streams/bzip2/bzip2.h b/src/library/streams/bzip2/bzip2.h
index 3fdef27de0..889d8349b6 100644
--- a/src/library/streams/bzip2/bzip2.h
+++ b/src/library/streams/bzip2/bzip2.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #define BZIP_BUF_LEN (8 * 1024)
 #define BZIP_COMPRESSION_LEVEL 6
diff --git a/src/library/streams/lz/common/error.h b/src/library/streams/lz/common/error.h
index 20be71e719..af44c649d3 100644
--- a/src/library/streams/lz/common/error.h
+++ b/src/library/streams/lz/common/error.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 struct TDecompressorError: public yexception {
 };
diff --git a/src/library/streams/lz/lz.h b/src/library/streams/lz/lz.h
index 4ef4171834..10be1da270 100644
--- a/src/library/streams/lz/lz.h
+++ b/src/library/streams/lz/lz.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <src/library/streams/lz/common/error.h>
 
diff --git a/src/library/streams/lz/lz4/lz4.h b/src/library/streams/lz/lz4/lz4.h
index d6296c9bb8..a67943d653 100644
--- a/src/library/streams/lz/lz4/lz4.h
+++ b/src/library/streams/lz/lz4/lz4.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 /**
  * @addtogroup Streams_Archs
diff --git a/src/library/streams/lz/snappy/snappy.h b/src/library/streams/lz/snappy/snappy.h
index 03b6b248c1..af4cd58b60 100644
--- a/src/library/streams/lz/snappy/snappy.h
+++ b/src/library/streams/lz/snappy/snappy.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 /**
  * @addtogroup Streams_Archs
diff --git a/src/library/streams/lzma/lzma.cpp b/src/library/streams/lzma/lzma.cpp
index b649eba8f3..517142260a 100644
--- a/src/library/streams/lzma/lzma.cpp
+++ b/src/library/streams/lzma/lzma.cpp
@@ -1,10 +1,10 @@
 #include "lzma.h"
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include <src/util/system/context.h>
-#include <src/util/generic/cast.h>
+#include <ydb-cpp-sdk/util/generic/cast.h>
 #include <src/util/memory/addstorage.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/intrlist.h>
 #include <src/util/generic/scope.h>
 
diff --git a/src/library/streams/lzma/lzma.h b/src/library/streams/lzma/lzma.h
index 5a5abbe967..a21ad845e4 100644
--- a/src/library/streams/lzma/lzma.h
+++ b/src/library/streams/lzma/lzma.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TLzmaCompress: public IOutputStream {
 public:
diff --git a/src/library/streams/lzma/lzma_ut.cpp b/src/library/streams/lzma/lzma_ut.cpp
index 9d99f0ce46..cb43a95e53 100644
--- a/src/library/streams/lzma/lzma_ut.cpp
+++ b/src/library/streams/lzma/lzma_ut.cpp
@@ -2,9 +2,9 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include <src/util/random/fast.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 class TStrokaByOneByte: public IZeroCopyInput {
 public:
diff --git a/src/library/streams/zstd/zstd.cpp b/src/library/streams/zstd/zstd.cpp
index b71922847f..313da08f9f 100644
--- a/src/library/streams/zstd/zstd.cpp
+++ b/src/library/streams/zstd/zstd.cpp
@@ -1,7 +1,7 @@
 #include "zstd.h"
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #define ZSTD_STATIC_LINKING_ONLY
 #include <zstd.h>
diff --git a/src/library/streams/zstd/zstd.h b/src/library/streams/zstd/zstd.h
index e669820750..c422411e90 100644
--- a/src/library/streams/zstd/zstd.h
+++ b/src/library/streams/zstd/zstd.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 /**
  * @addtogroup Streams_Archs
diff --git a/src/library/streams/zstd/zstd_ut.cpp b/src/library/streams/zstd/zstd_ut.cpp
index d158fdbe00..491cd2d77f 100644
--- a/src/library/streams/zstd/zstd_ut.cpp
+++ b/src/library/streams/zstd/zstd_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <src/util/random/fast.h>
 #include <src/util/stream/null.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 Y_UNIT_TEST_SUITE(TZstdTestSuite) {
     std::string Compress(std::string data, int quality = -1) {
diff --git a/src/library/string_utils/base64/base64.cpp b/src/library/string_utils/base64/base64.cpp
index cf621846e1..e36f249a33 100644
--- a/src/library/string_utils/base64/base64.cpp
+++ b/src/library/string_utils/base64/base64.cpp
@@ -1,7 +1,7 @@
 #include "base64.h"
 
 #include <libbase64.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/system/cpu_id.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
 
diff --git a/src/library/string_utils/quote/quote.cpp b/src/library/string_utils/quote/quote.cpp
index 351520c661..977e807b56 100644
--- a/src/library/string_utils/quote/quote.cpp
+++ b/src/library/string_utils/quote/quote.cpp
@@ -1,7 +1,7 @@
 #include "quote.h"
 
-#include <src/util/memory/tempbuf.h>
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 #include <src/util/string/cstriter.h>
 
 /* note: (x & 0xdf) makes x upper case */
diff --git a/src/library/string_utils/relaxed_escaper/relaxed_escaper.h b/src/library/string_utils/relaxed_escaper/relaxed_escaper.h
index 6c5873827d..5d11a4b7c6 100644
--- a/src/library/string_utils/relaxed_escaper/relaxed_escaper.h
+++ b/src/library/string_utils/relaxed_escaper/relaxed_escaper.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/stream/output.h>
-#include <src/util/string/escape.h>
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include <string_view>
 
 namespace NEscJ {
diff --git a/src/library/string_utils/stream/stream.h b/src/library/string_utils/stream/stream.h
index 51b4ae17b4..ec45d9e0cd 100644
--- a/src/library/string_utils/stream/stream.h
+++ b/src/library/string_utils/stream/stream.h
@@ -1,4 +1,4 @@
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 namespace NUtils {
 
diff --git a/src/library/string_utils/url/url.cpp b/src/library/string_utils/url/url.cpp
index 974200c939..0cdadbdffe 100644
--- a/src/library/string_utils/url/url.cpp
+++ b/src/library/string_utils/url/url.cpp
@@ -1,19 +1,19 @@
 #include "url.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/util.h>
 #include <src/util/string/cstriter.h>
-#include <src/util/string/ascii.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <src/util/charset/unidata.h> // for ToLower
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <cstdlib>
 
diff --git a/src/library/string_utils/url/url.h b/src/library/string_utils/url/url.h
index 9ff0b169dc..8457dc562b 100644
--- a/src/library/string_utils/url/url.h
+++ b/src/library/string_utils/url/url.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <string_view>
 
 namespace NUrl {
diff --git a/src/library/string_utils/url/url_ut.cpp b/src/library/string_utils/url/url_ut.cpp
index b68ffb32ed..cd1de1cdb2 100644
--- a/src/library/string_utils/url/url_ut.cpp
+++ b/src/library/string_utils/url/url_ut.cpp
@@ -1,6 +1,6 @@
 #include "url.h"
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <src/library/testing/unittest/registar.h>
 
diff --git a/src/library/terminate_handler/sample/exception/main.cpp b/src/library/terminate_handler/sample/exception/main.cpp
index cee44b2303..0b1425b05c 100644
--- a/src/library/terminate_handler/sample/exception/main.cpp
+++ b/src/library/terminate_handler/sample/exception/main.cpp
@@ -1,4 +1,4 @@
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 
 void Foo(unsigned i = 0) {
diff --git a/src/library/terminate_handler/sample/rethrow/main.cpp b/src/library/terminate_handler/sample/rethrow/main.cpp
index 007919cc2a..8000a11efd 100644
--- a/src/library/terminate_handler/sample/rethrow/main.cpp
+++ b/src/library/terminate_handler/sample/rethrow/main.cpp
@@ -1,4 +1,4 @@
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <iostream>
 
diff --git a/src/library/terminate_handler/segv_handler.cpp b/src/library/terminate_handler/segv_handler.cpp
index 8cff0b5a4e..b099b0001d 100644
--- a/src/library/terminate_handler/segv_handler.cpp
+++ b/src/library/terminate_handler/segv_handler.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/util/system/platform.h>
-#include <src/util/system/yassert.h>
-#include <src/util/stream/output.h>
-#include <src/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/backtrace.h>
 
 #include <string.h>
 
diff --git a/src/library/terminate_handler/terminate_handler.cpp b/src/library/terminate_handler/terminate_handler.cpp
index 4a7cdadb70..9251e57eb8 100644
--- a/src/library/terminate_handler/terminate_handler.cpp
+++ b/src/library/terminate_handler/terminate_handler.cpp
@@ -1,9 +1,9 @@
 #include <cstdlib>
 #include <exception>
 
-#include <src/util/stream/output.h>
-#include <src/util/system/backtrace.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <iostream>
 #include <string>
diff --git a/src/library/testing/common/env.cpp b/src/library/testing/common/env.cpp
index 41ea1aca24..e50945c7da 100644
--- a/src/library/testing/common/env.cpp
+++ b/src/library/testing/common/env.cpp
@@ -4,12 +4,12 @@
 
 #include <src/util/folder/dirut.h>
 #include <src/util/folder/path.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 #include <src/util/stream/file.h>
-#include <src/util/stream/fwd.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/stream/fwd.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/file_lock.h>
-#include <src/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
 
 #include <ydb-cpp-sdk/library/json/json_reader.h>
 #include <ydb-cpp-sdk/library/json/json_value.h>
diff --git a/src/library/testing/common/env.h b/src/library/testing/common/env.h
index f06174f360..99a677590b 100644
--- a/src/library/testing/common/env.h
+++ b/src/library/testing/common/env.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <src/util/folder/path.h>
-#include <src/util/system/src_location.h>
+#include <ydb-cpp-sdk/util/system/src_location.h>
 
 #include <string>
 #include <string_view>
diff --git a/src/library/testing/common/env_var.cpp b/src/library/testing/common/env_var.cpp
index e91c2dfecd..5b7d1bffe1 100644
--- a/src/library/testing/common/env_var.cpp
+++ b/src/library/testing/common/env_var.cpp
@@ -1,6 +1,6 @@
 #include "env_var.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <ydb-cpp-sdk/util/system/platform.h>
 
diff --git a/src/library/testing/common/network.cpp b/src/library/testing/common/network.cpp
index beda41bea9..a407459a0a 100644
--- a/src/library/testing/common/network.cpp
+++ b/src/library/testing/common/network.cpp
@@ -4,16 +4,16 @@
 
 #include <src/util/folder/dirut.h>
 #include <src/util/folder/path.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/network/address.h>
-#include <src/util/network/sock.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/network/address.h>
+#include <ydb-cpp-sdk/util/network/sock.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 #include <src/util/stream/file.h>
 #include <src/util/string/split.h>
-#include <src/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/error.h>
 #include <src/util/system/file_lock.h>
 #include <src/util/system/fs.h>
 
diff --git a/src/library/testing/common/network.h b/src/library/testing/common/network.h
index b66e068505..13da175298 100644
--- a/src/library/testing/common/network.h
+++ b/src/library/testing/common/network.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 
 namespace NTesting {
diff --git a/src/library/testing/common/probe.h b/src/library/testing/common/probe.h
index dca290df55..cd0c4064d0 100644
--- a/src/library/testing/common/probe.h
+++ b/src/library/testing/common/probe.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NTesting {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/library/testing/gmock_in_unittest/events.cpp b/src/library/testing/gmock_in_unittest/events.cpp
index 9d2a1ca4b9..d9976a96cc 100644
--- a/src/library/testing/gmock_in_unittest/events.cpp
+++ b/src/library/testing/gmock_in_unittest/events.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <string>
 #include <string_view>
diff --git a/src/library/testing/gtest/main.cpp b/src/library/testing/gtest/main.cpp
index ec547e0ae5..0d36e54be5 100644
--- a/src/library/testing/gtest/main.cpp
+++ b/src/library/testing/gtest/main.cpp
@@ -6,7 +6,7 @@
 #include <src/library/testing/hook/hook.h>
 #include <src/util/generic/scope.h>
 #include <src/util/string/join.h>
-#include <src/util/system/src_root.h>
+#include <ydb-cpp-sdk/util/system/src_root.h>
 
 #include <fstream>
 
diff --git a/src/library/testing/gtest_extensions/assertions.cpp b/src/library/testing/gtest_extensions/assertions.cpp
index cf9edd2ae7..8c2faea5b6 100644
--- a/src/library/testing/gtest_extensions/assertions.cpp
+++ b/src/library/testing/gtest_extensions/assertions.cpp
@@ -1,9 +1,9 @@
 #include "assertions.h"
 
-#include <src/util/string/builder.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <src/util/string/split.h>
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 namespace NGTest::NInternal {
     namespace {
diff --git a/src/library/testing/gtest_extensions/pretty_printers.h b/src/library/testing/gtest_extensions/pretty_printers.h
index 2b55066e69..ae41bbb5e5 100644
--- a/src/library/testing/gtest_extensions/pretty_printers.h
+++ b/src/library/testing/gtest_extensions/pretty_printers.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <src/util/generic/variant.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/str.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 #include <gtest/gtest.h>
diff --git a/src/library/testing/gtest_extensions/probe.h b/src/library/testing/gtest_extensions/probe.h
index 40a6f7bd33..78aa2adf79 100644
--- a/src/library/testing/gtest_extensions/probe.h
+++ b/src/library/testing/gtest_extensions/probe.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <src/library/testing/common/probe.h>
 
diff --git a/src/library/testing/unittest/gtest.cpp b/src/library/testing/unittest/gtest.cpp
index e094941efe..1fb11bb494 100644
--- a/src/library/testing/unittest/gtest.cpp
+++ b/src/library/testing/unittest/gtest.cpp
@@ -1,7 +1,7 @@
 #include "gtest.h"
 #include "simple.h"
 
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 using namespace NUnitTest;
 using namespace NUnitTest::NPrivate;
diff --git a/src/library/testing/unittest/junit.cpp b/src/library/testing/unittest/junit.cpp
index 00f7c2971f..728739882b 100644
--- a/src/library/testing/unittest/junit.cpp
+++ b/src/library/testing/unittest/junit.cpp
@@ -10,11 +10,11 @@
 #include <src/util/generic/scope.h>
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 #include <src/util/stream/file.h>
-#include <src/util/stream/input.h>
-#include <src/util/system/backtrace.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/fs.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/fstat.h>
 #include <src/util/system/tempfile.h>
 
diff --git a/src/library/testing/unittest/plugin.cpp b/src/library/testing/unittest/plugin.cpp
index 3878dc8984..94ec09c768 100644
--- a/src/library/testing/unittest/plugin.cpp
+++ b/src/library/testing/unittest/plugin.cpp
@@ -1,7 +1,7 @@
 #include "plugin.h"
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <vector>
 
 namespace NUnitTest::NPlugin {
diff --git a/src/library/testing/unittest/plugin.h b/src/library/testing/unittest/plugin.h
index 20915d1686..e11583aee4 100644
--- a/src/library/testing/unittest/plugin.h
+++ b/src/library/testing/unittest/plugin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NUnitTest {
     // Plugins are deprecated, please use Y_TEST_HOOK_* from src/library/hook/hook.h
diff --git a/src/library/testing/unittest/registar.cpp b/src/library/testing/unittest/registar.cpp
index c88e31d781..85f1f1e9de 100644
--- a/src/library/testing/unittest/registar.cpp
+++ b/src/library/testing/unittest/registar.cpp
@@ -3,13 +3,13 @@
 #include <src/library/diff/diff.h>
 #include <src/library/colorizer/colors.h>
 
-#include <src/util/generic/bt_exception.h>
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
 #include <src/util/random/fast.h>
-#include <src/util/system/backtrace.h>
-#include <src/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
 #include <src/util/system/tls.h>
-#include <src/util/system/error.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <mutex>
 
diff --git a/src/library/testing/unittest/registar.h b/src/library/testing/unittest/registar.h
index 492da4c1e3..2b7d1a5482 100644
--- a/src/library/testing/unittest/registar.h
+++ b/src/library/testing/unittest/registar.h
@@ -2,23 +2,23 @@
 
 #include <src/library/dbg_output/dump.h>
 
-#include <src/util/generic/bt_exception.h>
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
 #include <src/util/generic/hash.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/scope.h>
 #include <src/util/generic/set.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
-#include <src/util/string/builder.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/type_name.h>
-#include <src/util/system/spinlock.h>
-#include <src/util/system/src_location.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/src_location.h>
 
 #include <src/util/system/rusage.h>
 
diff --git a/src/library/testing/unittest/tests_data.h b/src/library/testing/unittest/tests_data.h
index 6569fdc5d9..aafe9044c8 100644
--- a/src/library/testing/unittest/tests_data.h
+++ b/src/library/testing/unittest/tests_data.h
@@ -2,9 +2,9 @@
 
 #include <src/library/testing/common/env.h>
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/network/sock.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/network/sock.h>
 
 #include <string>
 
diff --git a/src/library/testing/unittest/utmain.cpp b/src/library/testing/unittest/utmain.cpp
index 317b330a63..94a0423906 100644
--- a/src/library/testing/unittest/utmain.cpp
+++ b/src/library/testing/unittest/utmain.cpp
@@ -16,12 +16,12 @@
 
 #include <src/util/generic/hash.h>
 #include <src/util/generic/scope.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
-#include <src/util/network/init.h>
+#include <ydb-cpp-sdk/util/network/init.h>
 
 #include <src/util/stream/file.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <src/util/string/join.h>
 #include <src/util/string/util.h>
diff --git a/src/library/threading/cancellation/operation_cancelled_exception.h b/src/library/threading/cancellation/operation_cancelled_exception.h
index 43540b55a1..4d755013cd 100644
--- a/src/library/threading/cancellation/operation_cancelled_exception.h
+++ b/src/library/threading/cancellation/operation_cancelled_exception.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 namespace NThreading {
 
diff --git a/src/library/threading/chunk_queue/queue.h b/src/library/threading/chunk_queue/queue.h
index ae1afa9ab6..3e5c74bff3 100644
--- a/src/library/threading/chunk_queue/queue.h
+++ b/src/library/threading/chunk_queue/queue.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
 #include <src/util/system/datetime.h>
-#include <src/util/system/guard.h>
-#include <src/util/system/spinlock.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <mutex>
 #include <type_traits>
diff --git a/src/library/threading/equeue/equeue.h b/src/library/threading/equeue/equeue.h
index ef9a365b2a..719597985b 100644
--- a/src/library/threading/equeue/equeue.h
+++ b/src/library/threading/equeue/equeue.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 //actual queue limit will be (maxQueueSize - numBusyThreads) or 0
 class TElasticQueue: public IThreadPool {
diff --git a/src/library/threading/equeue/equeue_ut.cpp b/src/library/threading/equeue/equeue_ut.cpp
index 89c25d1355..6ebe27c244 100644
--- a/src/library/threading/equeue/equeue_ut.cpp
+++ b/src/library/threading/equeue/equeue_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 
diff --git a/src/library/threading/future/async.h b/src/library/threading/future/async.h
index 70f064b301..522a925fe7 100644
--- a/src/library/threading/future/async.h
+++ b/src/library/threading/future/async.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/threading/future/future.h>
 
-#include <src/util/generic/function.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 namespace NThreading {
     /**
diff --git a/src/library/threading/future/async_semaphore.cpp b/src/library/threading/future/async_semaphore.cpp
index e2d1a3c904..503af33bb5 100644
--- a/src/library/threading/future/async_semaphore.cpp
+++ b/src/library/threading/future/async_semaphore.cpp
@@ -1,7 +1,7 @@
 #include "async_semaphore.h"
 
-#include <src/util/system/guard.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <src/library/threading/cancellation/operation_cancelled_exception.h>
 
diff --git a/src/library/threading/future/async_semaphore.h b/src/library/threading/future/async_semaphore.h
index b82abe8234..c864e92b5f 100644
--- a/src/library/threading/future/async_semaphore.h
+++ b/src/library/threading/future/async_semaphore.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/threading/future/future.h>
 
-#include <src/util/system/spinlock.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <list>
 #include <functional>
diff --git a/src/library/threading/future/async_semaphore_ut.cpp b/src/library/threading/future/async_semaphore_ut.cpp
index dbe9d90194..e0e38aedab 100644
--- a/src/library/threading/future/async_semaphore_ut.cpp
+++ b/src/library/threading/future/async_semaphore_ut.cpp
@@ -6,7 +6,7 @@
 
 #include <src/util/generic/scope.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 using namespace NThreading;
 
diff --git a/src/library/threading/future/async_ut.cpp b/src/library/threading/future/async_ut.cpp
index 690fabdac3..bba447e0da 100644
--- a/src/library/threading/future/async_ut.cpp
+++ b/src/library/threading/future/async_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 
 namespace {
diff --git a/src/library/threading/future/future_mt_ut.cpp b/src/library/threading/future/future_mt_ut.cpp
index 23e211c38a..fdfea96fee 100644
--- a/src/library/threading/future/future_mt_ut.cpp
+++ b/src/library/threading/future/future_mt_ut.cpp
@@ -2,9 +2,9 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/xrange.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <atomic>
 #include <exception>
diff --git a/src/library/threading/future/legacy_future.h b/src/library/threading/future/legacy_future.h
index b9c3449be8..5769a31c04 100644
--- a/src/library/threading/future/legacy_future.h
+++ b/src/library/threading/future/legacy_future.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/threading/future/future.h>
 
-#include <src/util/thread/factory.h>
+#include <ydb-cpp-sdk/util/thread/factory.h>
 
 #include <functional>
 
diff --git a/src/library/threading/future/perf/main.cpp b/src/library/threading/future/perf/main.cpp
index 1bb41c402b..4527b44f26 100644
--- a/src/library/threading/future/perf/main.cpp
+++ b/src/library/threading/future/perf/main.cpp
@@ -2,7 +2,7 @@
 #include <ydb-cpp-sdk/library/threading/future/future.h>
 
 #include <string>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 
 using namespace NThreading;
 
diff --git a/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp b/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp
index 6be551dcbe..0b4c69a63b 100644
--- a/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp
+++ b/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp
@@ -1,5 +1,5 @@
 #include <src/library/threading/light_rw_lock/lightrwlock.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #ifdef _linux_
 // Light rw lock is implemented only for linux
diff --git a/src/library/threading/light_rw_lock/lightrwlock.cpp b/src/library/threading/light_rw_lock/lightrwlock.cpp
index 7034853ec8..02680d5435 100644
--- a/src/library/threading/light_rw_lock/lightrwlock.cpp
+++ b/src/library/threading/light_rw_lock/lightrwlock.cpp
@@ -1,5 +1,5 @@
 #include "lightrwlock.h"
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #if defined(_linux_) && !defined(_tsan_enabled_)
 
diff --git a/src/library/threading/light_rw_lock/lightrwlock.h b/src/library/threading/light_rw_lock/lightrwlock.h
index 58d8590ecb..ff9c364b56 100644
--- a/src/library/threading/light_rw_lock/lightrwlock.h
+++ b/src/library/threading/light_rw_lock/lightrwlock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/rwlock.h>
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 #include <src/util/system/sanitizers.h>
 
 // TLightRWLock and TSAN are not friends...
diff --git a/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp b/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp
index ac34bc8b50..8802597ffc 100644
--- a/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp
+++ b/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp
@@ -1,8 +1,8 @@
 #include <src/library/threading/light_rw_lock/lightrwlock.h>
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/random/random.h>
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 class TRWMutexTest: public TTestBase {
     UNIT_TEST_SUITE(TRWMutexTest);
diff --git a/src/library/threading/poor_man_openmp/thread_helper.cpp b/src/library/threading/poor_man_openmp/thread_helper.cpp
index 5cfb65a5d7..b694aee51e 100644
--- a/src/library/threading/poor_man_openmp/thread_helper.cpp
+++ b/src/library/threading/poor_man_openmp/thread_helper.cpp
@@ -1,6 +1,6 @@
 #include "thread_helper.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 TMtpQueueHelper& TMtpQueueHelper::Instance() {
     return *Singleton<TMtpQueueHelper>();
diff --git a/src/library/threading/poor_man_openmp/thread_helper.h b/src/library/threading/poor_man_openmp/thread_helper.h
index fa1b79a2a8..f0bb5cccbe 100644
--- a/src/library/threading/poor_man_openmp/thread_helper.h
+++ b/src/library/threading/poor_man_openmp/thread_helper.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <src/util/thread/pool.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/system/info.h>
 #include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <functional>
 #include <cstdlib>
diff --git a/src/library/threading/poor_man_openmp/thread_helper_ut.cpp b/src/library/threading/poor_man_openmp/thread_helper_ut.cpp
index 6716e3c9d4..f788e64362 100644
--- a/src/library/threading/poor_man_openmp/thread_helper_ut.cpp
+++ b/src/library/threading/poor_man_openmp/thread_helper_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <string>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 Y_UNIT_TEST_SUITE(TestMP) {
     Y_UNIT_TEST(TestErr) {
diff --git a/src/library/unicode_normalization/normalization.h b/src/library/unicode_normalization/normalization.h
index dda9419483..614fd448e9 100644
--- a/src/library/unicode_normalization/normalization.h
+++ b/src/library/unicode_normalization/normalization.h
@@ -5,9 +5,9 @@
 #include <src/util/charset/unidata.h>
 #include <src/util/charset/wide.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <utility>
 
 namespace NUnicode {
diff --git a/src/library/uri/assign.cpp b/src/library/uri/assign.cpp
index 590ddcf56a..f0fccd328e 100644
--- a/src/library/uri/assign.cpp
+++ b/src/library/uri/assign.cpp
@@ -5,9 +5,9 @@
 
 #include <src/library/charset/recyr.hh>
 #include <src/util/charset/wide.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/string/cast.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/system/sys_alloc.h>
 
 namespace NUri {
diff --git a/src/library/uri/common.cpp b/src/library/uri/common.cpp
index 747bb62e83..b6f1fd4306 100644
--- a/src/library/uri/common.cpp
+++ b/src/library/uri/common.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <map>
 
diff --git a/src/library/uri/common.h b/src/library/uri/common.h
index 9570362711..04aa79f03d 100644
--- a/src/library/uri/common.h
+++ b/src/library/uri/common.h
@@ -2,8 +2,8 @@
 
 #include <contrib/libs/libc_compat/string.h>
 
-#include <src/util/stream/output.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <string_view>
 
 namespace NUri {
diff --git a/src/library/uri/encode.cpp b/src/library/uri/encode.cpp
index cf679caf66..83c2f5ff8a 100644
--- a/src/library/uri/encode.cpp
+++ b/src/library/uri/encode.cpp
@@ -1,6 +1,6 @@
 #include "encode.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 namespace NUri {
     namespace NEncode {
diff --git a/src/library/uri/encode.h b/src/library/uri/encode.h
index fde6e15c62..7e01f20486 100644
--- a/src/library/uri/encode.h
+++ b/src/library/uri/encode.h
@@ -2,7 +2,7 @@
 
 #include "common.h"
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NUri {
     namespace NEncode {
diff --git a/src/library/uri/other.cpp b/src/library/uri/other.cpp
index 00b3660141..2b73306c4f 100644
--- a/src/library/uri/other.cpp
+++ b/src/library/uri/other.cpp
@@ -2,9 +2,9 @@
 
 #include <contrib/libs/libc_compat/string.h>
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/string/util.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 /********************************************************/
 /********************************************************/
diff --git a/src/library/uri/parse.h b/src/library/uri/parse.h
index 5dba3a27c3..8c58f514e6 100644
--- a/src/library/uri/parse.h
+++ b/src/library/uri/parse.h
@@ -8,9 +8,9 @@
 
 #include <src/library/charset/doccodes.h>
 #include <string_view>
-#include <src/util/stream/output.h>
-#include <src/util/string/cast.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NUri {
     class TParser;
diff --git a/src/library/uri/uri-ru_ut.cpp b/src/library/uri/uri-ru_ut.cpp
index 26b737dfc9..e87ebea7a2 100644
--- a/src/library/uri/uri-ru_ut.cpp
+++ b/src/library/uri/uri-ru_ut.cpp
@@ -1,7 +1,7 @@
 #include "uri_ut.h"
 #include <src/library/charset/recyr.hh>
 #include <src/library/html/entity/htmlentity.h>
-#include <src/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
 
 namespace NUri {
     namespace {
diff --git a/src/library/uri/uri.cpp b/src/library/uri/uri.cpp
index 334ef899e6..ba68c923f8 100644
--- a/src/library/uri/uri.cpp
+++ b/src/library/uri/uri.cpp
@@ -1,8 +1,8 @@
 #include "uri.h"
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/util.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NUri {
     TState::EParsed TUri::CheckHost(const std::string_view& host) {
diff --git a/src/library/uri/uri.h b/src/library/uri/uri.h
index 48fda8a457..1734873897 100644
--- a/src/library/uri/uri.h
+++ b/src/library/uri/uri.h
@@ -5,11 +5,11 @@
 
 #include <src/library/charset/doccodes.h>
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/stream/mem.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cstdlib>
 
diff --git a/src/library/uri/uri_ut.cpp b/src/library/uri/uri_ut.cpp
index 58ec07ff73..43fe4cf56e 100644
--- a/src/library/uri/uri_ut.cpp
+++ b/src/library/uri/uri_ut.cpp
@@ -3,7 +3,7 @@
 #include "qargs.h"
 #include <src/library/html/entity/htmlentity.h>
 
-#include <src/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
 
 namespace NUri {
     Y_UNIT_TEST_SUITE(URLTest) {
diff --git a/src/library/uuid/uuid.cpp b/src/library/uuid/uuid.cpp
index 858c996546..e00ae9bfcd 100644
--- a/src/library/uuid/uuid.cpp
+++ b/src/library/uuid/uuid.cpp
@@ -1,6 +1,6 @@
 #include "uuid.h"
 
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 namespace NKikimr {
 namespace NUuid {
diff --git a/src/library/uuid/uuid.h b/src/library/uuid/uuid.h
index cd25c80136..da7512073c 100644
--- a/src/library/uuid/uuid.h
+++ b/src/library/uuid/uuid.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb-cpp-sdk/util/system/types.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cctype>
 #include <cstring>
diff --git a/src/library/yql/public/issue/yql_issue.cpp b/src/library/yql/public/issue/yql_issue.cpp
index 3f5241268e..cd6178e91c 100644
--- a/src/library/yql/public/issue/yql_issue.cpp
+++ b/src/library/yql/public/issue/yql_issue.cpp
@@ -6,10 +6,10 @@
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
 #include <src/util/charset/utf8.h>
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 #include <src/util/string/split.h>
-#include <src/util/string/strip.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <src/util/generic/stack.h>
 #include <cstdlib>
diff --git a/src/library/yql/public/issue/yql_issue_message.cpp b/src/library/yql/public/issue/yql_issue_message.cpp
index 63cd8bbbef..3de1cf9283 100644
--- a/src/library/yql/public/issue/yql_issue_message.cpp
+++ b/src/library/yql/public/issue/yql_issue_message.cpp
@@ -3,8 +3,8 @@
 #include <src/library/yql/public/issue/protos/issue_message.pb.h>
 #include <src/api/protos/ydb_issue_message.pb.h>
 
-#include <src/util/generic/yexception.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/string/join.h>
 
 #include <tuple>
diff --git a/src/library/yson/detail.h b/src/library/yson/detail.h
index 93998a74d6..d32932ba89 100644
--- a/src/library/yson/detail.h
+++ b/src/library/yson/detail.h
@@ -4,9 +4,9 @@
 #include "zigzag.h"
 
 #include <src/util/generic/buffer.h>
-#include <src/util/string/escape.h>
-#include <src/util/string/cast.h>
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 namespace NYson {
     namespace NDetail {
diff --git a/src/library/yson/json/json_writer.cpp b/src/library/yson/json/json_writer.cpp
index 11200f2028..38529d7cbb 100644
--- a/src/library/yson/json/json_writer.cpp
+++ b/src/library/yson/json/json_writer.cpp
@@ -1,7 +1,7 @@
 #include "json_writer.h"
 
 #include <src/library/json/json_writer.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYT {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/library/yson/lexer.cpp b/src/library/yson/lexer.cpp
index 349ab8f571..06fed63e00 100644
--- a/src/library/yson/lexer.cpp
+++ b/src/library/yson/lexer.cpp
@@ -2,7 +2,7 @@
 #include "lexer_detail.h"
 #include <ydb-cpp-sdk/library/yson/token.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NYson {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/library/yson/lexer.h b/src/library/yson/lexer.h
index 1c6ff3eb7f..f26191180f 100644
--- a/src/library/yson/lexer.h
+++ b/src/library/yson/lexer.h
@@ -3,7 +3,7 @@
 #include <ydb-cpp-sdk/library/yson/public.h>
 #include <ydb-cpp-sdk/library/yson/token.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NYson {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/library/yson/node/node.cpp b/src/library/yson/node/node.cpp
index 504c2e2637..64580c374a 100644
--- a/src/library/yson/node/node.cpp
+++ b/src/library/yson/node/node.cpp
@@ -5,7 +5,7 @@
 #include <ydb-cpp-sdk/library/yson/writer.h>
 
 #include <src/util/generic/overloaded.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <iostream>
 
diff --git a/src/library/yson/node/node_io.cpp b/src/library/yson/node/node_io.cpp
index 2a50cd32e4..7c2a3740e0 100644
--- a/src/library/yson/node/node_io.cpp
+++ b/src/library/yson/node/node_io.cpp
@@ -11,10 +11,10 @@
 #include <ydb-cpp-sdk/library/json/json_reader.h>
 #include <ydb-cpp-sdk/library/json/json_value.h>
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/str.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 namespace NYT {
 
diff --git a/src/library/yson/node/node_io_ut.cpp b/src/library/yson/node/node_io_ut.cpp
index 686be8d403..aff82febdf 100644
--- a/src/library/yson/node/node_io_ut.cpp
+++ b/src/library/yson/node/node_io_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 using namespace NYson;
 
diff --git a/src/library/yson/node/node_ut.cpp b/src/library/yson/node/node_ut.cpp
index 764e8058d8..3125c4a89f 100644
--- a/src/library/yson/node/node_ut.cpp
+++ b/src/library/yson/node/node_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 using namespace NYT;
 
diff --git a/src/library/yson/node/node_visitor.cpp b/src/library/yson/node/node_visitor.cpp
index a08678b8db..8b4293a9fd 100644
--- a/src/library/yson/node/node_visitor.cpp
+++ b/src/library/yson/node/node_visitor.cpp
@@ -1,6 +1,6 @@
 #include "node_visitor.h"
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 namespace NYT {
 
diff --git a/src/library/yson/parser.cpp b/src/library/yson/parser.cpp
index f0db53aaf5..d80ecb259a 100644
--- a/src/library/yson/parser.cpp
+++ b/src/library/yson/parser.cpp
@@ -3,7 +3,7 @@
 #include "format.h"
 #include "parser_detail.h"
 
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 #include <src/util/generic/buffer.h>
 
 namespace NYson {
diff --git a/src/library/yson/parser.h b/src/library/yson/parser.h
index b2739e5377..a30edfe2ec 100644
--- a/src/library/yson/parser.h
+++ b/src/library/yson/parser.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/library/yson/public.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class IInputStream;
 
diff --git a/src/library/yson/ut/yson_ut.cpp b/src/library/yson/ut/yson_ut.cpp
index acb12b20a7..8494de43a6 100644
--- a/src/library/yson/ut/yson_ut.cpp
+++ b/src/library/yson/ut/yson_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/gtest/gtest.h>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 using namespace NYson;
 
diff --git a/src/library/yson/varint.cpp b/src/library/yson/varint.cpp
index bf84da3660..221f70f797 100644
--- a/src/library/yson/varint.cpp
+++ b/src/library/yson/varint.cpp
@@ -2,7 +2,7 @@
 
 #include "zigzag.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 namespace NYson {
diff --git a/src/library/yson/varint.h b/src/library/yson/varint.h
index 7a3c8a9b30..3ed7a3a4ad 100644
--- a/src/library/yson/varint.h
+++ b/src/library/yson/varint.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 namespace NYson {
diff --git a/src/library/yson/writer.cpp b/src/library/yson/writer.cpp
index c7a7d629d6..bff189bc47 100644
--- a/src/library/yson/writer.cpp
+++ b/src/library/yson/writer.cpp
@@ -6,7 +6,7 @@
 #include "varint.h"
 #include "zigzag.h"
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <cmath>
 
diff --git a/src/library/yt/assert/assert.cpp b/src/library/yt/assert/assert.cpp
index 289b06c612..e26e75b169 100644
--- a/src/library/yt/assert/assert.cpp
+++ b/src/library/yt/assert/assert.cpp
@@ -1,6 +1,6 @@
 #include "assert.h"
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 
 namespace NYT::NDetail {
diff --git a/src/library/yt/assert/assert.h b/src/library/yt/assert/assert.h
index 810d5442e6..738c90adbb 100644
--- a/src/library/yt/assert/assert.h
+++ b/src/library/yt/assert/assert.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/src_root.h>
+#include <ydb-cpp-sdk/util/system/src_root.h>
 
 #include <string_view>
 
diff --git a/src/library/yt/coding/unittests/varint_ut.cpp b/src/library/yt/coding/unittests/varint_ut.cpp
index bd23301a84..149aebda20 100644
--- a/src/library/yt/coding/unittests/varint_ut.cpp
+++ b/src/library/yt/coding/unittests/varint_ut.cpp
@@ -2,9 +2,9 @@
 
 #include <src/library/yt/coding/varint.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <tuple>
 
diff --git a/src/library/yt/coding/varint.h b/src/library/yt/coding/varint.h
index d3e26771fc..a1db1b3c35 100644
--- a/src/library/yt/coding/varint.h
+++ b/src/library/yt/coding/varint.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 namespace NYT {
 
diff --git a/src/library/yt/memory/atomic_intrusive_ptr-inl.h b/src/library/yt/memory/atomic_intrusive_ptr-inl.h
index b67972e9fa..fc7f969a0d 100644
--- a/src/library/yt/memory/atomic_intrusive_ptr-inl.h
+++ b/src/library/yt/memory/atomic_intrusive_ptr-inl.h
@@ -5,7 +5,7 @@
 #endif
 #undef ATOMIC_INTRUSIVE_PTR_INL_H_
 
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 namespace NYT {
 
diff --git a/src/library/yt/memory/chunked_input_stream.h b/src/library/yt/memory/chunked_input_stream.h
index 6d82a35dcc..dd37150f96 100644
--- a/src/library/yt/memory/chunked_input_stream.h
+++ b/src/library/yt/memory/chunked_input_stream.h
@@ -2,7 +2,7 @@
 
 #include "ref.h"
 
-#include <src/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
 
 namespace NYT {
 
diff --git a/src/library/yt/memory/chunked_memory_pool_output.h b/src/library/yt/memory/chunked_memory_pool_output.h
index dcb3d70b20..13d773c218 100644
--- a/src/library/yt/memory/chunked_memory_pool_output.h
+++ b/src/library/yt/memory/chunked_memory_pool_output.h
@@ -3,7 +3,7 @@
 #include "public.h"
 #include "ref.h"
 
-#include <src/util/stream/zerocopy_output.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy_output.h>
 
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 
diff --git a/src/library/yt/memory/chunked_output_stream.h b/src/library/yt/memory/chunked_output_stream.h
index e8df666805..23b3fabe10 100644
--- a/src/library/yt/memory/chunked_output_stream.h
+++ b/src/library/yt/memory/chunked_output_stream.h
@@ -4,7 +4,7 @@
 
 #include <src/library/yt/memory/ref.h>
 
-#include <src/util/stream/zerocopy_output.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy_output.h>
 
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 
diff --git a/src/library/yt/memory/intrusive_ptr.h b/src/library/yt/memory/intrusive_ptr.h
index c555eaad4f..41955a0886 100644
--- a/src/library/yt/memory/intrusive_ptr.h
+++ b/src/library/yt/memory/intrusive_ptr.h
@@ -3,7 +3,7 @@
 #include "ref_counted.h"
 
 #include <src/util/generic/hash.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <utility>
 #include <type_traits>
diff --git a/src/library/yt/memory/serialize.h b/src/library/yt/memory/serialize.h
index b2d378c8b3..d4728e80e9 100644
--- a/src/library/yt/memory/serialize.h
+++ b/src/library/yt/memory/serialize.h
@@ -2,7 +2,7 @@
 
 #include "intrusive_ptr.h"
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/library/yt/memory/shared_range.h b/src/library/yt/memory/shared_range.h
index 3d04ef51d0..ea9b6667ac 100644
--- a/src/library/yt/memory/shared_range.h
+++ b/src/library/yt/memory/shared_range.h
@@ -7,7 +7,7 @@
 
 #include <src/library/yt/assert/assert.h>
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 #include <optional>
 
diff --git a/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp b/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp
index e26ebe2724..76db7cc20f 100644
--- a/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp
+++ b/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp
@@ -1,4 +1,4 @@
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <src/library/testing/gtest/gtest.h>
 
diff --git a/src/library/yt/memory/unittests/free_list_ut.cpp b/src/library/yt/memory/unittests/free_list_ut.cpp
index ba500c8ba6..308f49ead7 100644
--- a/src/library/yt/memory/unittests/free_list_ut.cpp
+++ b/src/library/yt/memory/unittests/free_list_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/yt/memory/free_list.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <thread>
 #include <stack>
diff --git a/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp b/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp
index 8528d94fb6..3e8b8e81b4 100644
--- a/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp
+++ b/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp
@@ -8,7 +8,7 @@
 
 #include <src/util/stream/buffer.h>
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 namespace NYT {
 namespace {
diff --git a/src/library/yt/misc/arcadia_enum-inl.h b/src/library/yt/misc/arcadia_enum-inl.h
index 33e4c5eb49..42d7244e1b 100644
--- a/src/library/yt/misc/arcadia_enum-inl.h
+++ b/src/library/yt/misc/arcadia_enum-inl.h
@@ -5,7 +5,7 @@
 #include "arcadia_enum.h"
 #endif
 
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 namespace NYT::NDetail {
 
diff --git a/src/library/yt/misc/cast-inl.h b/src/library/yt/misc/cast-inl.h
index 172726f2bd..fe1b753df6 100644
--- a/src/library/yt/misc/cast-inl.h
+++ b/src/library/yt/misc/cast-inl.h
@@ -6,9 +6,9 @@
 
 #include <ydb-cpp-sdk/library/yt/misc/enum.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <concepts>
 #include <format>
diff --git a/src/library/yt/misc/guid.cpp b/src/library/yt/misc/guid.cpp
index 2d2e1abdb8..c116c32d90 100644
--- a/src/library/yt/misc/guid.cpp
+++ b/src/library/yt/misc/guid.cpp
@@ -1,7 +1,7 @@
 #include "guid.h"
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <cstring>
 #include <format>
diff --git a/src/library/yt/misc/guid.h b/src/library/yt/misc/guid.h
index 8c7c1defd0..ddd28e2dba 100644
--- a/src/library/yt/misc/guid.h
+++ b/src/library/yt/misc/guid.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 #include <ydb-cpp-sdk/library/yt/exception/exception.h>
diff --git a/src/library/yt/misc/hash.h b/src/library/yt/misc/hash.h
index addfa1afa7..7dfba7bb4d 100644
--- a/src/library/yt/misc/hash.h
+++ b/src/library/yt/misc/hash.h
@@ -2,7 +2,7 @@
 
 #include <src/util/generic/hash.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 namespace NYT {
 
diff --git a/src/library/yt/misc/strong_typedef-inl.h b/src/library/yt/misc/strong_typedef-inl.h
index c2a7e647b3..240f077fa9 100644
--- a/src/library/yt/misc/strong_typedef-inl.h
+++ b/src/library/yt/misc/strong_typedef-inl.h
@@ -4,8 +4,8 @@
 #include "strong_typedef.h"
 #endif
 
-#include <src/util/stream/output.h>
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 #include "wrapper_traits.h"
 
diff --git a/src/library/yt/small_containers/unittests/compact_vector_ut.cpp b/src/library/yt/small_containers/unittests/compact_vector_ut.cpp
index 3c2681c52c..612fae5d0a 100644
--- a/src/library/yt/small_containers/unittests/compact_vector_ut.cpp
+++ b/src/library/yt/small_containers/unittests/compact_vector_ut.cpp
@@ -16,7 +16,7 @@
 
 #include <src/library/testing/gtest/gtest.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <algorithm>
 #include <list>
diff --git a/src/library/yt/string/guid.h b/src/library/yt/string/guid.h
index 668f411358..85e6c5837d 100644
--- a/src/library/yt/string/guid.h
+++ b/src/library/yt/string/guid.h
@@ -1,4 +1,4 @@
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <src/library/yt/misc/guid.h>
 
diff --git a/src/library/yt/string/string.cpp b/src/library/yt/string/string.cpp
index 2b2631ea3b..9fec6aec1d 100644
--- a/src/library/yt/string/string.cpp
+++ b/src/library/yt/string/string.cpp
@@ -5,7 +5,7 @@
 
 #include <src/util/generic/hash.h>
 
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 namespace NYT {
 
diff --git a/src/library/yt/string/string.h b/src/library/yt/string/string.h
index 8f3cf46561..a33cf25d6f 100644
--- a/src/library/yt/string/string.h
+++ b/src/library/yt/string/string.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <vector>
 #include <set>
diff --git a/src/library/yt/string/string_builder.h b/src/library/yt/string/string_builder.h
index a883c6fd8d..5107d6a8b2 100644
--- a/src/library/yt/string/string_builder.h
+++ b/src/library/yt/string/string_builder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <string>
 
diff --git a/src/library/yt/yson_string/convert.cpp b/src/library/yt/yson_string/convert.cpp
index d8b7de06bf..38b3083824 100644
--- a/src/library/yt/yson_string/convert.cpp
+++ b/src/library/yt/yson_string/convert.cpp
@@ -11,7 +11,7 @@
 
 #include <array>
 
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 namespace NYT::NYson {
 
diff --git a/src/util/charset/unicode_table.h b/src/util/charset/unicode_table.h
index a7e9ac57a9..81c2bbef52 100644
--- a/src/util/charset/unicode_table.h
+++ b/src/util/charset/unicode_table.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
diff --git a/src/util/charset/utf8.h b/src/util/charset/utf8.h
index 86d830d6f2..b7109926af 100644
--- a/src/util/charset/utf8.h
+++ b/src/util/charset/utf8.h
@@ -2,10 +2,10 @@
 
 #include "recode_result.h"
 
-#include <src/util/generic/yexception.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 extern const wchar32 BROKEN_RUNE;
 
diff --git a/src/util/charset/utf8_ut.cpp b/src/util/charset/utf8_ut.cpp
index 4106fa86de..b3765b7bf1 100644
--- a/src/util/charset/utf8_ut.cpp
+++ b/src/util/charset/utf8_ut.cpp
@@ -2,7 +2,7 @@
 #include "wide.h"
 
 #include <src/util/stream/file.h>
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/testing/unittest/env.h>
diff --git a/src/util/charset/wide.cpp b/src/util/charset/wide.cpp
index e9b9625db0..e47073aab8 100644
--- a/src/util/charset/wide.cpp
+++ b/src/util/charset/wide.cpp
@@ -1,7 +1,7 @@
 #include "wide.h"
 
 #include <src/util/generic/mem_copy.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 namespace {
     //! the constants are not zero-terminated
diff --git a/src/util/charset/wide.h b/src/util/charset/wide.h
index 98e9619844..72221fe78c 100644
--- a/src/util/charset/wide.h
+++ b/src/util/charset/wide.h
@@ -5,13 +5,13 @@
 #include "utf8.h"
 #include "wide_specific.h"
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <src/util/system/cpu_id.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cstring>
 
diff --git a/src/util/charset/wide_specific.h b/src/util/charset/wide_specific.h
index d1507cec19..770d749365 100644
--- a/src/util/charset/wide_specific.h
+++ b/src/util/charset/wide_specific.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/types.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 inline constexpr bool IsW16SurrogateLead(wchar16 c) noexcept {
     return 0xD800 <= c && c <= 0xDBFF;
diff --git a/src/util/datetime/base.cpp b/src/util/datetime/base.cpp
index 27283cbafd..37f562308f 100644
--- a/src/util/datetime/base.cpp
+++ b/src/util/datetime/base.cpp
@@ -1,11 +1,11 @@
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/mem.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <src/util/system/datetime.h>
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 
 std::string Strftime(const char* format, const struct tm* tm) {
     size_t size = Max<size_t>(strlen(format) * 2 + 1, 107);
diff --git a/src/util/datetime/base_ut.cpp b/src/util/datetime/base_ut.cpp
index daaf299d86..6934daaa3e 100644
--- a/src/util/datetime/base_ut.cpp
+++ b/src/util/datetime/base_ut.cpp
@@ -2,13 +2,13 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 #include <src/util/generic/ymath.h>
-#include <src/util/string/cast.h>
-#include <src/util/stream/output.h>
-#include <src/util/system/compat.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <climits>
 
diff --git a/src/util/datetime/cputimer.cpp b/src/util/datetime/cputimer.cpp
index 2452def884..f5b782d400 100644
--- a/src/util/datetime/cputimer.cpp
+++ b/src/util/datetime/cputimer.cpp
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <src/util/system/hp_timer.h>
-#include <src/util/stream/output.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <iostream>
 
diff --git a/src/util/datetime/strptime.cpp b/src/util/datetime/strptime.cpp
index f1ef2566fb..ad1c289f77 100644
--- a/src/util/datetime/strptime.cpp
+++ b/src/util/datetime/strptime.cpp
@@ -54,7 +54,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include "systime.h"
 #ifdef _win32_
     #ifndef lint
diff --git a/src/util/datetime/systime.cpp b/src/util/datetime/systime.cpp
index e1ba089b0e..b905f87300 100644
--- a/src/util/datetime/systime.cpp
+++ b/src/util/datetime/systime.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/util/datetime/systime.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #ifdef _win_
diff --git a/src/util/datetime/uptime.cpp b/src/util/datetime/uptime.cpp
index 68f3b8575f..7bb3bef0c6 100644
--- a/src/util/datetime/uptime.cpp
+++ b/src/util/datetime/uptime.cpp
@@ -1,10 +1,10 @@
 #include "uptime.h"
 
 #if defined(_win_)
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
 #elif defined(_linux_)
     #include <src/util/stream/file.h>
-    #include <src/util/string/cast.h>
+    #include <ydb-cpp-sdk/util/string/cast.h>
 #elif defined(_darwin_)
     #include <sys/sysctl.h>
 #endif
diff --git a/src/util/digest/city.cpp b/src/util/digest/city.cpp
index bf5d1ac6cc..f47dc827c8 100644
--- a/src/util/digest/city.cpp
+++ b/src/util/digest/city.cpp
@@ -33,8 +33,8 @@ using uint8 = ui8;
 using uint32 = ui32;
 using uint64 = ui64;
 
-#include <src/util/system/unaligned_mem.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 using namespace std;
 
diff --git a/src/util/digest/city.h b/src/util/digest/city.h
index 2f5d6ffa88..07bfd218a7 100644
--- a/src/util/digest/city.h
+++ b/src/util/digest/city.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <string_view>
 #include <utility>
diff --git a/src/util/digest/multi.cpp b/src/util/digest/multi.cpp
index e4a59f0e67..fac1fd9062 100644
--- a/src/util/digest/multi.cpp
+++ b/src/util/digest/multi.cpp
@@ -1 +1 @@
-#include "multi.h"
+#include <ydb-cpp-sdk/util/digest/multi.h>
diff --git a/src/util/digest/multi_ut.cpp b/src/util/digest/multi_ut.cpp
index 29ef04b43a..5bf54d3d8c 100644
--- a/src/util/digest/multi_ut.cpp
+++ b/src/util/digest/multi_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 class TMultiHashTest: public TTestBase {
     UNIT_TEST_SUITE(TMultiHashTest);
diff --git a/src/util/digest/murmur.cpp b/src/util/digest/murmur.cpp
index f73936005e..4ac2d8bdfb 100644
--- a/src/util/digest/murmur.cpp
+++ b/src/util/digest/murmur.cpp
@@ -1,6 +1,6 @@
 #include "murmur.h"
 
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 
 namespace NMurmurPrivate {
     //-----------------------------------------------------------------------------
diff --git a/src/util/digest/numeric.cpp b/src/util/digest/numeric.cpp
index d4d3f063fa..3c463771e2 100644
--- a/src/util/digest/numeric.cpp
+++ b/src/util/digest/numeric.cpp
@@ -1 +1 @@
-#include "numeric.h"
+#include <ydb-cpp-sdk/util/digest/numeric.h>
diff --git a/src/util/digest/sequence.cpp b/src/util/digest/sequence.cpp
index 5ab731f9bd..64d95f69de 100644
--- a/src/util/digest/sequence.cpp
+++ b/src/util/digest/sequence.cpp
@@ -1 +1 @@
-#include "sequence.h"
+#include <ydb-cpp-sdk/util/digest/sequence.h>
diff --git a/src/util/folder/dirent_win.h b/src/util/folder/dirent_win.h
index 9238f6599e..36ad554ed9 100644
--- a/src/util/folder/dirent_win.h
+++ b/src/util/folder/dirent_win.h
@@ -4,7 +4,7 @@
 
 #ifdef _win_
 
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
 
     #ifdef __cplusplus
 extern "C" {
diff --git a/src/util/folder/dirut.cpp b/src/util/folder/dirut.cpp
index 541150c2b5..0b5b5c8d01 100644
--- a/src/util/folder/dirut.cpp
+++ b/src/util/folder/dirut.cpp
@@ -5,11 +5,11 @@
 #include "pathsplit.h"
 #include "path.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <src/util/system/fs.h>
-#include <src/util/system/maxlen.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NStringPrivate {
     template <class TCharType>
diff --git a/src/util/folder/dirut.h b/src/util/folder/dirut.h
index 173f36b003..09b66a7dd9 100644
--- a/src/util/folder/dirut.h
+++ b/src/util/folder/dirut.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/sysstat.h>
+#include <ydb-cpp-sdk/util/system/sysstat.h>
 #include <src/util/system/fs.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <sys/types.h>
 
@@ -11,7 +11,7 @@
 #include <cstdlib>
 
 #ifdef _win32_
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
     #include <direct.h>
     #include <malloc.h>
     #include <time.h>
diff --git a/src/util/folder/dirut_ut.cpp b/src/util/folder/dirut_ut.cpp
index 47d1d7a0c0..212a5e2ca8 100644
--- a/src/util/folder/dirut_ut.cpp
+++ b/src/util/folder/dirut_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include <src/util/stream/file.h>
 
 Y_UNIT_TEST_SUITE(TDirutTest) {
diff --git a/src/util/folder/filelist.h b/src/util/folder/filelist.h
index 28c3d9d4e5..65d3c31e18 100644
--- a/src/util/folder/filelist.h
+++ b/src/util/folder/filelist.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
 
 #include <string>
 
diff --git a/src/util/folder/filelist_ut.cpp b/src/util/folder/filelist_ut.cpp
index bacff7a92a..9c6e94cdb0 100644
--- a/src/util/folder/filelist_ut.cpp
+++ b/src/util/folder/filelist_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 
 class TFileListTest: public TTestBase {
     UNIT_TEST_SUITE(TFileListTest);
diff --git a/src/util/folder/fts.cpp b/src/util/folder/fts.cpp
index 05d556fb6a..38833c7d78 100644
--- a/src/util/folder/fts.cpp
+++ b/src/util/folder/fts.cpp
@@ -33,11 +33,11 @@
  * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
  */
 
-#include <src/util/memory/tempbuf.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/error.h>
 
 #include <stdlib.h>
 #ifndef _win_
diff --git a/src/util/folder/fts_ut.cpp b/src/util/folder/fts_ut.cpp
index a98b852a9f..4dd66223e6 100644
--- a/src/util/folder/fts_ut.cpp
+++ b/src/util/folder/fts_ut.cpp
@@ -5,7 +5,7 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/threading/future/async.h>
 
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/tempfile.h>
 
 class TFtsTest: public TTestBase {
diff --git a/src/util/folder/iterator.h b/src/util/folder/iterator.h
index 648026fe69..98ebe9c04f 100644
--- a/src/util/folder/iterator.h
+++ b/src/util/folder/iterator.h
@@ -2,10 +2,10 @@
 
 #include "fts.h"
 
-#include <src/util/system/error.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/iterator.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
 #include <string>
diff --git a/src/util/folder/iterator_ut.cpp b/src/util/folder/iterator_ut.cpp
index 150f16a2fe..0be1f64455 100644
--- a/src/util/folder/iterator_ut.cpp
+++ b/src/util/folder/iterator_ut.cpp
@@ -4,9 +4,9 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/system/fs.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/generic/hash.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/random/mersenne.h>
 
 static std::string JoinWithNewline(const std::vector<std::string>& strings) {
diff --git a/src/util/folder/lstat_win.c b/src/util/folder/lstat_win.c
index e88168dcfd..fd65cd9831 100644
--- a/src/util/folder/lstat_win.c
+++ b/src/util/folder/lstat_win.c
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #ifdef _win_
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
     #include "lstat_win.h"
 
 int lstat(const char* fileName, stat_struct* fileStat) {
diff --git a/src/util/folder/path.cpp b/src/util/folder/path.cpp
index e0dfe17778..8b3c43c88b 100644
--- a/src/util/folder/path.cpp
+++ b/src/util/folder/path.cpp
@@ -2,11 +2,11 @@
 #include "path.h"
 #include "pathsplit.h"
 
-#include <src/util/generic/yexception.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/system/fs.h>
 
 struct TFsPath::TSplit: public TAtomicRefCount<TSplit>, public TPathSplit {
diff --git a/src/util/folder/path.h b/src/util/folder/path.h
index 1f6297365e..37a8877dcd 100644
--- a/src/util/folder/path.h
+++ b/src/util/folder/path.h
@@ -3,12 +3,12 @@
 #include "fwd.h"
 #include "pathsplit.h"
 
-#include <src/util/generic/ptr.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/system/fstat.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
-#include <src/util/system/sysstat.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/sysstat.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <utility>
 
diff --git a/src/util/folder/path_ut.cpp b/src/util/folder/path_ut.cpp
index 0e70f9f84c..fd4c7c5278 100644
--- a/src/util/folder/path_ut.cpp
+++ b/src/util/folder/path_ut.cpp
@@ -7,8 +7,8 @@
 
 #include <src/util/generic/scope.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
-#include <src/util/system/yassert.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/file.h>
 #include <src/util/system/fs.h>
 
diff --git a/src/util/folder/pathsplit.cpp b/src/util/folder/pathsplit.cpp
index 0092c06d5f..3151810324 100644
--- a/src/util/folder/pathsplit.cpp
+++ b/src/util/folder/pathsplit.cpp
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
-#include <src/util/stream/output.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 template <class T>
 static inline size_t ToReserve(const T& t) {
diff --git a/src/util/folder/pathsplit.h b/src/util/folder/pathsplit.h
index d282cde550..030bd32e43 100644
--- a/src/util/folder/pathsplit.h
+++ b/src/util/folder/pathsplit.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 #include <vector>
 
diff --git a/src/util/folder/tempdir.cpp b/src/util/folder/tempdir.cpp
index a2b5789d81..4925544f51 100644
--- a/src/util/folder/tempdir.cpp
+++ b/src/util/folder/tempdir.cpp
@@ -3,7 +3,7 @@
 #include "dirut.h"
 
 #include <src/util/system/fs.h>
-#include <src/util/system/maxlen.h>
+#include <ydb-cpp-sdk/util/system/maxlen.h>
 
 TTempDir::TTempDir()
     : TTempDir(nullptr, TCreationToken{})
diff --git a/src/util/generic/adaptor.h b/src/util/generic/adaptor.h
index 3041c0217d..7ca23275b4 100644
--- a/src/util/generic/adaptor.h
+++ b/src/util/generic/adaptor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "store_policy.h"
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 
 namespace NPrivate {
diff --git a/src/util/generic/adaptor_ut.cpp b/src/util/generic/adaptor_ut.cpp
index 2a013e974d..c0832a5ec7 100644
--- a/src/util/generic/adaptor_ut.cpp
+++ b/src/util/generic/adaptor_ut.cpp
@@ -1,5 +1,5 @@
 #include "adaptor.h"
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <src/library/testing/unittest/registar.h>
 
diff --git a/src/util/generic/algorithm.cpp b/src/util/generic/algorithm.cpp
index d89586737e..6436dc90d1 100644
--- a/src/util/generic/algorithm.cpp
+++ b/src/util/generic/algorithm.cpp
@@ -1 +1 @@
-#include "algorithm.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
diff --git a/src/util/generic/algorithm_ut.cpp b/src/util/generic/algorithm_ut.cpp
index 15d6d4741c..7efc237a53 100644
--- a/src/util/generic/algorithm_ut.cpp
+++ b/src/util/generic/algorithm_ut.cpp
@@ -1,6 +1,6 @@
 #include <src/library/testing/unittest/registar.h>
 
-#include "algorithm.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include "hash.h"
 #include "hash_multi_map.h"
 #include "string.h"
diff --git a/src/util/generic/bitmap.h b/src/util/generic/bitmap.h
index f5198b60df..07198d4484 100644
--- a/src/util/generic/bitmap.h
+++ b/src/util/generic/bitmap.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "fwd.h"
-#include "ptr.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include "bitops.h"
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "algorithm.h"
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/str_stl.h>
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 namespace NBitMapPrivate {
     // Returns number of bits set; result is in most significatnt byte
diff --git a/src/util/generic/bitops.h b/src/util/generic/bitops.h
index 68c6f6621c..7b42f7ed1f 100644
--- a/src/util/generic/bitops.h
+++ b/src/util/generic/bitops.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include "typelist.h"
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #ifdef _MSC_VER
     #include <intrin.h>
diff --git a/src/util/generic/bitops_ut.cpp b/src/util/generic/bitops_ut.cpp
index 3a02a0c43b..5baf794d87 100644
--- a/src/util/generic/bitops_ut.cpp
+++ b/src/util/generic/bitops_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 template <typename T>
 static void TestCTZ() {
diff --git a/src/util/generic/bt_exception.cpp b/src/util/generic/bt_exception.cpp
index 609870c4c0..a64278721d 100644
--- a/src/util/generic/bt_exception.cpp
+++ b/src/util/generic/bt_exception.cpp
@@ -1 +1 @@
-#include "bt_exception.h"
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
diff --git a/src/util/generic/buffer.h b/src/util/generic/buffer.h
index 581e0e82d3..a8e1ff72c8 100644
--- a/src/util/generic/buffer.h
+++ b/src/util/generic/buffer.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <src/util/system/align.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <cstring>
 
diff --git a/src/util/generic/cast.cpp b/src/util/generic/cast.cpp
index 11f82364d3..2e46cd4a39 100644
--- a/src/util/generic/cast.cpp
+++ b/src/util/generic/cast.cpp
@@ -1 +1 @@
-#include "cast.h"
+#include <ydb-cpp-sdk/util/generic/cast.h>
diff --git a/src/util/generic/fastqueue.h b/src/util/generic/fastqueue.h
index 76d598a418..f7129c47c1 100644
--- a/src/util/generic/fastqueue.h
+++ b/src/util/generic/fastqueue.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <src/util/memory/smallobj.h>
-#include "ptr.h"
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 template <class T>
 class TFastQueue {
diff --git a/src/util/generic/flags.cpp b/src/util/generic/flags.cpp
index ae923eb33c..f56bce672b 100644
--- a/src/util/generic/flags.cpp
+++ b/src/util/generic/flags.cpp
@@ -1,7 +1,7 @@
-#include "flags.h"
+#include <ydb-cpp-sdk/util/generic/flags.h>
 
 #include <src/util/stream/format.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 void ::NPrivate::PrintFlags(IOutputStream& stream, ui64 value, size_t size) {
     /* Note that this function is in cpp because we need to break circular
diff --git a/src/util/generic/function.cpp b/src/util/generic/function.cpp
index d4b693e3fa..91b70d9eb7 100644
--- a/src/util/generic/function.cpp
+++ b/src/util/generic/function.cpp
@@ -1 +1 @@
-#include "function.h"
+#include <ydb-cpp-sdk/util/generic/function.h>
diff --git a/src/util/generic/function_ref.h b/src/util/generic/function_ref.h
index f20307c023..17cb90a06f 100644
--- a/src/util/generic/function_ref.h
+++ b/src/util/generic/function_ref.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/function.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/function.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #include <functional>
 
diff --git a/src/util/generic/fwd.cpp b/src/util/generic/fwd.cpp
index 4214b6df83..0a8e9bb678 100644
--- a/src/util/generic/fwd.cpp
+++ b/src/util/generic/fwd.cpp
@@ -1 +1 @@
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
diff --git a/src/util/generic/guid.cpp b/src/util/generic/guid.cpp
index d9e310dc9e..cb68633ba8 100644
--- a/src/util/generic/guid.cpp
+++ b/src/util/generic/guid.cpp
@@ -3,10 +3,10 @@
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
-#include <src/util/string/ascii.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/util/stream/format.h>
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 #include <src/util/random/easy.h>
 
 namespace {
diff --git a/src/util/generic/guid.h b/src/util/generic/guid.h
index 269b326a2f..d05509800d 100644
--- a/src/util/generic/guid.h
+++ b/src/util/generic/guid.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 /**
  * UUID generation
diff --git a/src/util/generic/hash.h b/src/util/generic/hash.h
index 8b4666f566..bd5e1442d9 100644
--- a/src/util/generic/hash.h
+++ b/src/util/generic/hash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include "hash_table.h"
 
diff --git a/src/util/generic/hash_multi_map.h b/src/util/generic/hash_multi_map.h
index 6b027073cb..edc25092f4 100644
--- a/src/util/generic/hash_multi_map.h
+++ b/src/util/generic/hash_multi_map.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include "hash_table.h"
 
 template <class Key, class T, class HashFcn, class EqualKey, class Alloc>
diff --git a/src/util/generic/hash_primes.cpp b/src/util/generic/hash_primes.cpp
index 4c259124e4..848bb84ef6 100644
--- a/src/util/generic/hash_primes.cpp
+++ b/src/util/generic/hash_primes.cpp
@@ -1,6 +1,6 @@
 #include "hash_primes.h"
 #include <ydb-cpp-sdk/util/generic/array_size.h>
-#include "algorithm.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 /// Order of fields: reciprocal, reciprocal shift, adjacent hint, divisor
 #if defined(_32_)
diff --git a/src/util/generic/hash_primes_ut.cpp b/src/util/generic/hash_primes_ut.cpp
index bbd85c7553..ec26489381 100644
--- a/src/util/generic/hash_primes_ut.cpp
+++ b/src/util/generic/hash_primes_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/generic/vector.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/util/random/fast.h>
 
 Y_UNIT_TEST_SUITE(TestHashPrimes) {
diff --git a/src/util/generic/hash_table.cpp b/src/util/generic/hash_table.cpp
index 0aa2589200..6f1e965839 100644
--- a/src/util/generic/hash_table.cpp
+++ b/src/util/generic/hash_table.cpp
@@ -1,7 +1,7 @@
 #include "hash_table.h"
 
-#include <src/util/string/escape.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 const void* const _yhashtable_empty_data[] = {(void*)3, nullptr, (void*)1};
 
diff --git a/src/util/generic/hash_table.h b/src/util/generic/hash_table.h
index 81217d0761..d400201626 100644
--- a/src/util/generic/hash_table.h
+++ b/src/util/generic/hash_table.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include "mapfindptr.h"
 
-#include <src/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/type_name.h>
-#include <src/util/system/yassert.h>
-#include <src/util/str_stl.h>
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <algorithm>
 #include <initializer_list>
diff --git a/src/util/generic/hash_ut.cpp b/src/util/generic/hash_ut.cpp
index cf64e54180..227a5d81a7 100644
--- a/src/util/generic/hash_ut.cpp
+++ b/src/util/generic/hash_ut.cpp
@@ -6,8 +6,8 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <utility>
-#include <src/util/str_stl.h>
-#include <src/util/digest/multi.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
+#include <ydb-cpp-sdk/util/digest/multi.h>
 
 static const char star = 42;
 
diff --git a/src/util/generic/intrlist.h b/src/util/generic/intrlist.h
index 46ea944e02..337ef45d6f 100644
--- a/src/util/generic/intrlist.h
+++ b/src/util/generic/intrlist.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <iterator>
 
 struct TIntrusiveListDefaultTag {};
diff --git a/src/util/generic/intrlist_ut.cpp b/src/util/generic/intrlist_ut.cpp
index 84f0bca4af..e4a9216eff 100644
--- a/src/util/generic/intrlist_ut.cpp
+++ b/src/util/generic/intrlist_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 class TListTest: public TTestBase {
     UNIT_TEST_SUITE(TListTest);
diff --git a/src/util/generic/is_in.cpp b/src/util/generic/is_in.cpp
index 4edfd1fe10..fd7e2859c1 100644
--- a/src/util/generic/is_in.cpp
+++ b/src/util/generic/is_in.cpp
@@ -1 +1 @@
-#include "is_in.h"
+#include <ydb-cpp-sdk/util/generic/is_in.h>
diff --git a/src/util/generic/is_in_ut.cpp b/src/util/generic/is_in_ut.cpp
index 0e08e768cb..e9d6b10343 100644
--- a/src/util/generic/is_in_ut.cpp
+++ b/src/util/generic/is_in_ut.cpp
@@ -1,6 +1,6 @@
 #include <src/library/testing/unittest/registar.h>
 
-#include "algorithm.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include "hash.h"
 #include "hash_multi_map.h"
 #include "is_in.h"
diff --git a/src/util/generic/iterator_range.cpp b/src/util/generic/iterator_range.cpp
index bd8d7ff81b..d494744c3f 100644
--- a/src/util/generic/iterator_range.cpp
+++ b/src/util/generic/iterator_range.cpp
@@ -1 +1 @@
-#include "iterator_range.h"
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
diff --git a/src/util/generic/iterator_range_ut.cpp b/src/util/generic/iterator_range_ut.cpp
index b42878ea82..75bf4a81fc 100644
--- a/src/util/generic/iterator_range_ut.cpp
+++ b/src/util/generic/iterator_range_ut.cpp
@@ -1,7 +1,7 @@
-#include "iterator_range.h"
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
 
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/generic/vector.h>
 
 Y_UNIT_TEST_SUITE(IteratorRange) {
diff --git a/src/util/generic/lazy_value.h b/src/util/generic/lazy_value.h
index c3a8eb2600..fa9f1c33b5 100644
--- a/src/util/generic/lazy_value.h
+++ b/src/util/generic/lazy_value.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "function.h"
+#include <ydb-cpp-sdk/util/generic/function.h>
 
 template <class T>
 class TLazyValueBase {
diff --git a/src/util/generic/mapfindptr.h b/src/util/generic/mapfindptr.h
index 3b1a5d2625..926467bf30 100644
--- a/src/util/generic/mapfindptr.h
+++ b/src/util/generic/mapfindptr.h
@@ -27,6 +27,12 @@ inline auto MapFindPtr(const Map& map Y_LIFETIME_BOUND, const K& key) {
     return (i == map.end() ? nullptr : &i->second);
 }
 
+template <class Map, class K, class DefaultValue>
+inline auto MapValue(const Map& map Y_LIFETIME_BOUND, const K& key, DefaultValue&& defaultValue) {
+    auto found = MapFindPtr(map, key);
+    return found ? *found : std::forward<DefaultValue>(defaultValue);
+}
+
 /** helper for THashMap/TMap */
 template <class Derived>
 struct TMapOps {
@@ -42,8 +48,7 @@ struct TMapOps {
 
     template <class K, class DefaultValue>
     inline auto Value(const K& key, DefaultValue&& defaultValue) const {
-        auto found = FindPtr(key);
-        return found ? *found : std::forward<DefaultValue>(defaultValue);
+        return MapValue(key, defaultValue);
     }
 
     template <class K, class V>
diff --git a/src/util/generic/noncopyable.cpp b/src/util/generic/noncopyable.cpp
index a614dca34f..9a7fc4c502 100644
--- a/src/util/generic/noncopyable.cpp
+++ b/src/util/generic/noncopyable.cpp
@@ -1 +1 @@
-#include "noncopyable.h"
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
diff --git a/src/util/generic/overloaded_ut.cpp b/src/util/generic/overloaded_ut.cpp
index ed0761e914..1ab27b98bc 100644
--- a/src/util/generic/overloaded_ut.cpp
+++ b/src/util/generic/overloaded_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/generic/variant.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 #include <tuple>
 
diff --git a/src/util/generic/ptr.cpp b/src/util/generic/ptr.cpp
index 8b41a1f46e..3992cd0100 100644
--- a/src/util/generic/ptr.cpp
+++ b/src/util/generic/ptr.cpp
@@ -1,7 +1,7 @@
-#include "ptr.h"
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 
 #include <new>
 #include <cstdlib>
diff --git a/src/util/generic/ptr_ut.cpp b/src/util/generic/ptr_ut.cpp
index 6f690dc14f..be8a95d4c7 100644
--- a/src/util/generic/ptr_ut.cpp
+++ b/src/util/generic/ptr_ut.cpp
@@ -1,4 +1,4 @@
-#include "ptr.h"
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include "vector.h"
 #include "noncopyable.h"
 
diff --git a/src/util/generic/refcount.cpp b/src/util/generic/refcount.cpp
index 4174858ff9..89f7c5b539 100644
--- a/src/util/generic/refcount.cpp
+++ b/src/util/generic/refcount.cpp
@@ -1 +1 @@
-#include "refcount.h"
+#include <ydb-cpp-sdk/util/generic/refcount.h>
diff --git a/src/util/generic/scope_ut.cpp b/src/util/generic/scope_ut.cpp
index 93c43bf823..566dbb5623 100644
--- a/src/util/generic/scope_ut.cpp
+++ b/src/util/generic/scope_ut.cpp
@@ -1,6 +1,6 @@
 #include "scope.h"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/library/testing/unittest/registar.h>
 
 Y_UNIT_TEST_SUITE(ScopeToolsTest) {
diff --git a/src/util/generic/set.h b/src/util/generic/set.h
index aa401cdfce..e19fbad265 100644
--- a/src/util/generic/set.h
+++ b/src/util/generic/set.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
-#include <src/util/str_stl.h>
-#include <src/util/memory/alloc.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 
 #include <initializer_list>
 #include <memory>
diff --git a/src/util/generic/singleton.cpp b/src/util/generic/singleton.cpp
index 5ef4405d96..ff18e7fa4b 100644
--- a/src/util/generic/singleton.cpp
+++ b/src/util/generic/singleton.cpp
@@ -1,6 +1,6 @@
-#include "singleton.h"
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 #include <src/util/system/thread.h>
 #include <src/util/system/sanitizers.h>
 
diff --git a/src/util/generic/stack.h b/src/util/generic/stack.h
index d45bfbfb48..aa5032cce7 100644
--- a/src/util/generic/stack.h
+++ b/src/util/generic/stack.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <deque>
 
 #include <stack>
diff --git a/src/util/generic/store_policy.cpp b/src/util/generic/store_policy.cpp
index bd445c891f..052cd36ec5 100644
--- a/src/util/generic/store_policy.cpp
+++ b/src/util/generic/store_policy.cpp
@@ -1 +1 @@
-#include "store_policy.h"
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
diff --git a/src/util/generic/string_transparent_hash_ut.cpp b/src/util/generic/string_transparent_hash_ut.cpp
index b919fb3141..cd6e2413e3 100644
--- a/src/util/generic/string_transparent_hash_ut.cpp
+++ b/src/util/generic/string_transparent_hash_ut.cpp
@@ -4,7 +4,7 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/library/containers/absl_flat_hash/flat_hash_set.h>
 
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 Y_UNIT_TEST_SUITE(StringHashFunctorTests) {
     Y_UNIT_TEST(TestTransparencyWithUnorderedSet) {
diff --git a/src/util/generic/typelist.cpp b/src/util/generic/typelist.cpp
index 275b565ddb..d79309f99e 100644
--- a/src/util/generic/typelist.cpp
+++ b/src/util/generic/typelist.cpp
@@ -1,4 +1,4 @@
-#include "typelist.h"
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 
 static_assert(
     TSignedInts::THave<char>::value,
diff --git a/src/util/generic/typelist_ut.cpp b/src/util/generic/typelist_ut.cpp
index 1f825a7b66..b43f8487e7 100644
--- a/src/util/generic/typelist_ut.cpp
+++ b/src/util/generic/typelist_ut.cpp
@@ -1,5 +1,5 @@
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 #include "typelist.h"
 #include "vector.h"
diff --git a/src/util/generic/utility.cpp b/src/util/generic/utility.cpp
index e1ed101c76..24ce0b1304 100644
--- a/src/util/generic/utility.cpp
+++ b/src/util/generic/utility.cpp
@@ -1,4 +1,4 @@
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #ifdef _MSC_VER
     #include <Windows.h>
diff --git a/src/util/generic/utility_ut.cpp b/src/util/generic/utility_ut.cpp
index 98e133de09..baa2fa5635 100644
--- a/src/util/generic/utility_ut.cpp
+++ b/src/util/generic/utility_ut.cpp
@@ -1,4 +1,4 @@
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include "ymath.h"
 
 #include <src/library/testing/unittest/registar.h>
diff --git a/src/util/generic/xrange.cpp b/src/util/generic/xrange.cpp
index 74ee8a40fe..58c78aa0fc 100644
--- a/src/util/generic/xrange.cpp
+++ b/src/util/generic/xrange.cpp
@@ -1 +1 @@
-#include "xrange.h"
+#include <ydb-cpp-sdk/util/generic/xrange.h>
diff --git a/src/util/generic/xrange_ut.cpp b/src/util/generic/xrange_ut.cpp
index da35caf665..16f46a20c9 100644
--- a/src/util/generic/xrange_ut.cpp
+++ b/src/util/generic/xrange_ut.cpp
@@ -1,9 +1,9 @@
-#include "xrange.h"
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 
-#include "algorithm.h"
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include "vector.h"
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 Y_UNIT_TEST_SUITE(XRange) {
     void TestXRangeImpl(size_t begin, size_t end) {
diff --git a/src/util/generic/yexception.cpp b/src/util/generic/yexception.cpp
index 3fcbaeec38..7a23ef1842 100644
--- a/src/util/generic/yexception.cpp
+++ b/src/util/generic/yexception.cpp
@@ -1,11 +1,11 @@
-#include "bt_exception.h"
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/generic/bt_exception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
-#include <src/util/stream/str.h>
-#include <src/util/system/backtrace.h>
-#include <src/util/system/type_name.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 #if defined(_linux_) || defined(_android_) || defined(_darwin_)
     #include <cxxabi.h>
diff --git a/src/util/generic/yexception_ut.cpp b/src/util/generic/yexception_ut.cpp
index 7e6cabbe70..09f86936b1 100644
--- a/src/util/generic/yexception_ut.cpp
+++ b/src/util/generic/yexception_ut.cpp
@@ -1,4 +1,4 @@
-#include "yexception.h"
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 static inline void Throw1DontMove() {
     ythrow yexception() << "blabla"; // don't move this line
@@ -10,11 +10,11 @@ static inline void Throw2DontMove() {
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include <src/util/random/mersenne.h>
-#include <src/util/stream/output.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <src/util/string/split.h>
 
 #include "yexception_ut.h"
diff --git a/src/util/generic/ymath.h b/src/util/generic/ymath.h
index 5c18b375a8..8141b6ce44 100644
--- a/src/util/generic/ymath.h
+++ b/src/util/generic/ymath.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #include <cmath>
@@ -8,7 +8,7 @@
 #include <cstdlib>
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include "utility.h"
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 constexpr double PI = M_PI;
 constexpr double M_LOG2_10 = 3.32192809488736234787; // log2(10)
diff --git a/src/util/generic/ymath_ut.cpp b/src/util/generic/ymath_ut.cpp
index fb91f163cd..79db49fc9e 100644
--- a/src/util/generic/ymath_ut.cpp
+++ b/src/util/generic/ymath_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/datetime/cputimer.h>
 
 #include <limits>
diff --git a/src/util/memory/alloc.cpp b/src/util/memory/alloc.cpp
index cc4f3ad2b0..051da5e507 100644
--- a/src/util/memory/alloc.cpp
+++ b/src/util/memory/alloc.cpp
@@ -1,6 +1,6 @@
-#include "alloc.h"
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 #include <src/util/system/sys_alloc.h>
 
 using TBlock = TDefaultAllocator::TBlock;
diff --git a/src/util/memory/blob.cpp b/src/util/memory/blob.cpp
index 42c761f76e..7363db162e 100644
--- a/src/util/memory/blob.cpp
+++ b/src/util/memory/blob.cpp
@@ -1,15 +1,15 @@
-#include "blob.h"
+#include <ydb-cpp-sdk/util/memory/blob.h>
 #include "addstorage.h"
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/system/filemap.h>
 #include <src/util/system/mlock.h>
 #include <src/util/stream/buffer.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/buffer.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 template <class TCounter>
 class TDynamicBlobBase: public TBlob::TBase,
diff --git a/src/util/memory/blob_ut.cpp b/src/util/memory/blob_ut.cpp
index 977f82c647..b85f36a69e 100644
--- a/src/util/memory/blob_ut.cpp
+++ b/src/util/memory/blob_ut.cpp
@@ -1,10 +1,10 @@
-#include "blob.h"
+#include <ydb-cpp-sdk/util/memory/blob.h>
 
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/system/tempfile.h>
 #include <src/util/folder/path.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/file.h>
 #include <src/util/generic/buffer.h>
 
diff --git a/src/util/memory/mmapalloc.cpp b/src/util/memory/mmapalloc.cpp
index bb0eb79ae9..b55fec07bb 100644
--- a/src/util/memory/mmapalloc.cpp
+++ b/src/util/memory/mmapalloc.cpp
@@ -1,8 +1,8 @@
-#include "alloc.h"
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 #include "mmapalloc.h"
 
 #include <src/util/system/filemap.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 namespace {
     class TMmapAllocator: public IAllocator {
diff --git a/src/util/memory/pool.h b/src/util/memory/pool.h
index 05f14683b4..5e2ce7f184 100644
--- a/src/util/memory/pool.h
+++ b/src/util/memory/pool.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "alloc.h"
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 
 #include <src/util/system/align.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <src/util/generic/bitops.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <new>
 #include <string>
diff --git a/src/util/memory/pool_ut.cpp b/src/util/memory/pool_ut.cpp
index 919adc3196..2146548a6c 100644
--- a/src/util/memory/pool_ut.cpp
+++ b/src/util/memory/pool_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 class TCheckedAllocator: public TDefaultAllocator {
 public:
diff --git a/src/util/memory/segmented_string_pool.h b/src/util/memory/segmented_string_pool.h
index 23d658507b..5ee1679ee6 100644
--- a/src/util/memory/segmented_string_pool.h
+++ b/src/util/memory/segmented_string_pool.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <src/util/system/align.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <memory>
 #include <cstdio>
diff --git a/src/util/memory/smallobj.h b/src/util/memory/smallobj.h
index a5e4e41477..61f298c7a9 100644
--- a/src/util/memory/smallobj.h
+++ b/src/util/memory/smallobj.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "pool.h"
-#include "alloc.h"
+#include <ydb-cpp-sdk/util/memory/alloc.h>
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/generic/intrlist.h>
 
 class TFixedSizeAllocator {
diff --git a/src/util/memory/tempbuf.cpp b/src/util/memory/tempbuf.cpp
index 7757a1821e..bbbef7b497 100644
--- a/src/util/memory/tempbuf.cpp
+++ b/src/util/memory/tempbuf.cpp
@@ -1,11 +1,11 @@
-#include "tempbuf.h"
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include "addstorage.h"
 
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <utility>
 #include <src/util/thread/singleton.h>
 
diff --git a/src/util/network/address.cpp b/src/util/network/address.cpp
index fa2596f685..2b1a3df79c 100644
--- a/src/util/network/address.cpp
+++ b/src/util/network/address.cpp
@@ -1,6 +1,6 @@
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
-#include "address.h"
+#include <ydb-cpp-sdk/util/network/address.h>
 
 #if defined(_unix_)
     #include <sys/un.h>
diff --git a/src/util/network/endpoint.cpp b/src/util/network/endpoint.cpp
index 8843dd588a..47e16a9296 100644
--- a/src/util/network/endpoint.cpp
+++ b/src/util/network/endpoint.cpp
@@ -1,5 +1,5 @@
 #include "endpoint.h"
-#include "sock.h"
+#include <ydb-cpp-sdk/util/network/sock.h>
 
 TEndpoint::TEndpoint(const TEndpoint::TAddrRef& addr)
     : Addr_(addr)
diff --git a/src/util/network/endpoint.h b/src/util/network/endpoint.h
index 0c06f64e21..b9d8cc4bea 100644
--- a/src/util/network/endpoint.h
+++ b/src/util/network/endpoint.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "address.h"
+#include <ydb-cpp-sdk/util/network/address.h>
 
-#include <src/util/str_stl.h>
+#include <ydb-cpp-sdk/util/str_stl.h>
 
 //some equivalent boost::asio::ip::endpoint (easy for using pair ip:port)
 class TEndpoint {
diff --git a/src/util/network/hostip.cpp b/src/util/network/hostip.cpp
index 2b8e6af45b..a0fc89e35c 100644
--- a/src/util/network/hostip.cpp
+++ b/src/util/network/hostip.cpp
@@ -1,8 +1,8 @@
-#include "socket.h"
-#include "hostip.h"
+#include <ydb-cpp-sdk/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/hostip.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/byteorder.h>
+#include <ydb-cpp-sdk/util/system/byteorder.h>
 
 #if defined(_unix_) || defined(_cygwin_)
     #include <netdb.h>
diff --git a/src/util/network/init.cpp b/src/util/network/init.cpp
index d5d823f383..9a2dcb938f 100644
--- a/src/util/network/init.cpp
+++ b/src/util/network/init.cpp
@@ -1,7 +1,7 @@
-#include "init.h"
+#include <ydb-cpp-sdk/util/network/init.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 namespace {
     class TNetworkInit {
diff --git a/src/util/network/interface.cpp b/src/util/network/interface.cpp
index 2b2387d340..83a431ea15 100644
--- a/src/util/network/interface.cpp
+++ b/src/util/network/interface.cpp
@@ -1,6 +1,6 @@
 #include "interface.h"
 
-#include <src/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 #if defined(_unix_)
     #include <ifaddrs.h>
diff --git a/src/util/network/interface.h b/src/util/network/interface.h
index db49edcd77..723ba9c571 100644
--- a/src/util/network/interface.h
+++ b/src/util/network/interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "address.h"
+#include <ydb-cpp-sdk/util/network/address.h>
 
 #include <vector>
 
diff --git a/src/util/network/iovec.h b/src/util/network/iovec.h
index 913a258e28..2c2a485b85 100644
--- a/src/util/network/iovec.h
+++ b/src/util/network/iovec.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <ydb-cpp-sdk/util/system/types.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 class TContIOVector {
     using TPart = IOutputStream::TPart;
diff --git a/src/util/network/ip.cpp b/src/util/network/ip.cpp
index a43bcdadcf..3a080b5ace 100644
--- a/src/util/network/ip.cpp
+++ b/src/util/network/ip.cpp
@@ -1 +1 @@
-#include "ip.h"
+#include <ydb-cpp-sdk/util/network/ip.h>
diff --git a/src/util/network/ip_ut.cpp b/src/util/network/ip_ut.cpp
index 0f35814cbc..3f5958c71a 100644
--- a/src/util/network/ip_ut.cpp
+++ b/src/util/network/ip_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 class TSysIpTest: public TTestBase {
     UNIT_TEST_SUITE(TSysIpTest);
diff --git a/src/util/network/nonblock.cpp b/src/util/network/nonblock.cpp
index 2de13fe51c..64dca27901 100644
--- a/src/util/network/nonblock.cpp
+++ b/src/util/network/nonblock.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/platform.h>
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #if defined(_unix_)
     #include <dlfcn.h>
diff --git a/src/util/network/nonblock.h b/src/util/network/nonblock.h
index 54e5e44ae3..1cb43d1596 100644
--- a/src/util/network/nonblock.h
+++ b/src/util/network/nonblock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "socket.h"
+#include <ydb-cpp-sdk/util/network/socket.h>
 
 //assume s is non-blocking, return non-blocking socket
 SOCKET Accept4(SOCKET s, struct sockaddr* addr, socklen_t* addrlen);
diff --git a/src/util/network/pair.h b/src/util/network/pair.h
index 0d4506f880..ef6d1765f6 100644
--- a/src/util/network/pair.h
+++ b/src/util/network/pair.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "init.h"
+#include <ydb-cpp-sdk/util/network/init.h>
 
 int SocketPair(SOCKET socks[2], bool overlapped, bool cloexec = false);
 
diff --git a/src/util/network/poller.cpp b/src/util/network/poller.cpp
index a319eeedda..822e1b1e0a 100644
--- a/src/util/network/poller.cpp
+++ b/src/util/network/poller.cpp
@@ -1,7 +1,7 @@
 #include "poller.h"
 #include "pollerimpl.h"
 
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 
 #include <mutex>
 
diff --git a/src/util/network/poller.h b/src/util/network/poller.h
index 6e77eac162..47963f438e 100644
--- a/src/util/network/poller.h
+++ b/src/util/network/poller.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "socket.h"
+#include <ydb-cpp-sdk/util/network/socket.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 class TSocketPoller {
diff --git a/src/util/network/poller_ut.cpp b/src/util/network/poller_ut.cpp
index 8a901448b9..e261eeffed 100644
--- a/src/util/network/poller_ut.cpp
+++ b/src/util/network/poller_ut.cpp
@@ -1,5 +1,5 @@
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/error.h>
 
 #include "pair.h"
 #include "poller.h"
diff --git a/src/util/network/pollerimpl.h b/src/util/network/pollerimpl.h
index 8f27160469..a301c51bb0 100644
--- a/src/util/network/pollerimpl.h
+++ b/src/util/network/pollerimpl.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "socket.h"
+#include <ydb-cpp-sdk/util/network/socket.h>
 
-#include <src/util/system/error.h>
+#include <ydb-cpp-sdk/util/system/error.h>
 #include <src/util/system/fake_mutex.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 #include <mutex>
@@ -319,7 +319,7 @@ class TEpollPoller {
 #endif
 
 #if defined(HAVE_SELECT_POLLER)
-    #include <src/util/memory/tempbuf.h>
+    #include <ydb-cpp-sdk/util/memory/tempbuf.h>
     #include <src/util/generic/hash.h>
 
     #include "pair.h"
diff --git a/src/util/network/sock.cpp b/src/util/network/sock.cpp
index d4864a9c1c..974ac2baad 100644
--- a/src/util/network/sock.cpp
+++ b/src/util/network/sock.cpp
@@ -1 +1 @@
-#include "sock.h"
+#include <ydb-cpp-sdk/util/network/sock.h>
diff --git a/src/util/network/socket.cpp b/src/util/network/socket.cpp
index abbdb90be0..31b4110327 100644
--- a/src/util/network/socket.cpp
+++ b/src/util/network/socket.cpp
@@ -1,11 +1,11 @@
-#include "ip.h"
-#include "socket.h"
-#include "address.h"
+#include <ydb-cpp-sdk/util/network/ip.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/address.h>
 #include "pollerimpl.h"
 #include "iovec.h"
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/byteorder.h>
+#include <ydb-cpp-sdk/util/system/byteorder.h>
 #include <unordered_set>
 
 #if defined(_unix_)
@@ -31,17 +31,17 @@
     #include <ws2tcpip.h>
     #include <wspiapi.h>
 
-    #include <src/util/system/compat.h>
+    #include <ydb-cpp-sdk/util/system/compat.h>
 #endif
 
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include <src/util/system/datetime.h>
-#include <src/util/system/error.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/system/error.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <stddef.h>
 #include <sys/uio.h>
diff --git a/src/util/network/socket_ut.cpp b/src/util/network/socket_ut.cpp
index a7fbb237e9..d371df4a69 100644
--- a/src/util/network/socket_ut.cpp
+++ b/src/util/network/socket_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include <src/util/generic/vector.h>
 
 #include <ctime>
diff --git a/src/util/random/common_ops.h b/src/util/random/common_ops.h
index c61694e5d9..fc6c034c0d 100644
--- a/src/util/random/common_ops.h
+++ b/src/util/random/common_ops.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 namespace NPrivate {
     constexpr double ToRandReal1(const ui32 x) noexcept {
diff --git a/src/util/random/common_ops_ut.cpp b/src/util/random/common_ops_ut.cpp
index 06f5206c00..2b1922f559 100644
--- a/src/util/random/common_ops_ut.cpp
+++ b/src/util/random/common_ops_ut.cpp
@@ -3,7 +3,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 
 #include <random>
 
diff --git a/src/util/random/easy.h b/src/util/random/easy.h
index fd5b826fbe..cf857f3a99 100644
--- a/src/util/random/easy.h
+++ b/src/util/random/easy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "random.h"
+#include <ydb-cpp-sdk/util/random/random.h>
 
 namespace NPrivate {
     struct TRandom {
diff --git a/src/util/random/entropy.cpp b/src/util/random/entropy.cpp
index a255423f17..88e682b4c7 100644
--- a/src/util/random/entropy.cpp
+++ b/src/util/random/entropy.cpp
@@ -1,18 +1,18 @@
 #include "fast.h"
-#include "random.h"
+#include <ydb-cpp-sdk/util/random/random.h>
 #include "entropy.h"
 #include "mersenne.h"
 #include "shuffle.h"
 #include "init_atfork.h"
 
-#include <src/util/stream/output.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include <src/util/stream/zlib.h>
 #include <src/util/stream/buffer.h>
 
 #include <src/util/system/fs.h>
 #include <src/util/system/info.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 #include <src/util/system/thread.h>
 #include <src/util/system/execpath.h>
 #include <src/util/system/datetime.h>
@@ -21,15 +21,15 @@
 #include <src/util/system/mem_info.h>
 #include <src/util/system/rusage.h>
 #include <src/util/system/cpu_id.h>
-#include <src/util/system/unaligned_mem.h>
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <src/util/digest/murmur.h>
 #include <src/util/digest/city.h>
 
-#include <src/util/ysaveload.h>
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 namespace {
     inline void Permute(char* buf, size_t len, ui32 seed) noexcept {
diff --git a/src/util/random/fast.cpp b/src/util/random/fast.cpp
index 5f857fcebc..aa27301f7b 100644
--- a/src/util/random/fast.cpp
+++ b/src/util/random/fast.cpp
@@ -1,6 +1,6 @@
 #include "fast.h"
 
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 static inline ui32 FixSeq(ui32 seq1, ui32 seq2) noexcept {
     const ui32 mask = (~(ui32)(0)) >> 1;
diff --git a/src/util/random/init_atfork.cpp b/src/util/random/init_atfork.cpp
index 5ab54d2cbc..68478f2b01 100644
--- a/src/util/random/init_atfork.cpp
+++ b/src/util/random/init_atfork.cpp
@@ -1,8 +1,8 @@
 #include "init_atfork.h"
-#include "random.h"
+#include <ydb-cpp-sdk/util/random/random.h>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #if defined(_unix_)
     #include <pthread.h>
diff --git a/src/util/random/mersenne32.cpp b/src/util/random/mersenne32.cpp
index d8a63d479f..9d72fff4e2 100644
--- a/src/util/random/mersenne32.cpp
+++ b/src/util/random/mersenne32.cpp
@@ -1,7 +1,7 @@
 #include "mersenne32.h"
 
 #include <ydb-cpp-sdk/util/generic/array_size.h>
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 using namespace NPrivate;
 
diff --git a/src/util/random/mersenne64.cpp b/src/util/random/mersenne64.cpp
index 5cbd09cf32..b937ef6012 100644
--- a/src/util/random/mersenne64.cpp
+++ b/src/util/random/mersenne64.cpp
@@ -1,7 +1,7 @@
 #include "mersenne64.h"
 
 #include <ydb-cpp-sdk/util/generic/array_size.h>
-#include <src/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 #define MM 156
 #define MATRIX_A ULL(0xB5026F5AA96619E9)
diff --git a/src/util/random/mersenne_ut.cpp b/src/util/random/mersenne_ut.cpp
index 6f12429ae9..bbbe71cd9d 100644
--- a/src/util/random/mersenne_ut.cpp
+++ b/src/util/random/mersenne_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #define UI32(x) x##ul
 
diff --git a/src/util/random/normal.cpp b/src/util/random/normal.cpp
index 478b38fd25..29c00bc47f 100644
--- a/src/util/random/normal.cpp
+++ b/src/util/random/normal.cpp
@@ -1,6 +1,6 @@
 #include "normal.h"
 #include "common_ops.h"
-#include "random.h"
+#include <ydb-cpp-sdk/util/random/random.h>
 
 namespace {
     template <class T>
diff --git a/src/util/random/random.cpp b/src/util/random/random.cpp
index 33b5d0ef95..0509778ce0 100644
--- a/src/util/random/random.cpp
+++ b/src/util/random/random.cpp
@@ -1,12 +1,12 @@
-#include "random.h"
+#include <ydb-cpp-sdk/util/random/random.h>
 #include "entropy.h"
 #include "mersenne.h"
 
 #include <src/util/system/getpid.h>
 #include <src/util/thread/singleton.h>
 #include <src/util/stream/multi.h>
-#include <src/util/stream/mem.h>
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 
 namespace {
     struct TProcStream {
diff --git a/src/util/random/shuffle.h b/src/util/random/shuffle.h
index 85b374d83d..617abe66b8 100644
--- a/src/util/random/shuffle.h
+++ b/src/util/random/shuffle.h
@@ -3,8 +3,8 @@
 #include "fast.h"
 #include "entropy.h"
 
-#include <src/util/generic/utility.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 // some kind of https://en.wikipedia.org/wiki/Fisher–Yates_shuffle#The_modern_algorithm
 
diff --git a/src/util/str_stl.cpp b/src/util/str_stl.cpp
index 535b8e01ef..6d5453f3b4 100644
--- a/src/util/str_stl.cpp
+++ b/src/util/str_stl.cpp
@@ -1 +1 @@
-#include "str_stl.h"
+#include <ydb-cpp-sdk/util/str_stl.h>
diff --git a/src/util/stream/buffer.h b/src/util/stream/buffer.h
index e7982eaf06..c7dac6a8ee 100644
--- a/src/util/stream/buffer.h
+++ b/src/util/stream/buffer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "zerocopy.h"
-#include "zerocopy_output.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy_output.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 class TBuffer;
 
diff --git a/src/util/stream/buffered.cpp b/src/util/stream/buffered.cpp
index 9e09d1c5ed..a4c7d1a210 100644
--- a/src/util/stream/buffered.cpp
+++ b/src/util/stream/buffered.cpp
@@ -1,8 +1,8 @@
-#include "mem.h"
+#include <ydb-cpp-sdk/util/stream/mem.h>
 #include "buffered.h"
 
 #include <src/util/memory/addstorage.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/generic/buffer.h>
 
 #include <string>
diff --git a/src/util/stream/buffered.h b/src/util/stream/buffered.h
index f627ebb4fb..9b34a9cc3d 100644
--- a/src/util/stream/buffered.h
+++ b/src/util/stream/buffered.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "zerocopy.h"
-#include "zerocopy_output.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/zerocopy_output.h>
 
 #include <utility>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 
 /**
  * @addtogroup Streams_Buffered
diff --git a/src/util/stream/debug.cpp b/src/util/stream/debug.cpp
index 90845156ab..ae2dbe15e4 100644
--- a/src/util/stream/debug.cpp
+++ b/src/util/stream/debug.cpp
@@ -1,9 +1,9 @@
 #include "null.h"
-#include "debug.h"
+#include <ydb-cpp-sdk/util/stream/debug.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/util/stream/file.cpp b/src/util/stream/file.cpp
index 58c25415fa..4a859cd7cf 100644
--- a/src/util/stream/file.cpp
+++ b/src/util/stream/file.cpp
@@ -1,7 +1,7 @@
 #include "file.h"
 
-#include <src/util/memory/blob.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/blob.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 TUnbufferedFileInput::TUnbufferedFileInput(const char* path)
     : TUnbufferedFileInput(TFile(path, OPEN_MODE))
diff --git a/src/util/stream/file.h b/src/util/stream/file.h
index 0709d8a671..7fbcd53e22 100644
--- a/src/util/stream/file.h
+++ b/src/util/stream/file.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "fwd.h"
-#include "input.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/fwd.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include "buffered.h"
-#include "mem.h"
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 
 #include <utility>
 
diff --git a/src/util/stream/format.cpp b/src/util/stream/format.cpp
index 0ec57a3c4b..b268159f65 100644
--- a/src/util/stream/format.cpp
+++ b/src/util/stream/format.cpp
@@ -1,8 +1,8 @@
 #include "format.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <src/util/generic/ymath.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/system/datetime.h>
 
 namespace NFormatPrivate {
diff --git a/src/util/stream/format.h b/src/util/stream/format.h
index fe74387caa..3258abaa2b 100644
--- a/src/util/stream/format.h
+++ b/src/util/stream/format.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "mem.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/flags.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 enum ENumberFormatFlag {
     HF_FULL = 0x01, /**< Output number with leading zeros. */
diff --git a/src/util/stream/fwd.cpp b/src/util/stream/fwd.cpp
index 4214b6df83..6e48df3f88 100644
--- a/src/util/stream/fwd.cpp
+++ b/src/util/stream/fwd.cpp
@@ -1 +1 @@
-#include "fwd.h"
+#include <ydb-cpp-sdk/util/stream/fwd.h>
diff --git a/src/util/stream/hex.cpp b/src/util/stream/hex.cpp
index 0f7ccd7f44..9aac627876 100644
--- a/src/util/stream/hex.cpp
+++ b/src/util/stream/hex.cpp
@@ -1,6 +1,6 @@
 #include "hex.h"
 
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/string/hex.h>
 
 void HexEncode(const void* in, size_t len, IOutputStream& out) {
diff --git a/src/util/stream/input.cpp b/src/util/stream/input.cpp
index 8b6dd6326c..59ad872f7d 100644
--- a/src/util/stream/input.cpp
+++ b/src/util/stream/input.cpp
@@ -1,14 +1,14 @@
-#include "input.h"
-#include "output.h"
-#include "str.h"
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 #include <src/util/charset/wide.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/string/cast.h>
-#include <src/util/system/compat.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
 #include <cstdlib>
 
diff --git a/src/util/stream/input_ut.cpp b/src/util/stream/input_ut.cpp
index fc07012fb3..01bcfc162c 100644
--- a/src/util/stream/input_ut.cpp
+++ b/src/util/stream/input_ut.cpp
@@ -3,8 +3,8 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/system/file.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #ifdef _win_
     #include <io.h>
diff --git a/src/util/stream/ios_ut.cpp b/src/util/stream/ios_ut.cpp
index 14aa05cf8c..fb0d369caf 100644
--- a/src/util/stream/ios_ut.cpp
+++ b/src/util/stream/ios_ut.cpp
@@ -6,8 +6,8 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/string/cast.h>
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include <src/util/charset/wide.h>
 
 #include <string>
diff --git a/src/util/stream/length.h b/src/util/stream/length.h
index 399cf97ae5..fa52efd053 100644
--- a/src/util/stream/length.h
+++ b/src/util/stream/length.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "input.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 /**
  * Proxy input stream that can read a limited number of characters from a slave
diff --git a/src/util/stream/mem.cpp b/src/util/stream/mem.cpp
index ed4375012c..0fdb18f8c3 100644
--- a/src/util/stream/mem.cpp
+++ b/src/util/stream/mem.cpp
@@ -1,6 +1,6 @@
-#include "mem.h"
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 TMemoryInput::TMemoryInput() noexcept
     : Buf_(nullptr)
diff --git a/src/util/stream/multi.h b/src/util/stream/multi.h
index 3fbdc6b2d6..17dd0f2d16 100644
--- a/src/util/stream/multi.h
+++ b/src/util/stream/multi.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "input.h"
+#include <ydb-cpp-sdk/util/stream/input.h>
 
 /**
  * @addtogroup Streams_Multi
diff --git a/src/util/stream/null.cpp b/src/util/stream/null.cpp
index 54578339e1..1855528fd6 100644
--- a/src/util/stream/null.cpp
+++ b/src/util/stream/null.cpp
@@ -1,6 +1,6 @@
 #include "null.h"
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 TNullIO& NPrivate::UtilNullStream() noexcept {
     return *SingletonWithPriority<TNullIO, 4>();
diff --git a/src/util/stream/null.h b/src/util/stream/null.h
index e97a1676ba..32b0f003e8 100644
--- a/src/util/stream/null.h
+++ b/src/util/stream/null.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "zerocopy.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 #include <iostream>
 
diff --git a/src/util/stream/output.cpp b/src/util/stream/output.cpp
index 47d8f59e0b..7eba8938ba 100644
--- a/src/util/stream/output.cpp
+++ b/src/util/stream/output.cpp
@@ -1,16 +1,16 @@
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/output.h>
 
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include "format.h"
-#include <src/util/memory/tempbuf.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/charset/utf8.h>
 #include <src/util/charset/wide.h>
 
 #if defined(_android_)
     #include <src/util/system/dynlib.h>
-    #include <src/util/system/guard.h>
+    #include <ydb-cpp-sdk/util/system/guard.h>
     #include <android/log.h>
     #include <mutex>
 #endif
diff --git a/src/util/stream/str.cpp b/src/util/stream/str.cpp
index 30fa1bbaf5..5525ebfc1f 100644
--- a/src/util/stream/str.cpp
+++ b/src/util/stream/str.cpp
@@ -1,4 +1,4 @@
-#include "str.h"
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 #include <src/util/generic/bitops.h>
 
diff --git a/src/util/stream/tee.h b/src/util/stream/tee.h
index c69e232fb9..3124acfb1e 100644
--- a/src/util/stream/tee.h
+++ b/src/util/stream/tee.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 /**
  * @addtogroup Streams_Multi
diff --git a/src/util/stream/tempbuf.cpp b/src/util/stream/tempbuf.cpp
index 801a1fabb0..dc825fd7e1 100644
--- a/src/util/stream/tempbuf.cpp
+++ b/src/util/stream/tempbuf.cpp
@@ -1,4 +1,4 @@
-#include "tempbuf.h"
+#include <ydb-cpp-sdk/util/stream/tempbuf.h>
 
 namespace {
     static inline size_t Next(size_t size) noexcept {
diff --git a/src/util/stream/walk.h b/src/util/stream/walk.h
index 7e62cb44dc..f6275849e3 100644
--- a/src/util/stream/walk.h
+++ b/src/util/stream/walk.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zerocopy.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
 
 /**
  * Zero-copy stream that simplifies implementation of derived classes.
diff --git a/src/util/stream/zerocopy.cpp b/src/util/stream/zerocopy.cpp
index 1b4387bf07..57e4930b66 100644
--- a/src/util/stream/zerocopy.cpp
+++ b/src/util/stream/zerocopy.cpp
@@ -1,5 +1,5 @@
-#include "zerocopy.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 IZeroCopyInput::~IZeroCopyInput() = default;
 
diff --git a/src/util/stream/zerocopy_output.cpp b/src/util/stream/zerocopy_output.cpp
index cb7fb6f5b2..1a985e1c92 100644
--- a/src/util/stream/zerocopy_output.cpp
+++ b/src/util/stream/zerocopy_output.cpp
@@ -1,6 +1,6 @@
-#include "zerocopy_output.h"
+#include <ydb-cpp-sdk/util/stream/zerocopy_output.h>
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 void IZeroCopyOutput::DoWrite(const void* buf, size_t len) {
     void* ptr = nullptr;
diff --git a/src/util/stream/zlib.cpp b/src/util/stream/zlib.cpp
index 4a076a0304..54a1349a74 100644
--- a/src/util/stream/zlib.cpp
+++ b/src/util/stream/zlib.cpp
@@ -2,7 +2,7 @@
 
 #include <src/util/memory/addstorage.h>
 #include <src/util/generic/scope.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <zlib.h>
 
diff --git a/src/util/stream/zlib.h b/src/util/stream/zlib.h
index b650437061..e9af9ce73d 100644
--- a/src/util/stream/zlib.h
+++ b/src/util/stream/zlib.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "fwd.h"
-#include "input.h"
-#include "output.h"
+#include <ydb-cpp-sdk/util/stream/fwd.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include "buffered.h"
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 /**
  * @addtogroup Streams_Archs
diff --git a/src/util/string/ascii.cpp b/src/util/string/ascii.cpp
index fe24395ead..0538e3bbc4 100644
--- a/src/util/string/ascii.cpp
+++ b/src/util/string/ascii.cpp
@@ -1,7 +1,7 @@
-#include "ascii.h"
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
-#include <src/util/system/yassert.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 
 // clang-format off
 extern const unsigned char NPrivate::ASCII_CLASS[256] = {
diff --git a/src/util/string/builder.cpp b/src/util/string/builder.cpp
index 9e5c94ef48..2bf31936e1 100644
--- a/src/util/string/builder.cpp
+++ b/src/util/string/builder.cpp
@@ -1,6 +1,6 @@
-#include "builder.h"
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 template <>
 void Out<TStringBuilder>(IOutputStream& os, const TStringBuilder& sb) {
diff --git a/src/util/string/cast.cpp b/src/util/string/cast.cpp
index 90b065cc24..1fbb8740cf 100644
--- a/src/util/string/cast.cpp
+++ b/src/util/string/cast.cpp
@@ -10,17 +10,17 @@
 #include <string>
 
 #include <src/util/string/type.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <double-conversion.h>
 
-#include <src/util/system/yassert.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 using double_conversion::DoubleToStringConverter;
 using double_conversion::StringBuilder;
diff --git a/src/util/string/escape.cpp b/src/util/string/escape.cpp
index 5ddfbc12cb..08ae0100e4 100644
--- a/src/util/string/escape.cpp
+++ b/src/util/string/escape.cpp
@@ -1,5 +1,5 @@
-#include "escape.h"
-#include "cast.h"
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <src/util/charset/utf8.h>
diff --git a/src/util/string/hex.h b/src/util/string/hex.h
index 449fcb7254..7a7dac74a8 100644
--- a/src/util/string/hex.h
+++ b/src/util/string/hex.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/yexception.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 inline static char DigitToChar(unsigned char digit) {
     if (digit < 10) {
diff --git a/src/util/string/join.h b/src/util/string/join.h
index d39a938141..272fb5b987 100644
--- a/src/util/string/join.h
+++ b/src/util/string/join.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/string/cast.h>
-#include "cast.h"
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 /*
  * Default implementation of AppendToString uses a temporary std::string object which is inefficient. You can overload it
diff --git a/src/util/string/join_ut.cpp b/src/util/string/join_ut.cpp
index 6617518206..c9270426bc 100644
--- a/src/util/string/join_ut.cpp
+++ b/src/util/string/join_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 #include <src/util/generic/vector.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 struct TCustomData {
     std::vector<int> Ints;
diff --git a/src/util/string/reverse.h b/src/util/string/reverse.h
index e439dd132d..0a1e5f3000 100644
--- a/src/util/string/reverse.h
+++ b/src/util/string/reverse.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <string>
 
diff --git a/src/util/string/split.h b/src/util/string/split.h
index aae06b67ff..dd2440312c 100644
--- a/src/util/string/split.h
+++ b/src/util/string/split.h
@@ -1,18 +1,18 @@
 #pragma once
 
 #include "strspn.h"
-#include "cast.h"
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <src/util/generic/iterator.h>
-#include <src/util/generic/iterator_range.h>
-#include <src/util/generic/store_policy.h>
+#include <ydb-cpp-sdk/util/generic/iterator_range.h>
+#include <ydb-cpp-sdk/util/generic/store_policy.h>
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
 #include <utility>
diff --git a/src/util/string/split_ut.cpp b/src/util/string/split_ut.cpp
index b1412042ac..0c293859f8 100644
--- a/src/util/string/split_ut.cpp
+++ b/src/util/string/split_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/charset/wide.h>
 #include <src/util/datetime/cputimer.h>
 
diff --git a/src/util/string/strip.cpp b/src/util/string/strip.cpp
index c9c9d6e46f..0cc9ee3189 100644
--- a/src/util/string/strip.cpp
+++ b/src/util/string/strip.cpp
@@ -1,5 +1,4 @@
-#include "strip.h"
-#include "ascii.h"
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <src/util/string/reverse.h>
 
diff --git a/src/util/string/subst.cpp b/src/util/string/subst.cpp
index f9523fe287..37fe5f73ee 100644
--- a/src/util/string/subst.cpp
+++ b/src/util/string/subst.cpp
@@ -1,4 +1,4 @@
-#include "subst.h"
+#include <ydb-cpp-sdk/util/string/subst.h>
 
 #include <ydb-cpp-sdk/util/system/compiler.h>
 
diff --git a/src/util/string/subst_ut.cpp b/src/util/string/subst_ut.cpp
index f8461dd023..79a939d06e 100644
--- a/src/util/string/subst_ut.cpp
+++ b/src/util/string/subst_ut.cpp
@@ -1,5 +1,5 @@
 #include "join.h"
-#include "subst.h"
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <string>
 
 #include <src/library/testing/unittest/registar.h>
diff --git a/src/util/string/type.cpp b/src/util/string/type.cpp
index 27b28a3bdf..0cf7b7c368 100644
--- a/src/util/string/type.cpp
+++ b/src/util/string/type.cpp
@@ -1,5 +1,5 @@
 #include "type.h"
-#include "ascii.h"
+#include <ydb-cpp-sdk/util/string/ascii.h>
 
 #include <array>
 
diff --git a/src/util/string/util.cpp b/src/util/string/util.cpp
index 1254d767d0..05d88cbfed 100644
--- a/src/util/string/util.cpp
+++ b/src/util/string/util.cpp
@@ -1,6 +1,6 @@
 #include "util.h"
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <cstdio>
 #include <cstdarg>
diff --git a/src/util/string/vector.h b/src/util/string/vector.h
index f46d22a454..f1a8046c15 100644
--- a/src/util/string/vector.h
+++ b/src/util/string/vector.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "cast.h"
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include "split.h"
 
-#include <src/util/string/cast.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #define KEEP_EMPTY_TOKENS 0x01
 
diff --git a/src/util/system/align.h b/src/util/system/align.h
index 47b8d81f08..ac23c93c73 100644
--- a/src/util/system/align.h
+++ b/src/util/system/align.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <src/util/generic/bitops.h>
 
diff --git a/src/util/system/atexit.cpp b/src/util/system/atexit.cpp
index 5e33427c4a..50d5109d65 100644
--- a/src/util/system/atexit.cpp
+++ b/src/util/system/atexit.cpp
@@ -1,11 +1,11 @@
-#include "atexit.h"
-#include "yassert.h"
-#include "spinlock.h"
+#include <ydb-cpp-sdk/util/system/atexit.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 #include "thread.h"
 
 #include <queue>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <atomic>
 #include <mutex>
diff --git a/src/util/system/atexit_ut.cpp b/src/util/system/atexit_ut.cpp
index 680eeb213b..58382a06a4 100644
--- a/src/util/system/atexit_ut.cpp
+++ b/src/util/system/atexit_ut.cpp
@@ -1,7 +1,7 @@
 #include <src/library/testing/unittest/registar.h>
 
-#include "atexit.h"
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/system/atexit.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <errno.h>
 
diff --git a/src/util/system/backtrace.cpp b/src/util/system/backtrace.cpp
index 043ecba610..57cf7645ea 100644
--- a/src/util/system/backtrace.cpp
+++ b/src/util/system/backtrace.cpp
@@ -1,8 +1,8 @@
 #include "demangle_impl.h"
 #include <ydb-cpp-sdk/util/system/platform.h>
-#include "backtrace.h"
+#include <ydb-cpp-sdk/util/system/backtrace.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/format.h>
 
 #ifdef _win_
@@ -146,7 +146,7 @@ TResolvedSymbol ResolveSymbol(void* sym, char* buf, size_t len) {
     return ret;
 }
 #elif defined(_win_)
-    #include <src/util/generic/singleton.h>
+    #include <ydb-cpp-sdk/util/generic/singleton.h>
 
 namespace {
     struct TWinSymbolResolverImpl {
diff --git a/src/util/system/backtrace_ut.cpp b/src/util/system/backtrace_ut.cpp
index 580c83586e..fc8c8f3b0b 100644
--- a/src/util/system/backtrace_ut.cpp
+++ b/src/util/system/backtrace_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 using PFunc = int (*)(void**, size_t);
 
diff --git a/src/util/system/byteorder.cpp b/src/util/system/byteorder.cpp
index 5db3d30297..a7f3f669f6 100644
--- a/src/util/system/byteorder.cpp
+++ b/src/util/system/byteorder.cpp
@@ -1 +1 @@
-#include "byteorder.h"
+#include <ydb-cpp-sdk/util/system/byteorder.h>
diff --git a/src/util/system/compat.cpp b/src/util/system/compat.cpp
index 585a64092b..730bb455fb 100644
--- a/src/util/system/compat.cpp
+++ b/src/util/system/compat.cpp
@@ -1,5 +1,5 @@
-#include "compat.h"
-#include "progname.h"
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 
 #ifdef _win_
diff --git a/src/util/system/compat_ut.cpp b/src/util/system/compat_ut.cpp
index ca38b8c196..3770ad4396 100644
--- a/src/util/system/compat_ut.cpp
+++ b/src/util/system/compat_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/folder/dirut.h>
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 Y_UNIT_TEST_SUITE(TCompatTest) {
     Y_UNIT_TEST(TestGetprogname) {
diff --git a/src/util/system/context.cpp b/src/util/system/context.cpp
index 23bc58363d..89c276528e 100644
--- a/src/util/system/context.cpp
+++ b/src/util/system/context.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/util/system/compiler.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "event.h"
+#include <ydb-cpp-sdk/util/system/event.h>
 #include "thread.h"
 
 #include <cstdlib> //for abort()
@@ -25,8 +25,8 @@ namespace __cxxabiv1 {
     #endif
 #endif
 
-#include <src/util/stream/output.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #define FROM_CONTEXT_IMPL
 #include "context.h"
diff --git a/src/util/system/context.h b/src/util/system/context.h
index 109c529dfa..77d6723feb 100644
--- a/src/util/system/context.h
+++ b/src/util/system/context.h
@@ -6,8 +6,8 @@
 #include "sanitizers.h"
 
 #include <span>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #define STACK_ALIGN (8 * PLATFORM_DATA_ALIGN)
 
diff --git a/src/util/system/context_ut.cpp b/src/util/system/context_ut.cpp
index 77f450d215..aa60bd762f 100644
--- a/src/util/system/context_ut.cpp
+++ b/src/util/system/context_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 Y_UNIT_TEST_SUITE(TestContext) {
     template <class F>
diff --git a/src/util/system/cpu_id.cpp b/src/util/system/cpu_id.cpp
index 5bd704e681..e3d3e80c16 100644
--- a/src/util/system/cpu_id.cpp
+++ b/src/util/system/cpu_id.cpp
@@ -2,7 +2,7 @@
 #include <ydb-cpp-sdk/util/system/types.h>
 #include <ydb-cpp-sdk/util/system/platform.h>
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #if defined(_win_)
     #include <intrin.h>
diff --git a/src/util/system/cpu_id.h b/src/util/system/cpu_id.h
index a21bb0724a..edceaf19c0 100644
--- a/src/util/system/cpu_id.h
+++ b/src/util/system/cpu_id.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/types.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #define Y_CPU_ID_ENUMERATE(F) \
     F(SSE)                    \
diff --git a/src/util/system/daemon.cpp b/src/util/system/daemon.cpp
index 38a869a70d..bef5a50ad9 100644
--- a/src/util/system/daemon.cpp
+++ b/src/util/system/daemon.cpp
@@ -1,4 +1,4 @@
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <cerrno>
 #include <src/util/system/info.h>
diff --git a/src/util/system/daemon_ut.cpp b/src/util/system/daemon_ut.cpp
index 92af78dae2..6299babb54 100644
--- a/src/util/system/daemon_ut.cpp
+++ b/src/util/system/daemon_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/network/pair.h>
-#include <src/util/network/socket.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
 #include <src/util/system/pipe.h>
 
 Y_UNIT_TEST_SUITE(TDaemonTest) {
diff --git a/src/util/system/datetime.cpp b/src/util/system/datetime.cpp
index 22648f6e42..36bcffa2ed 100644
--- a/src/util/system/datetime.cpp
+++ b/src/util/system/datetime.cpp
@@ -1,5 +1,5 @@
 #include "datetime.h"
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include "cpu_id.h"
 
 #include <ydb-cpp-sdk/util/datetime/systime.h>
diff --git a/src/util/system/demangle_impl.h b/src/util/system/demangle_impl.h
index 9360c8bd27..139cef81fa 100644
--- a/src/util/system/demangle_impl.h
+++ b/src/util/system/demangle_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NPrivate {
 
diff --git a/src/util/system/direct_io.cpp b/src/util/system/direct_io.cpp
index 2445c27e28..1371a8ad73 100644
--- a/src/util/system/direct_io.cpp
+++ b/src/util/system/direct_io.cpp
@@ -2,13 +2,13 @@
 
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/system/info.h>
 #include "align.h"
 
 #ifdef _linux_
-    #include <src/util/string/cast.h>
+    #include <ydb-cpp-sdk/util/string/cast.h>
     #include <linux/version.h>
     #include <sys/utsname.h>
 #endif
diff --git a/src/util/system/direct_io.h b/src/util/system/direct_io.h
index 8dcebc755a..db97b2bba0 100644
--- a/src/util/system/direct_io.h
+++ b/src/util/system/direct_io.h
@@ -2,7 +2,7 @@
 
 #include "align.h"
 
-#include "file.h"
+#include <ydb-cpp-sdk/util/system/file.h>
 #include <src/util/generic/buffer.h>
 
 // Supports Linux Direct-IO:
diff --git a/src/util/system/direct_io_ut.cpp b/src/util/system/direct_io_ut.cpp
index 503c5d6056..597c088539 100644
--- a/src/util/system/direct_io_ut.cpp
+++ b/src/util/system/direct_io_ut.cpp
@@ -1,9 +1,9 @@
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/system/fs.h>
 #include <src/util/system/tempfile.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include "direct_io.h"
 
diff --git a/src/util/system/dynlib.cpp b/src/util/system/dynlib.cpp
index d5919e3400..4967188918 100644
--- a/src/util/system/dynlib.cpp
+++ b/src/util/system/dynlib.cpp
@@ -1,8 +1,8 @@
 #include "dynlib.h"
 
-#include "guard.h"
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <mutex>
 
diff --git a/src/util/system/dynlib.h b/src/util/system/dynlib.h
index abaab2dbd0..089ba0c55e 100644
--- a/src/util/system/dynlib.h
+++ b/src/util/system/dynlib.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #define Y_GET_FUNC(dll, name) FUNC_##name((dll).Sym(#name))
 #define Y_GET_FUNC_OPTIONAL(dll, name) FUNC_##name((dll).SymOptional(#name))
diff --git a/src/util/system/err.cpp b/src/util/system/err.cpp
index 19bccb4fbe..d1833f5e53 100644
--- a/src/util/system/err.cpp
+++ b/src/util/system/err.cpp
@@ -1,11 +1,11 @@
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "progname.h"
+#include <ydb-cpp-sdk/util/system/progname.h>
 #include "compat.h"
 #include "error.h"
 
 #include <src/util/generic/scope.h>
 
-#include <src/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/compat.h>
 
 #include <iostream>
 
diff --git a/src/util/system/error.cpp b/src/util/system/error.cpp
index 1219d81afb..d78c286d11 100644
--- a/src/util/system/error.cpp
+++ b/src/util/system/error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include <ydb-cpp-sdk/util/system/error.h>
 
 #include <src/util/generic/strfcpy.h>
 
@@ -6,9 +6,9 @@
 #include <cstring>
 
 #if defined(_win_)
-    #include <src/util/string/strip.h>
-    #include <src/util/network/socket.h>
-    #include <src/util/generic/singleton.h>
+    #include <ydb-cpp-sdk/util/string/strip.h>
+    #include <ydb-cpp-sdk/util/network/socket.h>
+    #include <ydb-cpp-sdk/util/generic/singleton.h>
     #include "winint.h"
 #endif
 
diff --git a/src/util/system/event.cpp b/src/util/system/event.cpp
index 04a70bbc5c..34fd2c9e91 100644
--- a/src/util/system/event.cpp
+++ b/src/util/system/event.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include "event.h"
+#include <ydb-cpp-sdk/util/system/event.h>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/src/util/system/event_ut.cpp b/src/util/system/event_ut.cpp
index ab275610a7..b573e5745f 100644
--- a/src/util/system/event_ut.cpp
+++ b/src/util/system/event_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <atomic>
 
diff --git a/src/util/system/execpath.cpp b/src/util/system/execpath.cpp
index df842a7ac3..3ef483f91b 100644
--- a/src/util/system/execpath.cpp
+++ b/src/util/system/execpath.cpp
@@ -4,7 +4,7 @@
     #include <stdlib.h>
 #elif defined(_darwin_)
     #include <mach-o/dyld.h>
-    #include <src/util/generic/function.h>
+    #include <ydb-cpp-sdk/util/generic/function.h>
 #elif defined(_win_)
     #include "winint.h"
     #include <io.h>
@@ -16,7 +16,7 @@
     #include <unistd.h>
 #endif
 
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include "execpath.h"
 #include "fs.h"
diff --git a/src/util/system/execpath.h b/src/util/system/execpath.h
index d75444e32f..d00ba3e649 100644
--- a/src/util/system/execpath.h
+++ b/src/util/system/execpath.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 // NOTE: This function has rare sporadic failures (throws exceptions) on FreeBSD. See REVIEW:54297
 const std::string& GetExecPath();
diff --git a/src/util/system/fake_mutex.h b/src/util/system/fake_mutex.h
index 4ab8d60b13..4e3767815b 100644
--- a/src/util/system/fake_mutex.h
+++ b/src/util/system/fake_mutex.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 class TFakeMutex: public TNonCopyable {
 public:
diff --git a/src/util/system/fasttime.cpp b/src/util/system/fasttime.cpp
index b12e5dc86e..99ead088cc 100644
--- a/src/util/system/fasttime.cpp
+++ b/src/util/system/fasttime.cpp
@@ -1,8 +1,8 @@
 #include "dynlib.h"
 #include "fasttime.h"
 
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <utility>
 
 #include <src/util/thread/singleton.h>
diff --git a/src/util/system/fhandle.cpp b/src/util/system/fhandle.cpp
index 67250ae1e5..fa30f96458 100644
--- a/src/util/system/fhandle.cpp
+++ b/src/util/system/fhandle.cpp
@@ -1 +1 @@
-#include "fhandle.h"
+#include <ydb-cpp-sdk/util/system/fhandle.h>
diff --git a/src/util/system/file.cpp b/src/util/system/file.cpp
index 6255fb1505..382b4278e5 100644
--- a/src/util/system/file.cpp
+++ b/src/util/system/file.cpp
@@ -1,26 +1,26 @@
-#include "file.h"
-#include "flock.h"
+#include <ydb-cpp-sdk/util/system/file.h>
+#include <ydb-cpp-sdk/util/system/flock.h>
 #include "fstat.h"
-#include "sysstat.h"
+#include <ydb-cpp-sdk/util/system/sysstat.h>
 #include "align.h"
 #include "info.h"
 
 #include <array>
 #include <filesystem>
 
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 #include <src/util/string/util.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/util/stream/hex.h>
 #include <src/util/stream/format.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <ydb-cpp-sdk/util/generic/size_literals.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
diff --git a/src/util/system/file_lock.cpp b/src/util/system/file_lock.cpp
index e6c3c110ef..f0dd5b755d 100644
--- a/src/util/system/file_lock.cpp
+++ b/src/util/system/file_lock.cpp
@@ -1,7 +1,7 @@
 #include "file_lock.h"
-#include "flock.h"
+#include <ydb-cpp-sdk/util/system/flock.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <cerrno>
 
diff --git a/src/util/system/file_lock.h b/src/util/system/file_lock.h
index dcfabad0cd..cef0e27b3f 100644
--- a/src/util/system/file_lock.h
+++ b/src/util/system/file_lock.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
-#include <src/util/generic/noncopyable.h>
-#include <src/util/system/file.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 
 enum class EFileLockType {
     Exclusive,
diff --git a/src/util/system/file_ut.cpp b/src/util/system/file_ut.cpp
index b921b6b46e..cedb4e0e25 100644
--- a/src/util/system/file_ut.cpp
+++ b/src/util/system/file_ut.cpp
@@ -5,7 +5,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/stream/file.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 class TFileTest: public TTestBase {
     UNIT_TEST_SUITE(TFileTest);
diff --git a/src/util/system/filemap.cpp b/src/util/system/filemap.cpp
index f1105446c2..5ff4d5ba12 100644
--- a/src/util/system/filemap.cpp
+++ b/src/util/system/filemap.cpp
@@ -3,8 +3,8 @@
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include "hi_lo.h"
 
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #if defined(_win_)
     #include "winint.h"
@@ -29,7 +29,7 @@
     #error todo
 #endif
 
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <src/util/system/sanitizers.h>
 #include "filemap.h"
 
diff --git a/src/util/system/filemap.h b/src/util/system/filemap.h
index 2a1980f5e6..b38c680425 100644
--- a/src/util/system/filemap.h
+++ b/src/util/system/filemap.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "file.h"
+#include <ydb-cpp-sdk/util/system/file.h>
 #include "align.h"
-#include "yassert.h"
-
-#include <src/util/generic/noncopyable.h>
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/utility.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/flags.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
+
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <new>
 #include <cstdio>
diff --git a/src/util/system/flock.cpp b/src/util/system/flock.cpp
index e35023bcad..55f618f40d 100644
--- a/src/util/system/flock.cpp
+++ b/src/util/system/flock.cpp
@@ -1,8 +1,8 @@
-#include "flock.h"
+#include <ydb-cpp-sdk/util/system/flock.h>
 
 #ifndef _unix_
 
-    #include <src/util/generic/utility.h>
+    #include <ydb-cpp-sdk/util/generic/utility.h>
 
     #include "winint.h"
     #include <io.h>
diff --git a/src/util/system/fs.cpp b/src/util/system/fs.cpp
index 154ad503a5..158a87275f 100644
--- a/src/util/system/fs.cpp
+++ b/src/util/system/fs.cpp
@@ -8,9 +8,9 @@
     #include <errno.h>
 #endif
 
-#include <src/util/string/escape.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 #include <src/util/stream/file.h>
 #include <src/util/folder/iterator.h>
 #include <src/util/system/fstat.h>
diff --git a/src/util/system/fs.h b/src/util/system/fs.h
index 4ed2f90d97..d863f3599e 100644
--- a/src/util/system/fs.h
+++ b/src/util/system/fs.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/flags.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <string>
 
diff --git a/src/util/system/fstat.cpp b/src/util/system/fstat.cpp
index 79cf41965c..401c94d00f 100644
--- a/src/util/system/fstat.cpp
+++ b/src/util/system/fstat.cpp
@@ -1,5 +1,5 @@
 #include "fstat.h"
-#include "file.h"
+#include <ydb-cpp-sdk/util/system/file.h>
 
 #include <sys/stat.h>
 
diff --git a/src/util/system/fstat.h b/src/util/system/fstat.h
index 1d49f5d362..d42ebdb951 100644
--- a/src/util/system/fstat.h
+++ b/src/util/system/fstat.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
-#include <src/util/system/fhandle.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/system/fhandle.h>
 
 class TFile;
 class TFsPath;
diff --git a/src/util/system/guard.cpp b/src/util/system/guard.cpp
index 29d14dd227..7e0686677f 100644
--- a/src/util/system/guard.cpp
+++ b/src/util/system/guard.cpp
@@ -1 +1 @@
-#include "guard.h"
+#include <ydb-cpp-sdk/util/system/guard.h>
diff --git a/src/util/system/guard_ut.cpp b/src/util/system/guard_ut.cpp
index 86170fa9ad..ad7d1abe81 100644
--- a/src/util/system/guard_ut.cpp
+++ b/src/util/system/guard_ut.cpp
@@ -1,9 +1,9 @@
-#include "guard.h"
+#include <ydb-cpp-sdk/util/system/guard.h>
 #include "rwlock.h"
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 struct TTestGuard: public TTestBase {
     UNIT_TEST_SUITE(TTestGuard);
diff --git a/src/util/system/hi_lo.h b/src/util/system/hi_lo.h
index f86870534f..c58609bdfe 100644
--- a/src/util/system/hi_lo.h
+++ b/src/util/system/hi_lo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "unaligned_mem.h"
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
 
 #include <utility>
 
diff --git a/src/util/system/hostname.cpp b/src/util/system/hostname.cpp
index 982dbe5d88..6a3d6bf32b 100644
--- a/src/util/system/hostname.cpp
+++ b/src/util/system/hostname.cpp
@@ -1,9 +1,9 @@
 #include <ydb-cpp-sdk/library/string_utils/misc/misc.h>
 
-#include <src/util/memory/tempbuf.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/network/ip.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/network/ip.h>
 
 #if defined(_unix_)
     #include <unistd.h>
@@ -16,7 +16,7 @@
 #endif
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include "hostname.h"
 
 namespace {
diff --git a/src/util/system/hostname.h b/src/util/system/hostname.h
index afd5317916..e239972a43 100644
--- a/src/util/system/hostname.h
+++ b/src/util/system/hostname.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 const char* GetHostName();
 const std::string& HostName();
diff --git a/src/util/system/hp_timer.cpp b/src/util/system/hp_timer.cpp
index 29fad1554a..41b57b9ee3 100644
--- a/src/util/system/hp_timer.cpp
+++ b/src/util/system/hp_timer.cpp
@@ -1,7 +1,7 @@
 #include "hp_timer.h"
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 #include <src/util/datetime/cputimer.h>
 
 using namespace NHPTimer;
diff --git a/src/util/system/info.cpp b/src/util/system/info.cpp
index 9241f7f4b5..f8db9ce485 100644
--- a/src/util/system/info.cpp
+++ b/src/util/system/info.cpp
@@ -36,12 +36,12 @@ static int getloadavg(double* loadavg, int nelem) {
     #include <sys/sysctl.h>
 #endif
 
-#include <src/util/string/ascii.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/ascii.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 #include <src/util/string/split.h>
 #include <src/util/stream/file.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #if defined(_linux_)
 /*
diff --git a/src/util/system/interrupt_signals.cpp b/src/util/system/interrupt_signals.cpp
index 4b88f8e381..f4dbac6a23 100644
--- a/src/util/system/interrupt_signals.cpp
+++ b/src/util/system/interrupt_signals.cpp
@@ -1,6 +1,6 @@
 #include "interrupt_signals.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <csignal>
 
diff --git a/src/util/system/madvise.cpp b/src/util/system/madvise.cpp
index 82f119fb7f..20b3056058 100644
--- a/src/util/system/madvise.cpp
+++ b/src/util/system/madvise.cpp
@@ -2,12 +2,12 @@
 #include "align.h"
 #include "info.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <string>
 
 #if defined(_win_)
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
 #else
     #include <sys/mman.h>
 #endif
diff --git a/src/util/system/maxlen.cpp b/src/util/system/maxlen.cpp
index bcc9d72a4f..42e26828c5 100644
--- a/src/util/system/maxlen.cpp
+++ b/src/util/system/maxlen.cpp
@@ -1 +1 @@
-#include "maxlen.h"
+#include <ydb-cpp-sdk/util/system/maxlen.h>
diff --git a/src/util/system/mem_info.cpp b/src/util/system/mem_info.cpp
index 3989bc46bf..285d909b96 100644
--- a/src/util/system/mem_info.cpp
+++ b/src/util/system/mem_info.cpp
@@ -3,8 +3,8 @@
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
 #include <src/util/stream/file.h>
-#include <src/util/string/cast.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 #include "error.h"
 #include "info.h"
 
@@ -20,7 +20,7 @@
     #endif
 #elif defined(_win_)
     #include <Windows.h>
-    #include <src/util/generic/ptr.h>
+    #include <ydb-cpp-sdk/util/generic/ptr.h>
 
 using NTSTATUS = LONG;
     #define STATUS_INFO_LENGTH_MISMATCH 0xC0000004
diff --git a/src/util/system/mem_info.h b/src/util/system/mem_info.h
index f303d49197..017999a39a 100644
--- a/src/util/system/mem_info.h
+++ b/src/util/system/mem_info.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "compat.h"
+#include <ydb-cpp-sdk/util/system/compat.h>
 
 namespace NMemInfo {
     struct TMemInfo {
diff --git a/src/util/system/mincore.cpp b/src/util/system/mincore.cpp
index 3a156e39d7..7ec489f67a 100644
--- a/src/util/system/mincore.cpp
+++ b/src/util/system/mincore.cpp
@@ -2,7 +2,7 @@
 #include "info.h"
 #include "mincore.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <cstring>
 
diff --git a/src/util/system/mktemp.cpp b/src/util/system/mktemp.cpp
index 8700413215..cd4fdd80ed 100644
--- a/src/util/system/mktemp.cpp
+++ b/src/util/system/mktemp.cpp
@@ -1,7 +1,7 @@
 #include "tempfile.h"
 
 #include <src/util/folder/dirut.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include <cstring>
 
diff --git a/src/util/system/mktemp_system.cpp b/src/util/system/mktemp_system.cpp
index 4a7b1eaefa..18dd740826 100644
--- a/src/util/system/mktemp_system.cpp
+++ b/src/util/system/mktemp_system.cpp
@@ -42,8 +42,8 @@
     #include <src/util/folder/dirut.h>
 #endif
 
-#include <src/util/random/random.h>
-#include "sysstat.h"
+#include <ydb-cpp-sdk/util/random/random.h>
+#include <ydb-cpp-sdk/util/system/sysstat.h>
 
 static const unsigned char padchar[] =
     "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
diff --git a/src/util/system/mlock.cpp b/src/util/system/mlock.cpp
index c3eefea47f..5c5b4edd18 100644
--- a/src/util/system/mlock.cpp
+++ b/src/util/system/mlock.cpp
@@ -1,4 +1,4 @@
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include "align.h"
 #include "error.h"
 #include "info.h"
diff --git a/src/util/system/mlock.h b/src/util/system/mlock.h
index e1d901f13b..a23513f8c5 100644
--- a/src/util/system/mlock.h
+++ b/src/util/system/mlock.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
 
 //on some systems (not win, freebd, linux, but darwin (Mac OS X)
 //multiple mlock calls on the same address range
diff --git a/src/util/system/pipe.cpp b/src/util/system/pipe.cpp
index 43e5792f81..cd4103ca37 100644
--- a/src/util/system/pipe.cpp
+++ b/src/util/system/pipe.cpp
@@ -1,6 +1,6 @@
 #include "pipe.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 ssize_t TPipeHandle::Read(void* buffer, size_t byteCount) const noexcept {
 #ifdef _win_
diff --git a/src/util/system/pipe.h b/src/util/system/pipe.h
index db5c93ead9..9c765298c6 100644
--- a/src/util/system/pipe.h
+++ b/src/util/system/pipe.h
@@ -6,10 +6,10 @@
 #endif
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "file.h"
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/system/file.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/network/pair.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 using PIPEHANDLE = SOCKET;
 #define INVALID_PIPEHANDLE INVALID_SOCKET
diff --git a/src/util/system/progname.cpp b/src/util/system/progname.cpp
index b412a3a3f2..4ba8bc3828 100644
--- a/src/util/system/progname.cpp
+++ b/src/util/system/progname.cpp
@@ -1,8 +1,8 @@
 #include "execpath.h"
-#include "progname.h"
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 #include <src/util/folder/dirut.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 static const char* Argv0;
 
diff --git a/src/util/system/progname_ut.cpp b/src/util/system/progname_ut.cpp
index 5b5dfb7c4d..0a20ff144d 100644
--- a/src/util/system/progname_ut.cpp
+++ b/src/util/system/progname_ut.cpp
@@ -1,4 +1,4 @@
-#include "progname.h"
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 #include <src/library/testing/unittest/registar.h>
 
diff --git a/src/util/system/protect.cpp b/src/util/system/protect.cpp
index 606fc19ca2..152c79bf6a 100644
--- a/src/util/system/protect.cpp
+++ b/src/util/system/protect.cpp
@@ -1,8 +1,8 @@
 #include "protect.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
 #if defined(_unix_) || defined(_darwin_)
     #include <sys/mman.h>
diff --git a/src/util/system/protect.h b/src/util/system/protect.h
index 06b4b10e7f..d2ab833e18 100644
--- a/src/util/system/protect.h
+++ b/src/util/system/protect.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/flags.h>
+#include <ydb-cpp-sdk/util/generic/flags.h>
 
 enum EProtectMemoryMode {
     PM_NONE = 0x00,  // no access allowed
diff --git a/src/util/system/rusage.cpp b/src/util/system/rusage.cpp
index a95d25221d..8f73de49e9 100644
--- a/src/util/system/rusage.cpp
+++ b/src/util/system/rusage.cpp
@@ -15,7 +15,7 @@
 
 #endif
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #include "info.h"
 
diff --git a/src/util/system/rusage.h b/src/util/system/rusage.h
index 30bfae1b79..ac91fb7914 100644
--- a/src/util/system/rusage.h
+++ b/src/util/system/rusage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
 /// portable getrusage
diff --git a/src/util/system/rwlock.cpp b/src/util/system/rwlock.cpp
index c3da4c4a4a..c1ef34546e 100644
--- a/src/util/system/rwlock.cpp
+++ b/src/util/system/rwlock.cpp
@@ -1,6 +1,6 @@
-#include "rwlock.h"
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #if defined(_unix_)
     #include <errno.h>
diff --git a/src/util/system/rwlock_ut.cpp b/src/util/system/rwlock_ut.cpp
index 83a2566e5b..723378fbcc 100644
--- a/src/util/system/rwlock_ut.cpp
+++ b/src/util/system/rwlock_ut.cpp
@@ -1,9 +1,9 @@
-#include "rwlock.h"
+#include <ydb-cpp-sdk/util/system/rwlock.h>
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/thread/pool.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <atomic>
 
diff --git a/src/util/system/sem.cpp b/src/util/system/sem.cpp
index 113f31edbe..5c7436389c 100644
--- a/src/util/system/sem.cpp
+++ b/src/util/system/sem.cpp
@@ -38,11 +38,11 @@ union semun arg;
 #endif
 
 #include <src/util/digest/city.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/random/fast.h>
 
 #if !defined(_unix_) || defined(_darwin_)
-    #include <src/util/random/random.h>
+    #include <ydb-cpp-sdk/util/random/random.h>
 #endif
 
 namespace {
diff --git a/src/util/system/sem.h b/src/util/system/sem.h
index b3bbe57aa7..b34258e0ae 100644
--- a/src/util/system/sem.h
+++ b/src/util/system/sem.h
@@ -2,7 +2,7 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 //named sempahore
 class TSemaphore {
diff --git a/src/util/system/shellcommand.cpp b/src/util/system/shellcommand.cpp
index 003b5b8344..967a9effa5 100644
--- a/src/util/system/shellcommand.cpp
+++ b/src/util/system/shellcommand.cpp
@@ -6,13 +6,13 @@
 #include <ydb-cpp-sdk/library/string_utils/helpers/helpers.h>
 
 #include <src/util/folder/dirut.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/generic/buffer.h>
-#include <src/util/generic/yexception.h>
-#include <src/util/memory/tempbuf.h>
-#include <src/util/network/socket.h>
-#include <src/util/stream/str.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
+#include <ydb-cpp-sdk/util/network/socket.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/system/info.h>
 #include <src/util/system/pipe.h>
 
diff --git a/src/util/system/shellcommand.h b/src/util/system/shellcommand.h
index 233c34d2e8..fde30a2351 100644
--- a/src/util/system/shellcommand.h
+++ b/src/util/system/shellcommand.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 #include <src/util/generic/hash.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/output.h>
-#include "file.h"
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/system/file.h>
 #include "getpid.h"
 #include "thread.h"
 #include <sys/types.h>
diff --git a/src/util/system/shellcommand_ut.cpp b/src/util/system/shellcommand_ut.cpp
index fc5acdf04f..2076a9649f 100644
--- a/src/util/system/shellcommand_ut.cpp
+++ b/src/util/system/shellcommand_ut.cpp
@@ -9,11 +9,11 @@
 #include <src/library/testing/unittest/env.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 #include <src/util/stream/file.h>
-#include <src/util/stream/str.h>
-#include <src/util/stream/mem.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 #include <src/util/folder/tempdir.h>
 
 #include <mutex>
diff --git a/src/util/system/shmat.h b/src/util/system/shmat.h
index 7e9268b288..a610976208 100644
--- a/src/util/system/shmat.h
+++ b/src/util/system/shmat.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "fhandle.h"
+#include <ydb-cpp-sdk/util/system/fhandle.h>
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/guid.h>
 
 class TSharedMemory: public TThrRefBase {
diff --git a/src/util/system/sigset.h b/src/util/system/sigset.h
index 8dd02fd817..2117dfddca 100644
--- a/src/util/system/sigset.h
+++ b/src/util/system/sigset.h
@@ -2,7 +2,7 @@
 
 // Functions for manipulating signal sets
 
-#include "compat.h"
+#include <ydb-cpp-sdk/util/system/compat.h>
 
 #if defined _unix_
     #include <pthread.h>
diff --git a/src/util/system/spin_wait.cpp b/src/util/system/spin_wait.cpp
index 421cbd9410..d82912fd33 100644
--- a/src/util/system/spin_wait.cpp
+++ b/src/util/system/spin_wait.cpp
@@ -1,10 +1,10 @@
-#include "spin_wait.h"
+#include <ydb-cpp-sdk/util/system/spin_wait.h>
 #include "yield.h"
-#include "compat.h"
-#include "spinlock.h"
+#include <ydb-cpp-sdk/util/system/compat.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 
-#include <src/util/digest/numeric.h>
-#include <src/util/generic/utility.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/generic/utility.h>
 
 #include <atomic>
 
diff --git a/src/util/system/spinlock.cpp b/src/util/system/spinlock.cpp
index 63a803a30e..4eed971cee 100644
--- a/src/util/system/spinlock.cpp
+++ b/src/util/system/spinlock.cpp
@@ -1 +1 @@
-#include "spinlock.h"
+#include <ydb-cpp-sdk/util/system/spinlock.h>
diff --git a/src/util/system/src_location.cpp b/src/util/system/src_location.cpp
index c93a93ecee..00467a2d6b 100644
--- a/src/util/system/src_location.cpp
+++ b/src/util/system/src_location.cpp
@@ -1,6 +1,6 @@
-#include "src_location.h"
+#include <ydb-cpp-sdk/util/system/src_location.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 
 template <>
 void Out<TSourceLocation>(IOutputStream& o, const TSourceLocation& t) {
diff --git a/src/util/system/src_location_ut.cpp b/src/util/system/src_location_ut.cpp
index f31c36dadc..64e9b61f22 100644
--- a/src/util/system/src_location_ut.cpp
+++ b/src/util/system/src_location_ut.cpp
@@ -1,6 +1,6 @@
 #include "src_location.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <src/library/testing/unittest/registar.h>
 
diff --git a/src/util/system/src_root_ut.cpp b/src/util/system/src_root_ut.cpp
index 4182523e65..344cf626e7 100644
--- a/src/util/system/src_root_ut.cpp
+++ b/src/util/system/src_root_ut.cpp
@@ -1,4 +1,4 @@
-#include "src_root.h"
+#include <ydb-cpp-sdk/util/system/src_root.h>
 
 #include <src/util/folder/pathsplit.h>
 #include <src/library/testing/unittest/registar.h>
diff --git a/src/util/system/sysstat.cpp b/src/util/system/sysstat.cpp
index db3338b02e..0e99e99661 100644
--- a/src/util/system/sysstat.cpp
+++ b/src/util/system/sysstat.cpp
@@ -1,4 +1,4 @@
-#include "sysstat.h"
+#include <ydb-cpp-sdk/util/system/sysstat.h>
 
 #ifdef _win_
 
diff --git a/src/util/system/tempfile.h b/src/util/system/tempfile.h
index da6d386641..e9e7b10154 100644
--- a/src/util/system/tempfile.h
+++ b/src/util/system/tempfile.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fs.h"
-#include "file.h"
+#include <ydb-cpp-sdk/util/system/file.h>
 
 #include <src/util/folder/path.h>
 
diff --git a/src/util/system/tempfile_ut.cpp b/src/util/system/tempfile_ut.cpp
index 6e4cf6fb8a..7042420e00 100644
--- a/src/util/system/tempfile_ut.cpp
+++ b/src/util/system/tempfile_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/folder/dirut.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/stream/file.h>
 
 #include <algorithm>
diff --git a/src/util/system/thread.cpp b/src/util/system/thread.cpp
index d0a00af6c6..6b27ae6f97 100644
--- a/src/util/system/thread.cpp
+++ b/src/util/system/thread.cpp
@@ -4,11 +4,11 @@
 #include "thread.h"
 #include "thread.i"
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 #include <src/util/generic/ymath.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/yexception.h>
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <utility>
 
 #if defined(_linux_)
diff --git a/src/util/system/thread.h b/src/util/system/thread.h
index 3874216fe7..760cdbeba9 100644
--- a/src/util/system/thread.h
+++ b/src/util/system/thread.h
@@ -4,12 +4,12 @@
 /// If you need threads, use thread pool functionality in <src/util/thread/factory.h>
 /// @see SystemThreadFactory()
 
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 #include <string>
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
-#include "progname.h"
+#include <ydb-cpp-sdk/util/system/progname.h>
 
 bool SetHighestThreadPriority();
 bool SetLowestThreadPriority();
diff --git a/src/util/system/thread.i b/src/util/system/thread.i
index 471b9422f1..959c1657b3 100644
--- a/src/util/system/thread.i
+++ b/src/util/system/thread.i
@@ -17,7 +17,7 @@
     #include <pthread_np.h>
 #endif
 
-#include <src/util/digest/numeric.h>
+#include <ydb-cpp-sdk/util/digest/numeric.h>
 
 static inline size_t SystemCurrentThreadIdImpl() noexcept {
     #if defined(_unix_)
diff --git a/src/util/system/tls.cpp b/src/util/system/tls.cpp
index 8e42fe66ac..c44a51ccef 100644
--- a/src/util/system/tls.cpp
+++ b/src/util/system/tls.cpp
@@ -2,7 +2,7 @@
 
 #include <src/util/generic/hash.h>
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 #include <atomic>
 
diff --git a/src/util/system/tls.h b/src/util/system/tls.h
index cb9bdf4f98..bb295be1de 100644
--- a/src/util/system/tls.h
+++ b/src/util/system/tls.h
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/util/system/defaults.h>
 
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/noncopyable.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/noncopyable.h>
 
 #include <new>
 
diff --git a/src/util/system/type_name.cpp b/src/util/system/type_name.cpp
index a7e2039849..70ab912532 100644
--- a/src/util/system/type_name.cpp
+++ b/src/util/system/type_name.cpp
@@ -5,7 +5,7 @@
     #include <cxxabi.h>
 #endif
 
-#include "type_name.h"
+#include <ydb-cpp-sdk/util/system/type_name.h>
 
 namespace {
 
diff --git a/src/util/system/type_name_ut.cpp b/src/util/system/type_name_ut.cpp
index f5009a7933..7f048307ef 100644
--- a/src/util/system/type_name_ut.cpp
+++ b/src/util/system/type_name_ut.cpp
@@ -2,8 +2,8 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/yexception.h>
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <stdexcept>
 #include <string>
diff --git a/src/util/system/types.cpp b/src/util/system/types.cpp
index f2e06d6519..46b5c2f1e2 100644
--- a/src/util/system/types.cpp
+++ b/src/util/system/types.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/util/system/types.h>
 
 #include <ydb-cpp-sdk/util/generic/typetraits.h>
-#include <src/util/generic/typelist.h>
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 
 static_assert(sizeof(ui8) == 1, "incorrect ui8 type");
 static_assert(sizeof(ui16) == 2, "incorrect ui16 type");
diff --git a/src/util/system/unaligned_mem.cpp b/src/util/system/unaligned_mem.cpp
index b683ea9aae..e50eea3399 100644
--- a/src/util/system/unaligned_mem.cpp
+++ b/src/util/system/unaligned_mem.cpp
@@ -1 +1 @@
-#include "unaligned_mem.h"
+#include <ydb-cpp-sdk/util/system/unaligned_mem.h>
diff --git a/src/util/system/user.cpp b/src/util/system/user.cpp
index 5640b4a0db..f65e347604 100644
--- a/src/util/system/user.cpp
+++ b/src/util/system/user.cpp
@@ -1,6 +1,6 @@
 #include "user.h"
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 
 #ifdef _win_
     #include "winint.h"
diff --git a/src/util/system/user.h b/src/util/system/user.h
index 07197a5dc2..188b80c40e 100644
--- a/src/util/system/user.h
+++ b/src/util/system/user.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 std::string GetUsername();
diff --git a/src/util/system/winint.cpp b/src/util/system/winint.cpp
index b13033bdee..c68dd13d5c 100644
--- a/src/util/system/winint.cpp
+++ b/src/util/system/winint.cpp
@@ -1 +1 @@
-#include "winint.h"
+#include <ydb-cpp-sdk/util/system/winint.h>
diff --git a/src/util/system/yassert.cpp b/src/util/system/yassert.cpp
index 26bccd79c1..b34d0f433e 100644
--- a/src/util/system/yassert.cpp
+++ b/src/util/system/yassert.cpp
@@ -1,14 +1,14 @@
-#include "yassert.h"
+#include <ydb-cpp-sdk/util/system/yassert.h>
 
-#include "backtrace.h"
-#include "guard.h"
-#include "spinlock.h"
-#include "src_root.h"
+#include <ydb-cpp-sdk/util/system/backtrace.h>
+#include <ydb-cpp-sdk/util/system/guard.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/src_root.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/src/util/thread/factory.cpp b/src/util/thread/factory.cpp
index 5e968766b9..49e850d984 100644
--- a/src/util/thread/factory.cpp
+++ b/src/util/thread/factory.cpp
@@ -1,7 +1,7 @@
-#include "factory.h"
+#include <ydb-cpp-sdk/util/thread/factory.h>
 
 #include <src/util/system/thread.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 using IThread = IThreadFactory::IThread;
 
diff --git a/src/util/thread/factory_ut.cpp b/src/util/thread/factory_ut.cpp
index 171bf61dcb..fb2f5fbe60 100644
--- a/src/util/thread/factory_ut.cpp
+++ b/src/util/thread/factory_ut.cpp
@@ -1,4 +1,4 @@
-#include "factory.h"
+#include <ydb-cpp-sdk/util/thread/factory.h>
 #include "pool.h"
 
 #include <src/library/testing/unittest/registar.h>
diff --git a/src/util/thread/pool.cpp b/src/util/thread/pool.cpp
index d178c1866c..8723593796 100644
--- a/src/util/thread/pool.cpp
+++ b/src/util/thread/pool.cpp
@@ -7,21 +7,21 @@
 #endif
 
 #include <src/util/generic/intrlist.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <ydb-cpp-sdk/util/generic/ylimits.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 #include <src/util/generic/fastqueue.h>
 
-#include <src/util/stream/output.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/system/event.h>
+#include <ydb-cpp-sdk/util/system/event.h>
 #include <src/util/system/thread.h>
 
 #include <ydb-cpp-sdk/util/datetime/base.h>
 
-#include "factory.h"
-#include "pool.h"
+#include <ydb-cpp-sdk/util/thread/factory.h>
+#include <ydb-cpp-sdk/util/thread/pool.h>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/src/util/thread/pool_ut.cpp b/src/util/thread/pool_ut.cpp
index f137c9ef38..3f0471ce03 100644
--- a/src/util/thread/pool_ut.cpp
+++ b/src/util/thread/pool_ut.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/registar.h>
 
 #include <src/util/random/fast.h>
-#include <src/util/system/spinlock.h>
+#include <ydb-cpp-sdk/util/system/spinlock.h>
 #include <src/util/system/thread.h>
 
 #include <mutex>
diff --git a/src/util/thread/singleton.h b/src/util/thread/singleton.h
index 48bd5777d8..ee23cda0be 100644
--- a/src/util/thread/singleton.h
+++ b/src/util/thread/singleton.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <src/util/system/tls.h>
-#include <src/util/generic/singleton.h>
-#include <src/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
 
 namespace NPrivate {
     template <class T, size_t Priority>
diff --git a/src/util/ysafeptr.h b/src/util/ysafeptr.h
index 70b983bd59..e75fb7c9ee 100644
--- a/src/util/ysafeptr.h
+++ b/src/util/ysafeptr.h
@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
-#include <src/util/system/yassert.h>
+#include <ydb-cpp-sdk/util/system/yassert.h>
 #include <ydb-cpp-sdk/util/system/defaults.h>
 #include <src/util/system/tls.h>
 
@@ -22,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #if defined(_MSC_VER) && defined(_DEBUG)
-    #include <src/util/system/winint.h>
+    #include <ydb-cpp-sdk/util/system/winint.h>
     #define CHECK_YPTR2
 #endif
 
diff --git a/src/util/ysaveload.cpp b/src/util/ysaveload.cpp
index 5b8cb0cb2c..4a046d2b5a 100644
--- a/src/util/ysaveload.cpp
+++ b/src/util/ysaveload.cpp
@@ -1,4 +1,4 @@
-#include "ysaveload.h"
+#include <ydb-cpp-sdk/util/ysaveload.h>
 
 #include <src/util/generic/buffer.h>
 
diff --git a/src/util/ysaveload_ut.cpp b/src/util/ysaveload_ut.cpp
index 6cbe428d81..c427be77b8 100644
--- a/src/util/ysaveload_ut.cpp
+++ b/src/util/ysaveload_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <src/util/memory/pool.h>
 #include <src/util/stream/buffer.h>
-#include <src/util/memory/blob.h>
+#include <ydb-cpp-sdk/util/memory/blob.h>
 
 #include <src/util/generic/hash_multi_map.h>
 
diff --git a/src/yson_value/ydb_yson_value.cpp b/src/yson_value/ydb_yson_value.cpp
index 075afb1aa2..0f39d33a92 100644
--- a/src/yson_value/ydb_yson_value.cpp
+++ b/src/yson_value/ydb_yson_value.cpp
@@ -1,11 +1,11 @@
 #include <ydb-cpp-sdk/yson_value/ydb_yson_value.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <ydb-cpp-sdk/client/value/value.h>
 #include <ydb-cpp-sdk/client/result/result.h>
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 namespace NYdb {
 
diff --git a/tests/client/endpoints_ut.cpp b/tests/client/endpoints_ut.cpp
index eef6e8728c..dcceae531e 100644
--- a/tests/client/endpoints_ut.cpp
+++ b/tests/client/endpoints_ut.cpp
@@ -5,7 +5,7 @@
 #include <ydb-cpp-sdk/library/threading/future/core/future.h>
 
 #include <src/util/system/thread.h>
-#include <src/util/random/random.h>
+#include <ydb-cpp-sdk/util/random/random.h>
 
 #include <unordered_set>
 
diff --git a/tests/library/login/login_ut.cpp b/tests/library/login/login_ut.cpp
index 05551190e8..83c6fc23f2 100644
--- a/tests/library/login/login_ut.cpp
+++ b/tests/library/login/login_ut.cpp
@@ -1,5 +1,5 @@
 #include <src/library/testing/unittest/registar.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include "login.h"
 
 using namespace NLogin;
diff --git a/tests/library/testing/common/network_ut.cpp b/tests/library/testing/common/network_ut.cpp
index 21731802c2..2157a978c0 100644
--- a/tests/library/testing/common/network_ut.cpp
+++ b/tests/library/testing/common/network_ut.cpp
@@ -5,7 +5,7 @@
 #include <src/util/folder/dirut.h>
 #include <src/util/folder/path.h>
 #include <src/util/folder/tempdir.h>
-#include <src/util/network/sock.h>
+#include <ydb-cpp-sdk/util/network/sock.h>
 #include <src/util/system/fs.h>
 
 #include <src/library/testing/gtest/gtest.h>
diff --git a/tests/library/testing/gtest_extensions/gtest_extensions_ut.cpp b/tests/library/testing/gtest_extensions/gtest_extensions_ut.cpp
index 82897fa2c4..261cc0dc44 100644
--- a/tests/library/testing/gtest_extensions/gtest_extensions_ut.cpp
+++ b/tests/library/testing/gtest_extensions/gtest_extensions_ut.cpp
@@ -1,7 +1,7 @@
 #include <src/library/testing/gtest/gtest.h>
 
-#include <src/util/stream/output.h>
-#include <src/util/stream/str.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/str.h>
 
 #include <string>
 
diff --git a/tests/library/testing/unittest/main.cpp b/tests/library/testing/unittest/main.cpp
index 746d88979f..646306151d 100644
--- a/tests/library/testing/unittest/main.cpp
+++ b/tests/library/testing/unittest/main.cpp
@@ -3,7 +3,7 @@
 #include <src/library/testing/unittest/tests_data.h>
 
 #include <src/util/generic/set.h>
-#include <src/util/network/sock.h>
+#include <ydb-cpp-sdk/util/network/sock.h>
 #include <src/util/system/fs.h>
 
 TEST(GTest, Test1) {
diff --git a/tests/library/yql/yql_issue_ut.cpp b/tests/library/yql/yql_issue_ut.cpp
index 563690ba24..5be6e998fe 100644
--- a/tests/library/yql/yql_issue_ut.cpp
+++ b/tests/library/yql/yql_issue_ut.cpp
@@ -10,7 +10,7 @@
 
 #include <src/util/charset/utf8.h>
 #include <src/util/charset/wide.h>
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
diff --git a/tools/enum_parser/enum_parser/main.cpp b/tools/enum_parser/enum_parser/main.cpp
index e9f755b014..3f7c0a5d93 100644
--- a/tools/enum_parser/enum_parser/main.cpp
+++ b/tools/enum_parser/enum_parser/main.cpp
@@ -5,21 +5,21 @@
 #include <tools/enum_parser/parse_enum/parse_enum.h>
 
 #include <src/util/stream/file.h>
-#include <src/util/stream/output.h>
-#include <src/util/stream/input.h>
-#include <src/util/stream/mem.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/stream/mem.h>
 
 #include <src/util/charset/wide.h>
-#include <src/util/string/builder.h>
-#include <src/util/string/escape.h>
-#include <src/util/string/strip.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/join.h>
-#include <src/util/string/subst.h>
+#include <ydb-cpp-sdk/util/string/subst.h>
 #include <string>
 
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/system/fs.h>
 #include <src/util/folder/path.h>
 
@@ -31,13 +31,13 @@ void WriteHeader(const std::string& headerName, std::ostream& out, std::ostream*
     out << "#include <tools/enum_parser/enum_serialization_runtime/enum_runtime.h>\n\n";
     out << "#include <tools/enum_parser/enum_parser/stdlib_deps.h>\n\n";
     out << "#include <ydb-cpp-sdk/util/generic/typetraits.h>\n";
-    out << "#include <src/util/generic/singleton.h>\n";
+    out << "#include <ydb-cpp-sdk/util/generic/singleton.h>\n";
     out << "#include <string>\n";
     out << "#include <vector>\n";
     out << "#include <map>\n";
     out << "#include <span>\n";
-    out << "#include <src/util/string/cast.h>\n";
-    out << "#include <src/util/stream/output.h>\n\n";
+    out << "#include <ydb-cpp-sdk/util/string/cast.h>\n";
+    out << "#include <ydb-cpp-sdk/util/stream/output.h>\n\n";
 
     if (headerOutPtr) {
         auto& outHeader = *headerOutPtr;
diff --git a/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp b/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp
index 345abc4d67..e0ca62271b 100644
--- a/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp
+++ b/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp
@@ -1,8 +1,8 @@
 #include "enum_runtime.h"
 
-#include <src/util/string/builder.h>
+#include <ydb-cpp-sdk/util/string/builder.h>
 
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 
 namespace NEnumSerializationRuntime {
     template <typename TEnumRepresentationType>
diff --git a/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h b/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h
index 9c273e4762..ec341b54d2 100644
--- a/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h
+++ b/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <src/util/generic/algorithm.h>
-#include <src/util/stream/input.h>
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/stream/input.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <span>
 #include <array>
 #include <functional>
diff --git a/tools/enum_parser/enum_serialization_runtime/serialized_enum.h b/tools/enum_parser/enum_serialization_runtime/serialized_enum.h
index 5241de3036..d50fe3c7bb 100644
--- a/tools/enum_parser/enum_serialization_runtime/serialized_enum.h
+++ b/tools/enum_parser/enum_serialization_runtime/serialized_enum.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 
 #include <cstddef>
 #include <iterator>
diff --git a/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp b/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp
index 80c86facdc..bc3f8bf59b 100644
--- a/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp
+++ b/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/typelist.h>
+#include <ydb-cpp-sdk/util/generic/typelist.h>
 #include <src/util/generic/vector.h>
 
 #include <map>
diff --git a/tools/enum_parser/parse_enum/benchmark/main.cpp b/tools/enum_parser/parse_enum/benchmark/main.cpp
index 714242f0b3..2f77dd028e 100644
--- a/tools/enum_parser/parse_enum/benchmark/main.cpp
+++ b/tools/enum_parser/parse_enum/benchmark/main.cpp
@@ -1,10 +1,10 @@
 #include <tools/enum_parser/parse_enum/benchmark/enum.h_serialized.h>
 #include <src/library/testing/benchmark/bench.h>
-#include <src/util/generic/algorithm.h>
+#include <ydb-cpp-sdk/util/generic/algorithm.h>
 #include <src/util/generic/vector.h>
-#include <src/util/generic/xrange.h>
+#include <ydb-cpp-sdk/util/generic/xrange.h>
 #include <src/util/stream/null.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 namespace {
 
diff --git a/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp b/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp
index 2b9847cc78..15f9d1b1e2 100644
--- a/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp
+++ b/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp
@@ -2,7 +2,7 @@
 #include <tools/enum_parser/parse_enum/benchmark_build/lib/enum_enormous.h_serialized.h>
 #include <src/library/testing/unittest/registar.h>
 #include <src/util/generic/serialized_enum.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 
 
 namespace {
diff --git a/tools/enum_parser/parse_enum/parse_enum.cpp b/tools/enum_parser/parse_enum/parse_enum.cpp
index 4a94e0f63d..1896455c47 100644
--- a/tools/enum_parser/parse_enum/parse_enum.cpp
+++ b/tools/enum_parser/parse_enum/parse_enum.cpp
@@ -2,9 +2,9 @@
 
 #include <src/library/cppparser/parser.h>
 
-#include <src/util/generic/yexception.h>
+#include <ydb-cpp-sdk/util/generic/yexception.h>
 #include <src/util/stream/file.h>
-#include <src/util/string/escape.h>
+#include <ydb-cpp-sdk/util/string/escape.h>
 
 #include <iostream>
 
diff --git a/tools/enum_parser/parse_enum/parse_enum.h b/tools/enum_parser/parse_enum/parse_enum.h
index 7f8f84258b..71671ba916 100644
--- a/tools/enum_parser/parse_enum/parse_enum.h
+++ b/tools/enum_parser/parse_enum/parse_enum.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <src/util/stream/output.h>
-#include <src/util/string/strip.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
+#include <ydb-cpp-sdk/util/string/strip.h>
 
 #include <optional>
 #include <string>
diff --git a/tools/enum_parser/parse_enum/ut/enums.cpp b/tools/enum_parser/parse_enum/ut/enums.cpp
index c2dfcae003..81800bf3f8 100644
--- a/tools/enum_parser/parse_enum/ut/enums.cpp
+++ b/tools/enum_parser/parse_enum/ut/enums.cpp
@@ -8,8 +8,8 @@
 #include <src/util/generic/serialized_enum.h>
 #include <src/library/testing/unittest/registar.h>
 
-#include <src/util/generic/ptr.h>
-#include <src/util/generic/singleton.h>
+#include <ydb-cpp-sdk/util/generic/ptr.h>
+#include <ydb-cpp-sdk/util/generic/singleton.h>
 
 
 void FunctionUsingEFwdEnum(EFwdEnum) {
diff --git a/tools/enum_parser/parse_enum/ut/enums.h b/tools/enum_parser/parse_enum/ut/enums.h
index b1159bc725..d43b279907 100644
--- a/tools/enum_parser/parse_enum/ut/enums.h
+++ b/tools/enum_parser/parse_enum/ut/enums.h
@@ -1,7 +1,7 @@
 #pragma once
 // Sample file for parse_enum unittests
 
-#include <src/util/generic/fwd.h>
+#include <ydb-cpp-sdk/util/generic/fwd.h>
 #include <ydb-cpp-sdk/util/system/compiler.h>
 
 // Test template declarations
diff --git a/tools/rescompiler/main.cpp b/tools/rescompiler/main.cpp
index 45704a76c5..16b782f744 100644
--- a/tools/rescompiler/main.cpp
+++ b/tools/rescompiler/main.cpp
@@ -1,9 +1,9 @@
 #include <src/library/resource/registry.h>
 
-#include <src/util/stream/output.h>
+#include <ydb-cpp-sdk/util/stream/output.h>
 #include <src/util/stream/file.h>
 #include <src/util/digest/city.h>
-#include <src/util/string/cast.h>
+#include <ydb-cpp-sdk/util/string/cast.h>
 #include <src/util/string/hex.h>
 #include <src/util/string/vector.h>
 #include <src/util/string/split.h>