Get rid of extra actorsystem.h include. (#20656)

actorsystem.h mainly used to send events in to the actorsystem outside actor context.

97 files changed, 66 insertions, 97 deletions

diff --git a/ydb/apps/etcd_proxy/service/etcd_shared.h b/ydb/apps/etcd_proxy/service/etcd_shared.h
index a6d9b16c461..138c7c2726c 100644
--- a/ydb/apps/etcd_proxy/service/etcd_shared.h
+++ b/ydb/apps/etcd_proxy/service/etcd_shared.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <atomic>
 
diff --git a/ydb/core/actorlib_impl/actor_tracker.cpp b/ydb/core/actorlib_impl/actor_tracker.cpp
index c50eba53dff..4baaa3023c3 100644
--- a/ydb/core/actorlib_impl/actor_tracker.cpp
+++ b/ydb/core/actorlib_impl/actor_tracker.cpp
@@ -1,5 +1,5 @@
 #include "actor_tracker.h"
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/executor_thread.h>
 #include <ydb/library/actors/core/hfunc.h>
 
diff --git a/ydb/core/base/pool_stats_collector.h b/ydb/core/base/pool_stats_collector.h
index 0fc3b857a70..dd76708914d 100644
--- a/ydb/core/base/pool_stats_collector.h
+++ b/ydb/core/base/pool_stats_collector.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "defs.h"
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
 namespace NActors {
diff --git a/ydb/core/client/server/msgbus_server.h b/ydb/core/client/server/msgbus_server.h
index 0bca08f7b3f..97ab53dab78 100644
--- a/ydb/core/client/server/msgbus_server.h
+++ b/ydb/core/client/server/msgbus_server.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/public/lib/base/defs.h>
 #include <ydb/public/lib/base/msgbus.h>
diff --git a/ydb/core/driver_lib/run/factories.h b/ydb/core/driver_lib/run/factories.h
index 492f3b6a92c..62d19a7bca4 100644
--- a/ydb/core/driver_lib/run/factories.h
+++ b/ydb/core/driver_lib/run/factories.h
@@ -22,7 +22,6 @@
 
 #include <ydb/library/yaml_config/yaml_config.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/wilson/wilson_uploader.h>
 
 #include <functional>
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h
index 4ea093d87e7..62f8310bbd7 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.h
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.h
@@ -19,7 +19,6 @@
 #include <ydb/core/fq/libs/shared_resources/interface/shared_resources.h>
 
 #include <ydb/library/actors/core/defs.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log_settings.h>
 #include <ydb/library/actors/core/scheduler_actor.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
diff --git a/ydb/core/driver_lib/run/service_initializer.h b/ydb/core/driver_lib/run/service_initializer.h
index 672e7cd3d63..8c941b3dbf9 100644
--- a/ydb/core/driver_lib/run/service_initializer.h
+++ b/ydb/core/driver_lib/run/service_initializer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/core/base/appdata.h>
 
 #include <util/generic/list.h>
diff --git a/ydb/core/external_sources/external_source.h b/ydb/core/external_sources/external_source.h
index 985e22390e8..e72fea87a49 100644
--- a/ydb/core/external_sources/external_source.h
+++ b/ydb/core/external_sources/external_source.h
@@ -5,7 +5,6 @@
 #include <util/generic/string.h>
 
 #include <ydb/core/protos/external_sources.pb.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <yql/essentials/public/issue/yql_issue.h>
 
 namespace NKikimr::NExternalSource {
diff --git a/ydb/core/external_sources/external_source_factory.h b/ydb/core/external_sources/external_source_factory.h
index 738875fa350..c6f5653ea0d 100644
--- a/ydb/core/external_sources/external_source_factory.h
+++ b/ydb/core/external_sources/external_source_factory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "external_source.h"
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 #include <ydb/library/yql/providers/common/db_id_async_resolver/database_type.h>
 
diff --git a/ydb/core/external_sources/object_storage.h b/ydb/core/external_sources/object_storage.h
index 74de7a69eb8..dae73cb2a36 100644
--- a/ydb/core/external_sources/object_storage.h
+++ b/ydb/core/external_sources/object_storage.h
@@ -6,6 +6,7 @@
 
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 #include <ydb/public/api/protos/draft/fq.pb.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 namespace NKikimr::NExternalSource {
 
diff --git a/ydb/core/fq/libs/actors/nodes_manager.h b/ydb/core/fq/libs/actors/nodes_manager.h
index a8c31f4ae24..d2240dcb779 100644
--- a/ydb/core/fq/libs/actors/nodes_manager.h
+++ b/ydb/core/fq/libs/actors/nodes_manager.h
@@ -10,7 +10,6 @@
 #include <ydb/library/yql/providers/dq/actors/proto_builder.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/time_provider/time_provider.h>
 #include <library/cpp/random_provider/random_provider.h>
 
diff --git a/ydb/core/fq/libs/actors/proxy.h b/ydb/core/fq/libs/actors/proxy.h
index df6f3b10f4f..4d840beb111 100644
--- a/ydb/core/fq/libs/actors/proxy.h
+++ b/ydb/core/fq/libs/actors/proxy.h
@@ -21,7 +21,6 @@
 
 #include <ydb/public/lib/fq/scope.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/time_provider/time_provider.h>
 
diff --git a/ydb/core/fq/libs/actors/proxy_private.h b/ydb/core/fq/libs/actors/proxy_private.h
index f3277fda2a6..9b9c5eb2158 100644
--- a/ydb/core/fq/libs/actors/proxy_private.h
+++ b/ydb/core/fq/libs/actors/proxy_private.h
@@ -9,7 +9,6 @@
 #include <ydb/library/yql/providers/dq/worker_manager/interface/counters.h>
 #include <ydb/library/yql/providers/dq/actors/proto_builder.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/time_provider/time_provider.h>
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/monlib/metrics/histogram_collector.h>
diff --git a/ydb/core/fq/libs/compute/common/pinger.h b/ydb/core/fq/libs/compute/common/pinger.h
index 9257608e681..a803d15eac3 100644
--- a/ydb/core/fq/libs/compute/common/pinger.h
+++ b/ydb/core/fq/libs/compute/common/pinger.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actor.h>
 #include <ydb/core/fq/libs/config/protos/pinger.pb.h>
 #include <yql/essentials/providers/common/metrics/service_counters.h>
 #include <ydb/public/lib/fq/scope.h>
diff --git a/ydb/core/fq/libs/compute/common/run_actor_params.h b/ydb/core/fq/libs/compute/common/run_actor_params.h
index 3919306e9f8..03ae589c4d8 100644
--- a/ydb/core/fq/libs/compute/common/run_actor_params.h
+++ b/ydb/core/fq/libs/compute/common/run_actor_params.h
@@ -19,7 +19,6 @@
 
 #include <ydb/public/lib/fq/scope.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/time_provider/time_provider.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
index 64ea30faeb3..f68efb4c2f8 100644
--- a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
+++ b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
@@ -16,7 +16,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
index 5e10c5f91dd..225ec447577 100644
--- a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp
@@ -13,7 +13,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
index 7d50371cf8b..7a32a04f09f 100644
--- a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp
@@ -14,7 +14,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp b/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
index 2d3ec87d1c7..03bc16b3ba3 100644
--- a/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/initializer_actor.cpp
@@ -15,7 +15,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
index 67b30edd436..f4f7493ef4c 100644
--- a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
@@ -15,7 +15,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
index acab4cfc31c..0952a275f26 100644
--- a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp
@@ -18,7 +18,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 #include <library/cpp/protobuf/interop/cast.h>
diff --git a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
index 4ac95442057..6077cdd1553 100644
--- a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp
@@ -19,7 +19,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
index d80bb325557..a6b01ce73f8 100644
--- a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
+++ b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp
@@ -18,7 +18,6 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.h b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.h
index 0496fe5d2d9..eb6c74fe0a2 100644
--- a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.h
+++ b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.h
@@ -21,7 +21,6 @@
 
 #include <ydb/public/lib/fq/scope.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/time_provider/time_provider.h>
 
diff --git a/ydb/core/fq/libs/gateway/empty_gateway.h b/ydb/core/fq/libs/gateway/empty_gateway.h
index 778e90b612b..9ffe3b252d7 100644
--- a/ydb/core/fq/libs/gateway/empty_gateway.h
+++ b/ydb/core/fq/libs/gateway/empty_gateway.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorid.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/mock/yql_mock.h b/ydb/core/fq/libs/mock/yql_mock.h
index 106df7bbe53..30d31aaff56 100644
--- a/ydb/core/fq/libs/mock/yql_mock.h
+++ b/ydb/core/fq/libs/mock/yql_mock.h
@@ -3,8 +3,6 @@
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/fq/libs/shared_resources/interface/shared_resources.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
-
 namespace NFq {
 
 NActors::IActor* CreateYqlMockActor(int grpcPort);
diff --git a/ydb/core/fq/libs/shared_resources/interface/shared_resources.h b/ydb/core/fq/libs/shared_resources/interface/shared_resources.h
index 35664791003..11fd1f42605 100644
--- a/ydb/core/fq/libs/shared_resources/interface/shared_resources.h
+++ b/ydb/core/fq/libs/shared_resources/interface/shared_resources.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <ydb/library/actors/core/actorsystem.h>
 
 #include <util/generic/ptr.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 namespace NFq {
 
diff --git a/ydb/core/fq/libs/shared_resources/shared_resources.h b/ydb/core/fq/libs/shared_resources/shared_resources.h
index d8ea5d16917..ddef047376f 100644
--- a/ydb/core/fq/libs/shared_resources/shared_resources.h
+++ b/ydb/core/fq/libs/shared_resources/shared_resources.h
@@ -7,8 +7,6 @@
 
 #include <ydb/library/security/ydb_credentials_provider_factory.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
-
 namespace NFq {
 
 struct TYqSharedResources : public IYqSharedResources {
diff --git a/ydb/core/http_proxy/http_req.h b/ydb/core/http_proxy/http_req.h
index 9509eb08031..fc66b88ad86 100644
--- a/ydb/core/http_proxy/http_req.h
+++ b/ydb/core/http_proxy/http_req.h
@@ -10,7 +10,6 @@
 #include <ydb/library/http_proxy/authorization/signature.h>
 #include <ydb/public/api/grpc/draft/ydb_datastreams_v1.grpc.pb.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/http/http.h>
 #include <ydb/public/sdk/cpp/src/library/grpc/client/grpc_client_low.h>
 #include <library/cpp/http/server/http.h>
diff --git a/ydb/core/kafka_proxy/kafka_log.h b/ydb/core/kafka_proxy/kafka_log.h
index bbd2e4104c2..cc03fc7663a 100644
--- a/ydb/core/kafka_proxy/kafka_log.h
+++ b/ydb/core/kafka_proxy/kafka_log.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/services/services.pb.h>
 
diff --git a/ydb/core/kesus/tablet/rate_accounting.h b/ydb/core/kesus/tablet/rate_accounting.h
index 46013589f9c..ad0442a31a2 100644
--- a/ydb/core/kesus/tablet/rate_accounting.h
+++ b/ydb/core/kesus/tablet/rate_accounting.h
@@ -3,7 +3,6 @@
 #include <ydb/core/protos/kesus.pb.h>
 #include <ydb/library/time_series_vec/time_series_vec.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
diff --git a/ydb/core/kqp/common/kqp.cpp b/ydb/core/kqp/common/kqp.cpp
index eb500546e24..cc9102c7b6d 100644
--- a/ydb/core/kqp/common/kqp.cpp
+++ b/ydb/core/kqp/common/kqp.cpp
@@ -1,6 +1,6 @@
 #include "kqp.h"
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <util/datetime/base.h>
 
diff --git a/ydb/core/kqp/common/shutdown/controller.cpp b/ydb/core/kqp/common/shutdown/controller.cpp
index 6113308df88..2335be9b6e9 100644
--- a/ydb/core/kqp/common/shutdown/controller.cpp
+++ b/ydb/core/kqp/common/shutdown/controller.cpp
@@ -1,6 +1,8 @@
 #include "controller.h"
 #include "events.h"
 
+#include <ydb/library/actors/core/actorsystem.h>
+
 namespace NKikimr::NKqp {
 
 TKqpShutdownController::TKqpShutdownController(NActors::TActorId kqpProxyActorId, const NKikimrConfig::TTableServiceConfig& tableServiceConfig, bool enableGraceful)
diff --git a/ydb/core/kqp/common/shutdown/controller.h b/ydb/core/kqp/common/shutdown/controller.h
index fd50ee7b651..91d5a729c20 100644
--- a/ydb/core/kqp/common/shutdown/controller.h
+++ b/ydb/core/kqp/common/shutdown/controller.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "state.h"
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/actors/core/actorid.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/core/protos/table_service_config.pb.h>
 
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_common.h b/ydb/core/kqp/compute_actor/kqp_scan_common.h
index 6b312691074..eba2d873c16 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_common.h
+++ b/ydb/core/kqp/compute_actor/kqp_scan_common.h
@@ -1,8 +1,9 @@
 #pragma once
 #include "kqp_compute_state.h"
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log_iface.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+
 
 namespace NKikimr::NKqp::NScanPrivate {
 
diff --git a/ydb/core/local_pgwire/log_impl.h b/ydb/core/local_pgwire/log_impl.h
index 368d7c8b8a7..5c4539ec15b 100644
--- a/ydb/core/local_pgwire/log_impl.h
+++ b/ydb/core/local_pgwire/log_impl.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/services/services.pb.h>
 
diff --git a/ydb/core/mon_alloc/profiler.cpp b/ydb/core/mon_alloc/profiler.cpp
index 5fbdf0155ff..78755378e7c 100644
--- a/ydb/core/mon_alloc/profiler.cpp
+++ b/ydb/core/mon_alloc/profiler.cpp
@@ -3,7 +3,6 @@
 
 #include <ydb/library/services/services.pb.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/mon.h>
 #include <ydb/library/actors/core/log.h>
diff --git a/ydb/core/persqueue/pqrb/partition_scale_manager.h b/ydb/core/persqueue/pqrb/partition_scale_manager.h
index 869c5a5d298..6eccc71cfd2 100644
--- a/ydb/core/persqueue/pqrb/partition_scale_manager.h
+++ b/ydb/core/persqueue/pqrb/partition_scale_manager.h
@@ -9,7 +9,6 @@
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/schemeshard/schemeshard_info_types.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 
 #include <util/system/types.h>
 #include <util/generic/fwd.h>
diff --git a/ydb/core/persqueue/pqrb/partition_scale_request.h b/ydb/core/persqueue/pqrb/partition_scale_request.h
index 764c8f033eb..9eabfd5c6b5 100644
--- a/ydb/core/persqueue/pqrb/partition_scale_request.h
+++ b/ydb/core/persqueue/pqrb/partition_scale_request.h
@@ -6,7 +6,6 @@
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/core/pgproxy/pg_log.h b/ydb/core/pgproxy/pg_log.h
index 70b010a5f50..72cea435337 100644
--- a/ydb/core/pgproxy/pg_log.h
+++ b/ydb/core/pgproxy/pg_log.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/services/services.pb.h>
 
diff --git a/ydb/core/public_http/http_req.h b/ydb/core/public_http/http_req.h
index 994cd145787..bc50726e0b7 100644
--- a/ydb/core/public_http/http_req.h
+++ b/ydb/core/public_http/http_req.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/http/http.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 namespace NKikimr::NPublicHttp {
 
diff --git a/ydb/core/security/login_page.h b/ydb/core/security/login_page.h
index 257946095e3..2747d04606e 100644
--- a/ydb/core/security/login_page.h
+++ b/ydb/core/security/login_page.h
@@ -1,5 +1,5 @@
 #include <library/cpp/monlib/service/pages/mon_page.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actor.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/tablet/private/labeled_db_counters.cpp b/ydb/core/tablet/private/labeled_db_counters.cpp
index 8bb365fceab..8ddaa7513e6 100644
--- a/ydb/core/tablet/private/labeled_db_counters.cpp
+++ b/ydb/core/tablet/private/labeled_db_counters.cpp
@@ -1,6 +1,5 @@
 #include "labeled_db_counters.h"
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <util/string/split.h>
 #include <ydb/core/sys_view/service/sysview_service.h>
 
diff --git a/ydb/core/tablet_flat/util_fmt_logger.h b/ydb/core/tablet_flat/util_fmt_logger.h
index 58b3bf6e3d5..998aeefb7c7 100644
--- a/ydb/core/tablet_flat/util_fmt_logger.h
+++ b/ydb/core/tablet_flat/util_fmt_logger.h
@@ -5,7 +5,6 @@
 
 #include <ydb/core/base/appdata.h>
 #include <library/cpp/time_provider/time_provider.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log_iface.h>
 
 namespace NKikimr {
diff --git a/ydb/core/ymq/actor/cleanup_queue_data.h b/ydb/core/ymq/actor/cleanup_queue_data.h
index efa31660ac3..bc14aa17edd 100644
--- a/ydb/core/ymq/actor/cleanup_queue_data.h
+++ b/ydb/core/ymq/actor/cleanup_queue_data.h
@@ -8,7 +8,6 @@
 

 #include <ydb/library/actors/core/actor_bootstrapped.h>

 #include <ydb/library/actors/core/hfunc.h>

-#include <ydb/library/actors/core/actorsystem.h>

 #include <ydb/library/actors/core/log.h>

 

 namespace NKikimr::NSQS {

diff --git a/ydb/core/ymq/actor/cloud_events/cloud_events.h b/ydb/core/ymq/actor/cloud_events/cloud_events.h
index c7ed0308668..28875dca853 100644
--- a/ydb/core/ymq/actor/cloud_events/cloud_events.h
+++ b/ydb/core/ymq/actor/cloud_events/cloud_events.h
@@ -6,7 +6,6 @@
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/hfunc.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/aclib/aclib.h>
 #include <util/random/mersenne64.h>
 #include <util/random/entropy.h>
diff --git a/ydb/core/ymq/actor/monitoring.h b/ydb/core/ymq/actor/monitoring.h
index 3430a9f8db3..aeb8a682a4f 100644
--- a/ydb/core/ymq/actor/monitoring.h
+++ b/ydb/core/ymq/actor/monitoring.h
@@ -6,7 +6,6 @@
 

 #include <ydb/library/actors/core/actor_bootstrapped.h>

 #include <ydb/library/actors/core/hfunc.h>

-#include <ydb/library/actors/core/actorsystem.h>

 #include <ydb/library/actors/core/log.h>

 

 

diff --git a/ydb/library/actors/core/actorsystem_fwd.h b/ydb/library/actors/core/actorsystem_fwd.h
new file mode 100644
index 00000000000..de523148f5d
--- /dev/null
+++ b/ydb/library/actors/core/actorsystem_fwd.h
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace NActors {
+
+class TActorSystem;
+class IActor;
+struct TActorId;
+
+}
diff --git a/ydb/library/grpc/actor_client/grpc_service_cache.h b/ydb/library/grpc/actor_client/grpc_service_cache.h
index 26e4b4fe3be..6793337c83a 100644
--- a/ydb/library/grpc/actor_client/grpc_service_cache.h
+++ b/ydb/library/grpc/actor_client/grpc_service_cache.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <variant>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/mailbox.h>
 #include <ydb/core/util/simple_cache.h>
diff --git a/ydb/library/grpc/server/actors/logger.h b/ydb/library/grpc/server/actors/logger.h
index c229007e05d..5cda62751e0 100644
--- a/ydb/library/grpc/server/actors/logger.h
+++ b/ydb/library/grpc/server/actors/logger.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/grpc/server/logger.h>
 
diff --git a/ydb/library/logger/actor.h b/ydb/library/logger/actor.h
index 4f790d5f8f1..660f3328740 100644
--- a/ydb/library/logger/actor.h
+++ b/ydb/library/logger/actor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/actors/core/log.h>
 #include <library/cpp/logger/backend.h>
 #include <library/cpp/logger/record.h>
diff --git a/ydb/services/bridge/grpc_service.h b/ydb/services/bridge/grpc_service.h
index 93e5dbf8474..721cd0d61aa 100644
--- a/ydb/services/bridge/grpc_service.h
+++ b/ydb/services/bridge/grpc_service.h
@@ -3,7 +3,8 @@
 #include <ydb/public/api/grpc/draft/ydb_bridge_v1.grpc.pb.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorid.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/services/cms/grpc_service.h b/ydb/services/cms/grpc_service.h
index 5a51bcdd781..cc9602aae47 100644
--- a/ydb/services/cms/grpc_service.h
+++ b/ydb/services/cms/grpc_service.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_cms_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/config/grpc_service.h b/ydb/services/config/grpc_service.h
index a8342474845..76fcab8a460 100644
--- a/ydb/services/config/grpc_service.h
+++ b/ydb/services/config/grpc_service.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <ydb/public/api/grpc/ydb_config_v1.grpc.pb.h>
-
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/services/datastreams/datastreams_proxy.h b/ydb/services/datastreams/datastreams_proxy.h
index c7a0b1ff3d0..3c0cbd74c81 100644
--- a/ydb/services/datastreams/datastreams_proxy.h
+++ b/ydb/services/datastreams/datastreams_proxy.h
@@ -8,8 +8,6 @@
 #include <ydb/core/grpc_services/rpc_calls.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 
 
 namespace NKikimr {
diff --git a/ydb/services/datastreams/events.h b/ydb/services/datastreams/events.h
index dd8d6018792..6803d84a748 100644
--- a/ydb/services/datastreams/events.h
+++ b/ydb/services/datastreams/events.h
@@ -2,8 +2,6 @@
 
 #include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h>
 
-#include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/event_local.h>
 
 namespace NKikimr::NDataStreams::V1 {
diff --git a/ydb/services/datastreams/grpc_service.h b/ydb/services/datastreams/grpc_service.h
index f11714d83dc..6636529c49b 100644
--- a/ydb/services/datastreams/grpc_service.h
+++ b/ydb/services/datastreams/grpc_service.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/draft/ydb_datastreams_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_read.h b/ydb/services/deprecated/persqueue_v0/grpc_pq_read.h
index 8325d17fc4b..4365e60dab3 100644
--- a/ydb/services/deprecated/persqueue_v0/grpc_pq_read.h
+++ b/ydb/services/deprecated/persqueue_v0/grpc_pq_read.h
@@ -8,7 +8,7 @@
 #include <ydb/library/persqueue/topic_parser/topic_parser.h>
 
 #include <ydb/library/grpc/server/grpc_request.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <util/generic/hash.h>
 #include <util/system/mutex.h>
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h b/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h
index 0bb9b0c96c2..074d58dd612 100644
--- a/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h
+++ b/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h
@@ -7,7 +7,7 @@
 
 #include <ydb/services/deprecated/persqueue_v0/api/grpc/persqueue.grpc.pb.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/maybe.h>
diff --git a/ydb/services/deprecated/persqueue_v0/persqueue.h b/ydb/services/deprecated/persqueue_v0/persqueue.h
index 158a0e6c727..2413ef077e1 100644
--- a/ydb/services/deprecated/persqueue_v0/persqueue.h
+++ b/ydb/services/deprecated/persqueue_v0/persqueue.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <ydb/services/deprecated/persqueue_v0/api/grpc/persqueue.grpc.pb.h>
 
diff --git a/ydb/services/discovery/grpc_service.h b/ydb/services/discovery/grpc_service.h
index b0766a3117c..04c4ef9901d 100644
--- a/ydb/services/discovery/grpc_service.h
+++ b/ydb/services/discovery/grpc_service.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <ydb/public/api/grpc/ydb_discovery_v1.grpc.pb.h>
 
diff --git a/ydb/services/dynamic_config/grpc_service.h b/ydb/services/dynamic_config/grpc_service.h
index ac0beb1dce3..ad18f65bfd9 100644
--- a/ydb/services/dynamic_config/grpc_service.h
+++ b/ydb/services/dynamic_config/grpc_service.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/draft/ydb_dynamic_config_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/fq/grpc_service.cpp b/ydb/services/fq/grpc_service.cpp
index 791b21314c7..60bb707a5af 100644
--- a/ydb/services/fq/grpc_service.cpp
+++ b/ydb/services/fq/grpc_service.cpp
@@ -1,5 +1,6 @@
 #include "grpc_service.h"
 
+#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/core/grpc_services/grpc_request_proxy.h>
 #include <ydb/core/grpc_services/rpc_calls.h>
diff --git a/ydb/services/fq/grpc_service.h b/ydb/services/fq/grpc_service.h
index a4e5bdcc82b..777ee942061 100644
--- a/ydb/services/fq/grpc_service.h
+++ b/ydb/services/fq/grpc_service.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
 
diff --git a/ydb/services/fq/private_grpc.h b/ydb/services/fq/private_grpc.h
index d7f3b7fdb86..a837997bb28 100644
--- a/ydb/services/fq/private_grpc.h
+++ b/ydb/services/fq/private_grpc.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/core/fq/libs/grpc/fq_private_v1.grpc.pb.h>
 
diff --git a/ydb/services/fq/ydb_over_fq.h b/ydb/services/fq/ydb_over_fq.h
index 67ff7a0c882..e9d0ff7ebde 100644
--- a/ydb/services/fq/ydb_over_fq.h
+++ b/ydb/services/fq/ydb_over_fq.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
 
diff --git a/ydb/services/kesus/grpc_service.h b/ydb/services/kesus/grpc_service.h
index 6768ba7c60d..5762598d94a 100644
--- a/ydb/services/kesus/grpc_service.h
+++ b/ydb/services/kesus/grpc_service.h
@@ -4,7 +4,7 @@
 
 #include <ydb/library/grpc/server/grpc_server.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <util/generic/hash_set.h>
 
diff --git a/ydb/services/keyvalue/grpc_service.h b/ydb/services/keyvalue/grpc_service.h
index aa255ae6df9..f2bf8bf34f8 100644
--- a/ydb/services/keyvalue/grpc_service.h
+++ b/ydb/services/keyvalue/grpc_service.h
@@ -3,7 +3,8 @@
 #include <ydb/public/api/grpc/ydb_keyvalue_v1.grpc.pb.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/services/local_discovery/grpc_service.h b/ydb/services/local_discovery/grpc_service.h
index cd83bf7188d..ff750a994b8 100644
--- a/ydb/services/local_discovery/grpc_service.h
+++ b/ydb/services/local_discovery/grpc_service.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/public/api/grpc/ydb_discovery_v1.grpc.pb.h>
diff --git a/ydb/services/maintenance/grpc_service.h b/ydb/services/maintenance/grpc_service.h
index 834fae101ab..2c932eccf1b 100644
--- a/ydb/services/maintenance/grpc_service.h
+++ b/ydb/services/maintenance/grpc_service.h
@@ -3,7 +3,7 @@
 #include <ydb/core/grpc_services/base/base_service.h>
 #include <ydb/public/api/grpc/draft/ydb_maintenance_v1.grpc.pb.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/services/metadata/abstract/common.h b/ydb/services/metadata/abstract/common.h
index b2868a438e2..22f9cd82582 100644
--- a/ydb/services/metadata/abstract/common.h
+++ b/ydb/services/metadata/abstract/common.h
@@ -6,7 +6,6 @@
 #include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/actors/core/events.h>
 #include <ydb/library/actors/core/actor_virtual.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <library/cpp/object_factory/object_factory.h>
 #include <ydb/core/base/events.h>
diff --git a/ydb/services/metadata/abstract/fetcher.h b/ydb/services/metadata/abstract/fetcher.h
index cb8b07a2612..db62d39e61b 100644
--- a/ydb/services/metadata/abstract/fetcher.h
+++ b/ydb/services/metadata/abstract/fetcher.h
@@ -3,7 +3,6 @@
 #include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/actors/core/events.h>
 #include <ydb/library/actors/core/actor_virtual.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <library/cpp/object_factory/object_factory.h>
 #include <ydb/core/base/events.h>
diff --git a/ydb/services/metadata/manager/abstract.h b/ydb/services/metadata/manager/abstract.h
index 0696a90c06e..4e88d09c79c 100644
--- a/ydb/services/metadata/manager/abstract.h
+++ b/ydb/services/metadata/manager/abstract.h
@@ -7,7 +7,7 @@
 
 #include <ydb/library/accessor/accessor.h>
 #include <ydb/library/aclib/aclib.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/conclusion/result.h>
 #include <ydb/library/conclusion/status.h>
 #include <ydb/services/metadata/abstract/kqp_common.h>
diff --git a/ydb/services/metadata/request/common.h b/ydb/services/metadata/request/common.h
index 466a04f8a84..c3bd022542f 100644
--- a/ydb/services/metadata/request/common.h
+++ b/ydb/services/metadata/request/common.h
@@ -3,7 +3,6 @@
 #include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/actors/core/events.h>
 #include <ydb/library/actors/core/actor_virtual.h>
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/accessor/accessor.h>
 #include <ydb/public/api/protos/ydb_table.pb.h>
diff --git a/ydb/services/monitoring/grpc_service.h b/ydb/services/monitoring/grpc_service.h
index bfc55eba720..93c026d07bf 100644
--- a/ydb/services/monitoring/grpc_service.h
+++ b/ydb/services/monitoring/grpc_service.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
-
 #include <ydb/public/api/grpc/ydb_monitoring_v1.grpc.pb.h>
 
 #include <ydb/library/grpc/server/grpc_server.h>
diff --git a/ydb/services/persqueue_cluster_discovery/grpc_service.h b/ydb/services/persqueue_cluster_discovery/grpc_service.h
index 9a2f7d90676..2a1890c9e8f 100644
--- a/ydb/services/persqueue_cluster_discovery/grpc_service.h
+++ b/ydb/services/persqueue_cluster_discovery/grpc_service.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 #include <ydb/public/api/grpc/draft/ydb_persqueue_v1.grpc.pb.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 
diff --git a/ydb/services/persqueue_v1/grpc_pq_read.h b/ydb/services/persqueue_v1/grpc_pq_read.h
index 0eaf98c22a7..9ad6a4887d4 100644
--- a/ydb/services/persqueue_v1/grpc_pq_read.h
+++ b/ydb/services/persqueue_v1/grpc_pq_read.h
@@ -7,7 +7,7 @@
 #include <ydb/core/persqueue/cluster_tracker.h>
 #include <ydb/core/mind/address_classification/net_classifier.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <util/generic/hash.h>
 #include <util/system/mutex.h>
diff --git a/ydb/services/persqueue_v1/grpc_pq_write.h b/ydb/services/persqueue_v1/grpc_pq_write.h
index a253cf360a8..5e09cdbd11a 100644
--- a/ydb/services/persqueue_v1/grpc_pq_write.h
+++ b/ydb/services/persqueue_v1/grpc_pq_write.h
@@ -6,7 +6,7 @@
 #include <ydb/core/persqueue/cluster_tracker.h>
 #include <ydb/core/mind/address_classification/net_classifier.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/maybe.h>
diff --git a/ydb/services/persqueue_v1/persqueue.h b/ydb/services/persqueue_v1/persqueue.h
index efb6804609e..dfa8adac965 100644
--- a/ydb/services/persqueue_v1/persqueue.h
+++ b/ydb/services/persqueue_v1/persqueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <ydb/public/api/grpc/draft/ydb_persqueue_v1.grpc.pb.h>
 
diff --git a/ydb/services/persqueue_v1/services_initializer.h b/ydb/services/persqueue_v1/services_initializer.h
index 938d1d8d402..a42fd93b05b 100644
--- a/ydb/services/persqueue_v1/services_initializer.h
+++ b/ydb/services/persqueue_v1/services_initializer.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
+#include <library/cpp/monlib/dynamic_counters/counters.h>
 
 namespace NKikimr {
 
diff --git a/ydb/services/persqueue_v1/topic.h b/ydb/services/persqueue_v1/topic.h
index f2aef104545..4e9dfb7cd5c 100644
--- a/ydb/services/persqueue_v1/topic.h
+++ b/ydb/services/persqueue_v1/topic.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 
 #include <ydb/public/api/grpc/ydb_topic_v1.grpc.pb.h>
 
diff --git a/ydb/services/rate_limiter/grpc_service.h b/ydb/services/rate_limiter/grpc_service.h
index 2900dca7910..21270e2a51c 100644
--- a/ydb/services/rate_limiter/grpc_service.h
+++ b/ydb/services/rate_limiter/grpc_service.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
+#include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_rate_limiter_v1.grpc.pb.h>
 
diff --git a/ydb/services/replication/grpc_service.h b/ydb/services/replication/grpc_service.h
index e85422b2ed6..b1dd16eddee 100644
--- a/ydb/services/replication/grpc_service.h
+++ b/ydb/services/replication/grpc_service.h
@@ -3,7 +3,6 @@
 #include <ydb/core/grpc_services/base/base_service.h>
 #include <ydb/public/api/grpc/draft/ydb_replication_v1.grpc.pb.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 
 namespace NKikimr::NGRpcService {
diff --git a/ydb/services/tablet/ydb_tablet.h b/ydb/services/tablet/ydb_tablet.h
index 638314c495a..b7fcaf5ad35 100644
--- a/ydb/services/tablet/ydb_tablet.h
+++ b/ydb/services/tablet/ydb_tablet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/core/grpc_services/base/base_service.h>
 
diff --git a/ydb/services/ydb/ydb_clickhouse_internal.h b/ydb/services/ydb/ydb_clickhouse_internal.h
index 93c85b5119d..448f7564122 100644
--- a/ydb/services/ydb/ydb_clickhouse_internal.h
+++ b/ydb/services/ydb/ydb_clickhouse_internal.h
@@ -5,7 +5,7 @@
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 
 #include <ydb/core/grpc_services/base/base_service.h>
 
diff --git a/ydb/services/ydb/ydb_dummy.cpp b/ydb/services/ydb/ydb_dummy.cpp
index de12795e778..04b74ca5663 100644
--- a/ydb/services/ydb/ydb_dummy.cpp
+++ b/ydb/services/ydb/ydb_dummy.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/grpc_services/rpc_deferrable.h>
 
 #include <ydb/core/grpc_streaming/grpc_streaming.h>
+#include <ydb/library/actors/core/actorsystem.h>
 
 #include <ydb/public/api/grpc/draft/dummy.grpc.pb.h>
 
diff --git a/ydb/services/ydb/ydb_dummy.h b/ydb/services/ydb/ydb_dummy.h
index f398f87ca3d..30850c69486 100644
--- a/ydb/services/ydb/ydb_dummy.h
+++ b/ydb/services/ydb/ydb_dummy.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <library/cpp/monlib/counters/counters.h>
 #include <ydb/public/api/grpc/draft/dummy.grpc.pb.h>
 
diff --git a/ydb/services/ydb/ydb_export.h b/ydb/services/ydb/ydb_export.h
index 22dc99cbe47..c36751a91cf 100644
--- a/ydb/services/ydb/ydb_export.h
+++ b/ydb/services/ydb/ydb_export.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_export_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_import.h b/ydb/services/ydb/ydb_import.h
index ac8340c5fcc..6c133bed594 100644
--- a/ydb/services/ydb/ydb_import.h
+++ b/ydb/services/ydb/ydb_import.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_import_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_logstore.h b/ydb/services/ydb/ydb_logstore.h
index e154e78221b..dde49f8ce35 100644
--- a/ydb/services/ydb/ydb_logstore.h
+++ b/ydb/services/ydb/ydb_logstore.h
@@ -3,7 +3,6 @@
 #include <ydb/public/api/grpc/draft/ydb_logstore_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/library/grpc/server/grpc_server.h>
-#include <ydb/library/actors/core/actorsystem.h>
 
 #include <ydb/core/grpc_services/base/base_service.h>
 
diff --git a/ydb/services/ydb/ydb_object_storage.h b/ydb/services/ydb/ydb_object_storage.h
index f84736c8300..ed32191b301 100644
--- a/ydb/services/ydb/ydb_object_storage.h
+++ b/ydb/services/ydb/ydb_object_storage.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/draft/ydb_object_storage_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_operation.h b/ydb/services/ydb/ydb_operation.h
index d6b27a4430f..c5d4c4891db 100644
--- a/ydb/services/ydb/ydb_operation.h
+++ b/ydb/services/ydb/ydb_operation.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/public/api/grpc/ydb_operation_v1.grpc.pb.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_scheme.h b/ydb/services/ydb/ydb_scheme.h
index 37e81c3407a..2b20c4d9809 100644
--- a/ydb/services/ydb/ydb_scheme.h
+++ b/ydb/services/ydb/ydb_scheme.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_scheme_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_scripting.h b/ydb/services/ydb/ydb_scripting.h
index 3fc64150d10..bf7a16aa07d 100644
--- a/ydb/services/ydb/ydb_scripting.h
+++ b/ydb/services/ydb/ydb_scripting.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_scripting_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ydb/ydb_table.h b/ydb/services/ydb/ydb_table.h
index 08060e4d260..792e1a40dd5 100644
--- a/ydb/services/ydb/ydb_table.h
+++ b/ydb/services/ydb/ydb_table.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actorsystem_fwd.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/public/api/grpc/ydb_table_v1.grpc.pb.h>
 #include <ydb/core/grpc_services/base/base_service.h>
diff --git a/ydb/services/ymq/grpc_service.h b/ydb/services/ymq/grpc_service.h
index 542f86d7535..2fe4c0e2360 100644
--- a/ydb/services/ymq/grpc_service.h
+++ b/ydb/services/ymq/grpc_service.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ydb/public/api/grpc/draft/ydb_ymq_v1.grpc.pb.h"
-#include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/core/grpc_services/base/base_service.h>
 
diff --git a/ydb/services/ymq/ymq_proxy.h b/ydb/services/ymq/ymq_proxy.h
index 9d501fe1469..b574bc95731 100644
--- a/ydb/services/ymq/ymq_proxy.h
+++ b/ydb/services/ymq/ymq_proxy.h
@@ -7,7 +7,6 @@
 
 #include <ydb/library/grpc/server/grpc_server.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
-#include <ydb/library/actors/core/actorsystem.h>
 
 
 namespace NKikimr {