13 files changed, 16 insertions, 11 deletions
diff --git a/library/cpp/yt/misc/enum_indexed_array-inl.h b/library/cpp/yt/containers/enum_indexed_array-inl.h
index edda891683e..edda891683e 100644
--- a/library/cpp/yt/misc/enum_indexed_array-inl.h
+++ b/library/cpp/yt/containers/enum_indexed_array-inl.h
diff --git a/library/cpp/yt/misc/enum_indexed_array.h b/library/cpp/yt/containers/enum_indexed_array.h
index 8992456277f..bae6a75237a 100644
--- a/library/cpp/yt/misc/enum_indexed_array.h
+++ b/library/cpp/yt/containers/enum_indexed_array.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "enum.h"
+#include <library/cpp/yt/misc/enum.h>
 
 namespace NYT {
 
diff --git a/library/cpp/yt/misc/unittests/enum_indexed_array_ut.cpp b/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp
index 4111c6f4fec..a87c417d7d8 100644
--- a/library/cpp/yt/misc/unittests/enum_indexed_array_ut.cpp
+++ b/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/gtest/gtest.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT {
 namespace {
diff --git a/library/cpp/yt/containers/unittests/ya.make b/library/cpp/yt/containers/unittests/ya.make
index 3e7cfd4311d..3ffc4206589 100644
--- a/library/cpp/yt/containers/unittests/ya.make
+++ b/library/cpp/yt/containers/unittests/ya.make
@@ -1,8 +1,11 @@
-GTEST(unittester-containers)
+GTEST()
 
 INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
+SIZE(MEDIUM)
+
 SRCS(
+    enum_indexed_array_ut.cpp
     sharded_set_ut.cpp
 )
 
diff --git a/library/cpp/yt/misc/unittests/ya.make b/library/cpp/yt/misc/unittests/ya.make
index 43e9f9b9ff1..611edd72173 100644
--- a/library/cpp/yt/misc/unittests/ya.make
+++ b/library/cpp/yt/misc/unittests/ya.make
@@ -4,7 +4,6 @@ INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
 SRCS(
     enum_ut.cpp
-    enum_indexed_array_ut.cpp
     guid_ut.cpp
     preprocessor_ut.cpp
     strong_typedef_ut.cpp
diff --git a/library/cpp/yt/string/format-inl.h b/library/cpp/yt/string/format-inl.h
index 776b48e7fbb..85e82b473e8 100644
--- a/library/cpp/yt/string/format-inl.h
+++ b/library/cpp/yt/string/format-inl.h
@@ -11,8 +11,9 @@
 
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
+#include <library/cpp/yt/containers/enum_indexed_array.h>
+
 #include <library/cpp/yt/misc/enum.h>
-#include <library/cpp/yt/misc/enum_indexed_array.h>
 
 #include <util/system/platform.h>
 
diff --git a/library/cpp/ytalloc/api/ya.make b/library/cpp/ytalloc/api/ya.make
index 7e7852df14e..9cec6be14c4 100644
--- a/library/cpp/ytalloc/api/ya.make
+++ b/library/cpp/ytalloc/api/ya.make
@@ -6,6 +6,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/yt/misc
+    library/cpp/yt/containers
 )
 
 END()
diff --git a/library/cpp/ytalloc/api/ytalloc.h b/library/cpp/ytalloc/api/ytalloc.h
index 43ba48852d6..38879074dda 100644
--- a/library/cpp/ytalloc/api/ytalloc.h
+++ b/library/cpp/ytalloc/api/ytalloc.h
@@ -3,7 +3,8 @@
 #include <stddef.h>
 
 #include <library/cpp/yt/misc/enum.h>
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <util/system/types.h>
 
diff --git a/yt/yt/client/api/public.h b/yt/yt/client/api/public.h
index 55a72dd3c52..5f3db2e19a3 100644
--- a/yt/yt/client/api/public.h
+++ b/yt/yt/client/api/public.h
@@ -14,7 +14,7 @@
 
 #include <yt/yt/core/rpc/public.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NApi {
 
diff --git a/yt/yt/core/bus/tcp/dispatcher.h b/yt/yt/core/bus/tcp/dispatcher.h
index 8a64a6af1dc..6cc5f9f7f02 100644
--- a/yt/yt/core/bus/tcp/dispatcher.h
+++ b/yt/yt/core/bus/tcp/dispatcher.h
@@ -12,7 +12,7 @@
 
 #include <yt/yt/core/ytree/public.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NBus {
 
diff --git a/yt/yt/core/misc/serialize-inl.h b/yt/yt/core/misc/serialize-inl.h
index 6a0948e0518..63db8744ac3 100644
--- a/yt/yt/core/misc/serialize-inl.h
+++ b/yt/yt/core/misc/serialize-inl.h
@@ -10,7 +10,7 @@
 #include <library/cpp/yt/small_containers/compact_flat_map.h>
 #include <library/cpp/yt/small_containers/compact_set.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <optional>
 #include <variant>
diff --git a/yt/yt/core/yson/pull_parser_deserialize.h b/yt/yt/core/yson/pull_parser_deserialize.h
index 20cd57b68a1..93af8deb784 100644
--- a/yt/yt/core/yson/pull_parser_deserialize.h
+++ b/yt/yt/core/yson/pull_parser_deserialize.h
@@ -4,7 +4,7 @@
 
 #include "pull_parser.h"
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NYson {
 
diff --git a/yt/yt/core/ytree/serialize.h b/yt/yt/core/ytree/serialize.h
index ed58a6f934a..8b73fe812f7 100644
--- a/yt/yt/core/ytree/serialize.h
+++ b/yt/yt/core/ytree/serialize.h
@@ -12,7 +12,7 @@
 
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <optional>