Revert "Split ydb/core/control circular dependencies with ydb/core/base (#14972), KIKIMR-22738"

This reverts commit 22b98a2.

Author: zverevgeny

ydb/core/base/appdata.cpp

@@ -10,7 +10,7 @@
 #include "resource_profile.h"
 #include "event_filter.h"
 
-#include <ydb/core/control/lib/immediate_control_board_impl.h>
+#include <ydb/core/control/immediate_control_board_impl.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/core/jaeger_tracing/sampling_throttling_configurator.h>
 #include <ydb/core/tablet_flat/shared_cache_pages.h>

ydb/core/base/appdata.h

@@ -28,7 +28,7 @@
 #include "resource_profile.h"
 #include "event_filter.h"
 
-#include <ydb/core/control/lib/immediate_control_board_impl.h>
+#include <ydb/core/control/immediate_control_board_impl.h>
 #include <ydb/library/pdisk_io/aio.h>
 
 #include <ydb/core/base/event_filter.h>

ydb/core/blobstorage/common/immediate_control_defaults.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
+#include <ydb/core/control/immediate_control_board_wrapper.h>
 
 namespace NKikimr {
 

ydb/core/blobstorage/dsproxy/ya.make

@@ -68,7 +68,7 @@ PEERDIR(
     ydb/core/blobstorage/groupinfo
     ydb/core/blobstorage/storagepoolmon
     ydb/core/blobstorage/vdisk/ingress
-    ydb/core/control/lib
+    ydb/core/control
     ydb/core/util
 )
 

ydb/core/blobstorage/nodewarden/ya.make

@@ -45,7 +45,7 @@ PEERDIR(
     ydb/core/blobstorage/crypto
     ydb/core/blobstorage/groupinfo
     ydb/core/blobstorage/pdisk
-    ydb/core/control/lib
+    ydb/core/control
     ydb/library/pdisk_io
     ydb/library/yaml_config
     ydb/core/util/actorsys_test

ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h

@@ -10,7 +10,7 @@
 #include <ydb/library/actors/core/executor_pool_basic.h>
 #include <ydb/library/actors/core/mon.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
-#include <ydb/core/control/lib/immediate_control_board_impl.h>
+#include <ydb/core/control/immediate_control_board_impl.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/core/protos/netclassifier.pb.h>

ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice.h

@@ -6,7 +6,7 @@
 #include "blobstorage_pdisk_util_devicemode.h"
 
 #include <ydb/core/base/blobstorage.h>
-#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
+#include <ydb/core/control/immediate_control_board_wrapper.h>
 #include <ydb/library/pdisk_io/aio.h>
 #include <ydb/library/pdisk_io/drivedata.h>
 #include <ydb/library/pdisk_io/sector_map.h>

ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp

@@ -8,7 +8,7 @@
 #include "blobstorage_pdisk_ut_defs.h"
 #include "blobstorage_pdisk_ut_helpers.h"
 
-#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
+#include <ydb/core/control/immediate_control_board_wrapper.h>
 #include <ydb/core/util/random.h>
 
 #include <library/cpp/deprecated/atomic/atomic.h>

ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h

@@ -3,7 +3,7 @@
 
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/blobstorage/base/vdisk_priorities.h>
-#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
+#include <ydb/core/control/immediate_control_board_wrapper.h>
 #include <ydb/core/protos/blobstorage_base.pb.h>
 #include <ydb/core/protos/blobstorage_config.pb.h>
 #include <ydb/core/protos/blobstorage_disk.pb.h>

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp

@@ -6,7 +6,7 @@
 #include "blobstorage_pdisk_request_id.h"
 
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
-#include <ydb/core/control/lib/immediate_control_board_impl.h>
+#include <ydb/core/control/immediate_control_board_impl.h>
 #include <ydb/core/protos/blobstorage.pb.h>
 #include <ydb/core/blobstorage/crypto/secured_block.h>
 #include <ydb/library/schlab/schine/job_kind.h>