Intermediate changes

7 files changed, 14 insertions, 12 deletions

diff --git a/yt/yt/client/object_client/helpers.cpp b/yt/yt/client/object_client/helpers.cpp
index b5f1387c86e..b3058b99b43 100644
--- a/yt/yt/client/object_client/helpers.cpp
+++ b/yt/yt/client/object_client/helpers.cpp
@@ -92,11 +92,13 @@ bool IsVersionedType(EObjectType type)
         type == EObjectType::LockMap ||
         type == EObjectType::TabletMap ||
         type == EObjectType::TabletCellMap ||
+        type == EObjectType::VirtualTabletCellMap ||
         type == EObjectType::TabletCellNode ||
         type == EObjectType::TabletCellBundleMap ||
         type == EObjectType::TabletActionMap ||
         type == EObjectType::AreaMap ||
         type == EObjectType::ChaosCellMap ||
+        type == EObjectType::VirtualChaosCellMap ||
         type == EObjectType::ChaosCellBundleMap ||
         type == EObjectType::SysNode ||
         type == EObjectType::PortalEntrance ||
diff --git a/yt/yt/client/object_client/public.h b/yt/yt/client/object_client/public.h
index ae644ad3432..b305d32ed3c 100644
--- a/yt/yt/client/object_client/public.h
+++ b/yt/yt/client/object_client/public.h
@@ -288,6 +288,7 @@ DEFINE_ENUM(EObjectType,
     ((AreaMap)                                      (714))
     ((HunkStorage)                                  (715))
     ((HunkTablet)                                   (716))
+    ((VirtualTabletCellMap)                         (717))
 
     // Node Tracker stuff
     ((Rack)                                         (800))
@@ -326,6 +327,7 @@ DEFINE_ENUM(EObjectType,
     ((ChaosTableReplica)                           (1205))
     ((ChaosReplicatedTable)                        (1206))
     ((ReplicationCardCollocation)                  (1207))
+    ((VirtualChaosCellMap)                         (1208))
 
     // Maintenance tracker stuff
     ((ClusterProxyNode)                            (1500))
diff --git a/yt/yt/core/yson/consumer.h b/yt/yt/core/yson/consumer.h
index fb8bb29ba8a..96420f289c1 100644
--- a/yt/yt/core/yson/consumer.h
+++ b/yt/yt/core/yson/consumer.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "public.h"
-
-#include <library/cpp/yt/memory/ref.h>
+#include <library/cpp/yt/yson_string/public.h>
 
 #include <library/cpp/yt/yson/consumer.h>
 
@@ -27,7 +25,6 @@ public:
     //! Parses #str and converts it into a sequence of elementary calls.
     void OnRaw(TStringBuf str, EYsonType type) override;
     using IYsonConsumer::OnRaw;
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/yson/depth_limiting_yson_consumer.cpp b/yt/yt/core/yson/depth_limiting_yson_consumer.cpp
index 7dcfb86bf8d..108d690c560 100644
--- a/yt/yt/core/yson/depth_limiting_yson_consumer.cpp
+++ b/yt/yt/core/yson/depth_limiting_yson_consumer.cpp
@@ -2,12 +2,8 @@
 #include "forwarding_consumer.h"
 #include "null_consumer.h"
 
-#include <yt/yt/core/logging/log.h>
-
 #include <yt/yt/core/misc/error.h>
 
-#include <yt/yt/core/ytree/public.h>
-
 namespace NYT::NYson {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/yson/depth_limiting_yson_consumer.h b/yt/yt/core/yson/depth_limiting_yson_consumer.h
index 2519a4047c2..ecb399ab909 100644
--- a/yt/yt/core/yson/depth_limiting_yson_consumer.h
+++ b/yt/yt/core/yson/depth_limiting_yson_consumer.h
@@ -1,5 +1,8 @@
-#include "public.h"
-#include "consumer.h"
+#pragma once
+
+#include <library/cpp/yt/yson_string/public.h>
+
+#include <library/cpp/yt/yson/public.h>
 
 namespace NYT::NYson {
 
diff --git a/yt/yt/core/yson/ypath_designated_consumer.h b/yt/yt/core/yson/ypath_designated_consumer.h
index 546564237c2..2cb23e1fd78 100644
--- a/yt/yt/core/yson/ypath_designated_consumer.h
+++ b/yt/yt/core/yson/ypath_designated_consumer.h
@@ -1,8 +1,9 @@
-#include "public.h"
-#include "consumer.h"
+#pragma once
 
 #include <yt/yt/core/ypath/public.h>
 
+#include <library/cpp/yt/yson/public.h>
+
 namespace NYT::NYson {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/library/monitoring/monitoring_manager.h b/yt/yt/library/monitoring/monitoring_manager.h
index fc5c3de6c76..b2582bbe708 100644
--- a/yt/yt/library/monitoring/monitoring_manager.h
+++ b/yt/yt/library/monitoring/monitoring_manager.h
@@ -3,6 +3,7 @@
 #include "public.h"
 
 #include <yt/yt/core/yson/consumer.h>
+#include <yt/yt/core/yson/producer.h>
 
 #include <yt/yt/core/ypath/public.h>