From 62bb5beebbc9ac02a1a01d1091d850f06be6e9de Mon Sep 17 00:00:00 2001
From: Innokentii Mokin <innokentii@ydb.tech>
Date: Sat, 10 Feb 2024 18:42:24 +0000
Subject: [PATCH] patch grpc and proto to make PROTOC_TRANSITIVE_HEADERS no and
 GRPC() work together

disable PROTOC_TRANSITIVE_HEADERS

add includes in tests

add includes in tests

fix

add includes in tests

add includes in tests

add includes in tests

fix

add includes in tests

fix

add includes in tests

add includes in tests

make protoc patch more reliable

rollback contrib
---
 ydb/core/audit/audit_log.h                         |  1 +
 ydb/core/base/appdata.cpp                          |  3 +++
 ydb/core/base/appdata.h                            |  5 +++++
 ydb/core/base/domain.h                             |  2 ++
 ydb/core/base/statestorage_impl.h                  |  3 ++-
 ydb/core/blob_depot/agent/agent_impl.h             |  2 ++
 ydb/core/blob_depot/blob_depot_tablet.h            |  2 ++
 ydb/core/blobstorage/base/blobstorage_vdiskid.cpp  |  1 +
 .../groupinfo/blobstorage_groupinfo.cpp            |  1 +
 .../pdisk/blobstorage_pdisk_actorsystem_creator.h  |  3 +++
 .../pdisk/blobstorage_pdisk_color_limits.h         |  2 ++
 .../blobstorage/pdisk/blobstorage_pdisk_config.h   |  5 +++++
 ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h |  2 +-
 .../pdisk/blobstorage_pdisk_util_space_color.h     |  1 +
 .../ut_blobstorage/blob_depot_test_env.h           |  1 +
 ydb/core/blobstorage/ut_testshard/env.h            |  2 ++
 ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp      |  1 +
 ydb/core/blobstorage/vdisk/common/vdisk_events.h   |  1 +
 .../vdisk/query/query_spacetracker_ut.cpp          |  1 +
 ydb/core/client/query_stats_ut.cpp                 |  1 +
 ydb/core/client/server/msgbus_server.h             |  1 +
 ydb/core/client/server/msgbus_server_request.cpp   |  1 +
 .../server/msgbus_server_tablet_counters.cpp       |  2 ++
 ydb/core/cms/cluster_info.h                        |  1 +
 ydb/core/cms/console/console.cpp                   |  1 +
 ydb/core/cms/console/console.h                     |  1 +
 ydb/core/cms/console/console__drop_yaml_config.cpp |  1 +
 .../cms/console/console__replace_yaml_config.cpp   |  1 +
 ydb/core/cms/console/console_tenants_manager.h     |  1 +
 ydb/core/cms/console/net_classifier_updater.cpp    |  1 +
 ydb/core/cms/console/util/config_index.h           |  1 +
 .../cms/console/validators/validator_bootstrap.h   |  2 ++
 .../console/validators/validator_bootstrap_ut.cpp  |  2 ++
 .../cms/console/validators/validator_ut_common.h   |  3 +++
 ydb/core/cms/json_proxy.h                          |  1 +
 ydb/core/cms/pdisk_state.h                         |  1 +
 ydb/core/driver_lib/cli_base/cli_cmds_db.cpp       |  1 +
 ydb/core/driver_lib/cli_config_base/config_base.h  |  8 ++++++++
 ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp  |  1 +
 ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp |  2 ++
 ydb/core/driver_lib/cli_utils/cli_cmds_get.cpp     |  1 +
 ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp  |  5 +++++
 ydb/core/driver_lib/cli_utils/cli_cmds_tablet.cpp  |  2 ++
 ydb/core/driver_lib/cli_utils/cli_cmds_tenant.cpp  |  1 +
 ydb/core/driver_lib/cli_utils/cli_keyvalue.cpp     |  1 +
 .../driver_lib/cli_utils/cli_persqueue_stress.cpp  |  1 +
 .../driver_lib/cli_utils/cli_scheme_initroot.cpp   |  1 +
 ydb/core/driver_lib/run/config_parser.cpp          |  1 +
 ydb/core/driver_lib/run/dummy.cpp                  |  1 +
 .../run/kikimr_services_initializers.cpp           |  1 +
 ydb/core/driver_lib/run/run.cpp                    |  3 +++
 .../engine/minikql/flat_local_minikql_program.h    |  1 +
 .../engine/minikql/flat_local_tx_read_columns.h    |  1 +
 .../fq/libs/actors/ut/database_resolver_ut.cpp     |  1 +
 ydb/core/grpc_services/grpc_request_proxy.cpp      |  1 +
 .../grpc_services/grpc_request_proxy_simple.cpp    |  1 +
 ydb/core/grpc_services/rpc_execute_data_query.cpp  |  1 +
 ydb/core/grpc_services/rpc_export_base.h           |  1 +
 ydb/core/grpc_services/rpc_import_base.h           |  1 +
 ydb/core/grpc_services/rpc_kqp_base.cpp            |  2 ++
 ydb/core/http_proxy/http_service.cpp               |  5 +++--
 ydb/core/kafka_proxy/actors/actors.h               |  1 +
 ydb/core/kesus/proxy/events.h                      |  2 ++
 ydb/core/kesus/tablet/events.h                     |  2 ++
 ydb/core/kesus/tablet/quoter_resource_tree.h       |  1 +
 ydb/core/kqp/common/events/query.h                 |  1 +
 ydb/core/kqp/common/events/script_executions.h     |  3 +++
 ydb/core/kqp/common/kqp_timeouts.cpp               |  2 ++
 ydb/core/kqp/common/kqp_timeouts.h                 |  1 +
 ydb/core/kqp/common/shutdown/controller.h          |  1 +
 ydb/core/kqp/common/simple/settings.h              |  1 +
 ydb/core/kqp/compute_actor/kqp_compute_actor.cpp   |  2 ++
 ydb/core/kqp/compute_actor/kqp_compute_events.h    |  1 +
 .../kqp/compute_actor/kqp_scan_compute_actor.cpp   |  1 +
 .../kqp/compute_actor/kqp_scan_fetcher_actor.cpp   |  1 +
 ydb/core/kqp/counters/kqp_counters.cpp             |  1 +
 ydb/core/kqp/counters/kqp_counters.h               |  1 +
 ydb/core/kqp/executer_actor/kqp_executer.h         |  1 +
 ydb/core/kqp/executer_actor/kqp_executer_stats.h   |  2 ++
 ydb/core/kqp/executer_actor/kqp_locks_helper.cpp   |  2 ++
 ydb/core/kqp/executer_actor/kqp_planner_strategy.h |  1 +
 ydb/core/kqp/executer_actor/kqp_tasks_graph.h      |  2 ++
 ydb/core/kqp/gateway/kqp_gateway.h                 |  2 ++
 ydb/core/kqp/gateway/kqp_ic_gateway.cpp            |  1 +
 ydb/core/kqp/opt/kqp_query_plan.cpp                |  1 +
 .../kqp/opt/logical/kqp_opt_log_ranges_predext.cpp |  1 +
 ydb/core/kqp/provider/yql_kikimr_exec.cpp          |  1 +
 ydb/core/kqp/provider/yql_kikimr_gateway.h         |  1 +
 ydb/core/kqp/provider/yql_kikimr_settings.cpp      |  1 +
 ydb/core/kqp/query_data/kqp_prepared_query.h       |  1 +
 ydb/core/kqp/rm_service/kqp_resource_estimation.h  |  1 +
 ydb/core/kqp/rm_service/kqp_rm_service.h           |  1 +
 ydb/core/kqp/runtime/kqp_scan_data_meta.cpp        |  1 +
 ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp  |  2 ++
 ydb/core/kqp/runtime/kqp_stream_lookup_worker.h    |  1 +
 ydb/core/kqp/runtime/kqp_write_actor.cpp           |  1 +
 ydb/core/kqp/session_actor/kqp_session_actor.h     |  1 +
 ydb/core/kqp/ut/query/kqp_limits_ut.cpp            |  1 +
 ydb/core/load_test/aggregated_result.cpp           |  2 ++
 ydb/core/load_test/kqp.cpp                         |  1 +
 ydb/core/load_test/ycsb/bulk_mkql_upsert.cpp       |  1 +
 ydb/core/load_test/ycsb/common.cpp                 |  1 +
 .../mind/address_classification/net_classifier.cpp |  1 +
 ydb/core/mind/bscontroller/config.h                |  2 ++
 ydb/core/mind/hive/follower_group.h                |  1 +
 ydb/core/mind/hive/hive_ut.cpp                     |  1 +
 ydb/core/mind/hive/leader_tablet_info.h            |  1 +
 ydb/core/node_whiteboard/node_whiteboard.h         |  1 +
 ydb/core/persqueue/cluster_tracker.cpp             |  1 +
 ydb/core/persqueue/config/config.cpp               |  2 ++
 ydb/core/persqueue/events/global.h                 |  1 +
 ydb/core/persqueue/transaction.h                   |  1 +
 ydb/core/persqueue/ut/common/pq_ut_common.h        |  1 +
 ydb/core/persqueue/writer/common.h                 |  1 +
 ydb/core/protos/out/out.cpp                        | 14 ++++++++++++++
 ydb/core/protos/ya.make                            |  2 ++
 .../quoter_service_bandwidth_test/server.cpp       |  3 +++
 ydb/core/quoter/quoter_service_ut.cpp              |  3 +++
 ydb/core/security/ldap_auth_provider.h             |  1 +
 ydb/core/statistics/aggregator/aggregator_impl.cpp |  1 +
 ydb/core/sys_view/common/db_counters.h             |  2 ++
 ydb/core/sys_view/common/events.h                  |  1 +
 ydb/core/tablet_flat/flat_dbase_scheme.cpp         |  2 ++
 ydb/core/testlib/actors/test_runtime.h             |  1 +
 ydb/core/testlib/basics/appdata.h                  |  5 +++++
 ydb/core/testlib/cs_helper.cpp                     |  1 +
 ydb/core/testlib/test_client.h                     |  1 +
 ydb/core/testlib/test_pq_client.h                  |  1 +
 ydb/core/tx/columnshard/columnshard.cpp            |  2 ++
 ydb/core/tx/columnshard/columnshard.h              |  1 +
 ydb/core/tx/columnshard/common/scalars.cpp         |  1 +
 ydb/core/tx/coordinator/public/events.cpp          |  2 ++
 ydb/core/tx/data_events/events.h                   |  1 +
 .../tx/datashard/change_record_cdc_serializer.cpp  |  1 +
 ydb/core/tx/datashard/datashard.cpp                |  1 +
 ydb/core/tx/datashard/datashard_impl.h             |  1 +
 ydb/core/tx/datashard/datashard_kqp.cpp            |  2 ++
 ydb/core/tx/datashard/datashard_pipeline.cpp       |  1 +
 ydb/core/tx/datashard/erase_rows_condition.cpp     |  1 +
 ydb/core/tx/datashard/export_common.h              |  1 +
 ydb/core/tx/datashard/extstorage_usage_config.h    |  1 +
 .../tx/datashard/ut_common/datashard_ut_common.cpp |  1 +
 ydb/core/tx/long_tx_service/public/events.h        |  1 +
 ydb/core/tx/scheme_board/events.h                  |  1 +
 ydb/core/tx/scheme_board/helpers.cpp               |  2 ++
 .../schemeshard__operation_blob_depot.cpp          |  2 ++
 .../schemeshard__operation_create_table.cpp        |  1 +
 .../schemeshard/schemeshard_audit_log_fragment.cpp |  2 ++
 ydb/core/tx/schemeshard/schemeshard_export.cpp     |  2 ++
 .../schemeshard_export_flow_proposals.cpp          |  1 +
 ydb/core/tx/schemeshard/schemeshard_info_types.h   |  8 ++++++++
 ydb/core/tx/schemeshard/schemeshard_schema.h       |  2 ++
 ydb/core/tx/schemeshard/schemeshard_utils.h        |  1 +
 .../ut_bsvolume_reboots/ut_bsvolume_reboots.cpp    |  1 +
 ydb/core/tx/schemeshard/ut_export/ut_export.cpp    |  1 +
 .../ut_filestore_reboots/ut_filestore_reboots.cpp  |  1 +
 .../ut_helpers/export_reboots_common.cpp           |  4 ++++
 ydb/core/tx/schemeshard/ut_helpers/helpers.cpp     |  1 +
 ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp   |  5 +++++
 ydb/core/tx/schemeshard/ut_helpers/ls_checks.h     |  3 +++
 ydb/core/tx/schemeshard/ut_helpers/test_env.h      |  4 ++++
 ydb/core/tx/schemeshard/ut_stats/ut_stats.cpp      |  1 +
 .../tx/schemeshard/ut_subdomain/ut_subdomain.cpp   |  2 ++
 ydb/core/tx/sequenceproxy/sequenceproxy_impl.h     |  1 +
 ydb/core/tx/sequenceshard/sequenceshard_impl.h     |  1 +
 ydb/core/tx/tx_proxy/datareq.cpp                   |  1 +
 ydb/core/tx/tx_proxy/describe.cpp                  |  1 +
 ydb/core/tx/tx_proxy/schemereq.cpp                 |  1 +
 ydb/core/util/address_classifier.h                 |  2 ++
 ydb/core/util/testactorsys.h                       |  3 +++
 ydb/core/viewer/browse_db.h                        |  1 +
 ydb/core/wrappers/s3_storage_config.h              |  1 +
 ydb/core/ydb_convert/compression.h                 |  1 +
 ydb/core/ydb_convert/table_description.cpp         |  3 +++
 ydb/core/ydb_convert/table_description.h           |  1 +
 ydb/core/ydb_convert/table_profiles.cpp            |  1 +
 ydb/core/ydb_convert/table_settings.cpp            |  2 ++
 ydb/core/ydb_convert/tx_proxy_status.cpp           |  4 +++-
 ydb/core/ydb_convert/ydb_convert.cpp               |  2 ++
 ydb/core/ydb_convert/ydb_convert.h                 |  1 +
 ydb/core/ymq/actor/auth_multi_factory.cpp          |  1 +
 ydb/core/ymq/actor/events.h                        |  2 ++
 ydb/core/ymq/base/secure_protobuf_printer.cpp      |  2 ++
 .../ymq/base/ut/secure_protobuf_printer_ut.cpp     |  1 +
 ydb/core/ymq/http/xml.cpp                          |  1 +
 ydb/library/actors/core/log.h                      |  1 +
 ydb/library/actors/core/ya.make                    |  1 +
 ydb/library/yaml_config/console_dumper_ut.cpp      |  5 +++++
 ydb/library/yaml_config/yaml_config.cpp            |  2 ++
 ydb/library/yaml_config/yaml_config_parser.cpp     |  1 +
 ydb/library/yaml_config/yaml_config_parser.h       |  2 ++
 ydb/library/yaml_config/yaml_config_ut.cpp         |  2 ++
 .../yql/providers/pq/async_io/dq_pq_read_actor.cpp |  6 ------
 .../providers/pq/async_io/dq_pq_write_actor.cpp    |  6 ------
 ydb/public/lib/deprecated/client/grpc_client.h     |  3 +++
 ydb/public/lib/deprecated/kicli/configurator.cpp   |  4 ++++
 ydb/public/lib/deprecated/kicli/dynamic_node.cpp   |  2 ++
 ydb/public/lib/deprecated/kicli/kicli.h            |  4 ++++
 ydb/public/lib/deprecated/kicli/kikimr.cpp         |  1 +
 ydb/services/cms/cms_ut.cpp                        |  5 +++++
 .../grpc_pq_clusters_updater_actor.cpp             |  1 +
 .../persqueue_v1/actors/persqueue_utils.cpp        |  1 +
 ydb/services/persqueue_v1/actors/persqueue_utils.h |  2 ++
 ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp       |  2 ++
 ydb/services/ydb/ydb_coordination_ut.cpp           |  1 +
 ydb/services/ydb/ydb_table_ut.cpp                  |  3 +++
 ydb/services/ydb/ydb_ut.cpp                        |  4 ++++
 ydb/tests/tools/kqprun/src/kqp_runner.h            |  1 +
 208 files changed, 351 insertions(+), 17 deletions(-)

diff --git a/ydb/core/audit/audit_log.h b/ydb/core/audit/audit_log.h
index f42cd2e77366..ae95ab5a4fef 100644
--- a/ydb/core/audit/audit_log.h
+++ b/ydb/core/audit/audit_log.h
@@ -6,6 +6,7 @@
 #include <ydb/library/actors/core/events.h>
 #include <library/cpp/logger/backend.h>
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/library/services/services.pb.h>
 
 #include <library/cpp/logger/record.h>
 #include <ydb/library/actors/core/hfunc.h>
diff --git a/ydb/core/base/appdata.cpp b/ydb/core/base/appdata.cpp
index 343519c3cbb2..8200f092625e 100644
--- a/ydb/core/base/appdata.cpp
+++ b/ydb/core/base/appdata.cpp
@@ -18,6 +18,9 @@
 #include <ydb/core/protos/key.pb.h>
 #include <ydb/core/protos/pqconfig.pb.h>
 #include <ydb/core/protos/stream.pb.h>
+#include <ydb/core/protos/netclassifier.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
+#include <ydb/core/protos/shared_cache.pb.h>
 #include <ydb/library/pdisk_io/aio.h>
 
 #include <ydb/library/actors/interconnect/poller_tcp.h>
diff --git a/ydb/core/base/appdata.h b/ydb/core/base/appdata.h
index 86efb76c9c2c..5a3880599308 100644
--- a/ydb/core/base/appdata.h
+++ b/ydb/core/base/appdata.h
@@ -13,11 +13,16 @@
 #include <ydb/core/control/immediate_control_board_impl.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/core/protos/auth.pb.h>
+#include <ydb/core/protos/blobstorage.pb.h>
 #include <ydb/core/protos/cms.pb.h>
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
 #include <ydb/core/protos/key.pb.h>
+#include <ydb/core/protos/kqp.pb.h>
 #include <ydb/core/protos/pqconfig.pb.h>
+#include <ydb/core/protos/netclassifier.pb.h>
 #include <ydb/core/protos/stream.pb.h>
+#include <ydb/core/protos/shared_cache.pb.h>
 #include <ydb/library/pdisk_io/aio.h>
 
 #include <ydb/core/base/event_filter.h>
diff --git a/ydb/core/base/domain.h b/ydb/core/base/domain.h
index a832c73f4a00..f350ce0272d0 100644
--- a/ydb/core/base/domain.h
+++ b/ydb/core/base/domain.h
@@ -3,6 +3,8 @@
 #include "tabletid.h"
 #include "localdb.h"
 
+#include <ydb/core/protos/blobstorage_config.pb.h>
+
 #include <util/generic/map.h>
 #include <util/generic/hash.h>
 #include <util/generic/ptr.h>
diff --git a/ydb/core/base/statestorage_impl.h b/ydb/core/base/statestorage_impl.h
index ed154b9d2d59..78e25bad5e23 100644
--- a/ydb/core/base/statestorage_impl.h
+++ b/ydb/core/base/statestorage_impl.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "ydb/core/scheme/scheme_pathid.h"
+#include <ydb/core/scheme/scheme_pathid.h>
+#include <ydb/core/protos/base.pb.h>
 #include "statestorage.h"
 
 namespace NKikimr {
diff --git a/ydb/core/blob_depot/agent/agent_impl.h b/ydb/core/blob_depot/agent/agent_impl.h
index f7fcf65e6415..dc267c84c19c 100644
--- a/ydb/core/blob_depot/agent/agent_impl.h
+++ b/ydb/core/blob_depot/agent/agent_impl.h
@@ -3,6 +3,8 @@
 #include "defs.h"
 #include "resolved_value.h"
 
+#include <ydb/core/protos/blob_depot_config.pb.h>
+
 namespace NKikimr::NBlobDepot {
 
 #define ENUMERATE_INCOMING_EVENTS(XX) \
diff --git a/ydb/core/blob_depot/blob_depot_tablet.h b/ydb/core/blob_depot/blob_depot_tablet.h
index c0b6efa3e08d..583fed19d371 100644
--- a/ydb/core/blob_depot/blob_depot_tablet.h
+++ b/ydb/core/blob_depot/blob_depot_tablet.h
@@ -5,6 +5,8 @@
 #include "types.h"
 #include "schema.h"
 
+#include <ydb/core/protos/blob_depot_config.pb.h>
+
 namespace NKikimr::NTesting {
 
     class TGroupOverseer;
diff --git a/ydb/core/blobstorage/base/blobstorage_vdiskid.cpp b/ydb/core/blobstorage/base/blobstorage_vdiskid.cpp
index bde51be2eeab..07f85e876260 100644
--- a/ydb/core/blobstorage/base/blobstorage_vdiskid.cpp
+++ b/ydb/core/blobstorage/base/blobstorage_vdiskid.cpp
@@ -1,5 +1,6 @@
 #include "blobstorage_vdiskid.h"
 #include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp
index 1f14bcb316a5..da89da96e2d3 100644
--- a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp
+++ b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/base/services/blobstorage_service_id.h>
 #include <ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.h>
 #include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 
 #include <ydb/library/actors/core/interconnect.h>
 
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h
index 22e0994b2f7d..176ebbcc0a4d 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h
@@ -13,6 +13,9 @@
 #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>
+#include <ydb/core/protos/shared_cache.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
 #include <ydb/core/base/feature_flags.h>
 #include <ydb/core/base/nameservice.h>
 #include <ydb/core/base/channel_profiles.h>
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h
index dd5131b0b00d..1e7f20bfffdd 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h
@@ -2,6 +2,8 @@
 #include "defs.h"
 #include "blobstorage_pdisk_defs.h"
 
+#include <ydb/core/protos/blobstorage_disk_color.pb.h>
+
 namespace NKikimr {
 namespace NPDisk {
 
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h
index 0789d3ccfa62..d221cfba4b9f 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h
@@ -6,6 +6,11 @@
 #include <ydb/core/blobstorage/base/vdisk_priorities.h>
 #include <ydb/core/control/immediate_control_board_wrapper.h>
 #include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
+#include <ydb/core/protos/blobstorage_pdisk_config.pb.h>
+#include <ydb/core/protos/blobstorage_disk_color.pb.h>
+#include <ydb/core/protos/feature_flags.pb.h>
 #include <ydb/core/protos/config.pb.h>
 
 #include <ydb/library/pdisk_io/drivedata.h>
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h
index 664451321e7e..98a77b4f42ce 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h
@@ -3,6 +3,7 @@
 #include <ydb/core/blobstorage/base/common_latency_hist_bounds.h>
 #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h>
 #include <ydb/core/mon/mon.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 #include <ydb/core/protos/node_whiteboard.pb.h>
 #include <ydb/core/util/light.h>
 
@@ -10,7 +11,6 @@
 #include <library/cpp/containers/stack_vector/stack_vec.h>
 #include <library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h>
 
-
 namespace NKikimr {
 
 struct TPDiskConfig;
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h
index fa38344a03d0..313c84e73ea3 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h
@@ -3,6 +3,7 @@
 
 #include <ydb/core/protos/blobstorage_config.pb.h>
 #include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/blobstorage_disk_color.pb.h>
 
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_defs.h>
 
diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
index 5b2da110596e..74ce7935bbf9 100644
--- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
+++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/logoblob.h>
+#include <ydb/core/protos/blob_depot_config.pb.h>
 
 #include <util/random/entropy.h>
 #include <util/random/mersenne.h>
diff --git a/ydb/core/blobstorage/ut_testshard/env.h b/ydb/core/blobstorage/ut_testshard/env.h
index a179dfef1c3f..ddea09daac5b 100644
--- a/ydb/core/blobstorage/ut_testshard/env.h
+++ b/ydb/core/blobstorage/ut_testshard/env.h
@@ -2,6 +2,8 @@
 
 #include "defs.h"
 
+#include <ydb/core/protos/blob_depot_config.pb.h>
+
 using namespace NActors;
 using namespace NKikimr;
 
diff --git a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp
index a52190e897c9..3b67ace63a6e 100644
--- a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp
+++ b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp
@@ -1,5 +1,6 @@
 #include "prepare.h"
 
+#include <ydb/core/base/appdata.h>
 #include <ydb/core/blobstorage/crypto/default.h>
 #include <ydb/core/blobstorage/vdisk/common/vdisk_pdiskctx.h>
 #include <ydb/core/blobstorage/vdisk/vdisk_services.h>
diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_events.h b/ydb/core/blobstorage/vdisk/common/vdisk_events.h
index d19c3256d84d..475288538316 100644
--- a/ydb/core/blobstorage/vdisk/common/vdisk_events.h
+++ b/ydb/core/blobstorage/vdisk/common/vdisk_events.h
@@ -18,6 +18,7 @@
 #include <ydb/core/base/event_filter.h>
 #include <ydb/core/base/interconnect_channels.h>
 #include <ydb/core/protos/blobstorage_config.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 
 #include <ydb/core/util/pb.h>
 
diff --git a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp
index 0d9db201b6ac..7a5522c8c9e7 100644
--- a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp
+++ b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/protos/base.pb.h>
 #include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/client/query_stats_ut.cpp b/ydb/core/client/query_stats_ut.cpp
index 2832399386bb..d7b1f69ee10f 100644
--- a/ydb/core/client/query_stats_ut.cpp
+++ b/ydb/core/client/query_stats_ut.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/tx/datashard/datashard_failpoints.h>
 #include <ydb/core/engine/mkql_engine_flat.h>
+#include <ydb/core/protos/query_stats.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 #include <google/protobuf/text_format.h>
diff --git a/ydb/core/client/server/msgbus_server.h b/ydb/core/client/server/msgbus_server.h
index cafedda8c332..66782e6415ad 100644
--- a/ydb/core/client/server/msgbus_server.h
+++ b/ydb/core/client/server/msgbus_server.h
@@ -4,6 +4,7 @@
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/public/lib/base/defs.h>
 #include <ydb/public/lib/base/msgbus.h>
+#include <ydb/core/protos/tx_proxy.pb.h>
 #include "msgbus_http_server.h"
 #include "msgbus_server_pq_metacache.h"
 
diff --git a/ydb/core/client/server/msgbus_server_request.cpp b/ydb/core/client/server/msgbus_server_request.cpp
index 4eb815a6a57c..f7b29b2ef34c 100644
--- a/ydb/core/client/server/msgbus_server_request.cpp
+++ b/ydb/core/client/server/msgbus_server_request.cpp
@@ -8,6 +8,7 @@
 #include <ydb/core/base/ticket_parser.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/tx/tx_processing.h>
+#include <ydb/core/protos/query_stats.pb.h>
 
 #include <ydb/library/yql/minikql/mkql_node_serialization.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
diff --git a/ydb/core/client/server/msgbus_server_tablet_counters.cpp b/ydb/core/client/server/msgbus_server_tablet_counters.cpp
index 4cae13225822..08a3814bcf00 100644
--- a/ydb/core/client/server/msgbus_server_tablet_counters.cpp
+++ b/ydb/core/client/server/msgbus_server_tablet_counters.cpp
@@ -1,5 +1,7 @@
 #include "msgbus_tabletreq.h"
 
+#include <ydb/core/protos/tablet_counters.pb.h>
+
 namespace NKikimr {
 namespace NMsgBusProxy {
 
diff --git a/ydb/core/cms/cluster_info.h b/ydb/core/cms/cluster_info.h
index f9439ad46d15..e49c64b35103 100644
--- a/ydb/core/cms/cluster_info.h
+++ b/ydb/core/cms/cluster_info.h
@@ -14,6 +14,7 @@
 #include <ydb/core/protos/cms.pb.h>
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/core/protos/console.pb.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/interconnect/interconnect.h>
diff --git a/ydb/core/cms/console/console.cpp b/ydb/core/cms/console/console.cpp
index 3b5b01aad842..ce9c2ce73e1e 100644
--- a/ydb/core/cms/console/console.cpp
+++ b/ydb/core/cms/console/console.cpp
@@ -9,6 +9,7 @@
 #include <ydb/core/base/domain.h>
 #include <ydb/core/base/feature_flags.h>
 #include <ydb/core/cms/console/validators/registry.h>
+#include <ydb/core/protos/netclassifier.pb.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <library/cpp/monlib/service/pages/templates.h>
diff --git a/ydb/core/cms/console/console.h b/ydb/core/cms/console/console.h
index 35fba0dc0172..fd518a69af90 100644
--- a/ydb/core/cms/console/console.h
+++ b/ydb/core/cms/console/console.h
@@ -5,6 +5,7 @@
 
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/protos/console.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
 #include <ydb/core/protos/console_config.pb.h>
 #include <ydb/core/protos/console_tenant.pb.h>
 #include <ydb/public/api/protos/ydb_cms.pb.h>
diff --git a/ydb/core/cms/console/console__drop_yaml_config.cpp b/ydb/core/cms/console/console__drop_yaml_config.cpp
index 080fee47a3fd..fb474d0a8660 100644
--- a/ydb/core/cms/console/console__drop_yaml_config.cpp
+++ b/ydb/core/cms/console/console__drop_yaml_config.cpp
@@ -2,6 +2,7 @@
 #include "console_configs_provider.h"
 
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
+#include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
 
 namespace NKikimr::NConsole {
 
diff --git a/ydb/core/cms/console/console__replace_yaml_config.cpp b/ydb/core/cms/console/console__replace_yaml_config.cpp
index 96aef52b51e8..4df3681a0b9f 100644
--- a/ydb/core/cms/console/console__replace_yaml_config.cpp
+++ b/ydb/core/cms/console/console__replace_yaml_config.cpp
@@ -2,6 +2,7 @@
 #include "console_configs_provider.h"
 
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
+#include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
 
 namespace NKikimr::NConsole {
 
diff --git a/ydb/core/cms/console/console_tenants_manager.h b/ydb/core/cms/console/console_tenants_manager.h
index ce3eaa2922fa..2431dbf0286f 100644
--- a/ydb/core/cms/console/console_tenants_manager.h
+++ b/ydb/core/cms/console/console_tenants_manager.h
@@ -20,6 +20,7 @@
 #include <ydb/public/lib/operation_id/operation_id.h>
 
 #include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
 
 #include <ydb/library/actors/core/hfunc.h>
 
diff --git a/ydb/core/cms/console/net_classifier_updater.cpp b/ydb/core/cms/console/net_classifier_updater.cpp
index 20194a49fbde..20814a518cb1 100644
--- a/ydb/core/cms/console/net_classifier_updater.cpp
+++ b/ydb/core/cms/console/net_classifier_updater.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/tablet_pipe.h>
+#include <ydb/core/protos/netclassifier.pb.h>
 
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/http/http_proxy.h>
diff --git a/ydb/core/cms/console/util/config_index.h b/ydb/core/cms/console/util/config_index.h
index 27305ae52740..821f9482bd8e 100644
--- a/ydb/core/cms/console/util/config_index.h
+++ b/ydb/core/cms/console/util/config_index.h
@@ -3,6 +3,7 @@
 #include "defs.h"
 
 #include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/config.pb.h>
 
 #include <util/generic/bitmap.h>
 #include <util/generic/hash.h>
diff --git a/ydb/core/cms/console/validators/validator_bootstrap.h b/ydb/core/cms/console/validators/validator_bootstrap.h
index b4b69542fcaf..89c687013696 100644
--- a/ydb/core/cms/console/validators/validator_bootstrap.h
+++ b/ydb/core/cms/console/validators/validator_bootstrap.h
@@ -2,6 +2,8 @@
 
 #include "validator.h"
 
+#include <ydb/core/protos/resource_broker.pb.h>
+
 namespace NKikimr::NConsole {
 
 class TBootstrapConfigValidator : public IConfigValidator {
diff --git a/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp b/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
index 845bf8bf8ccb..a224f3a16ee1 100644
--- a/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
+++ b/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
@@ -1,6 +1,8 @@
 #include "validator_bootstrap.h"
 #include "validator_ut_common.h"
 
+#include <ydb/library/actors/protos/interconnect.pb.h>
+
 namespace NKikimr::NConsole {
 
 using namespace NTests;
diff --git a/ydb/core/cms/console/validators/validator_ut_common.h b/ydb/core/cms/console/validators/validator_ut_common.h
index 391a64aac2d0..17ac1f63c7f7 100644
--- a/ydb/core/cms/console/validators/validator_ut_common.h
+++ b/ydb/core/cms/console/validators/validator_ut_common.h
@@ -6,6 +6,9 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
+#include <ydb/library/actors/protos/interconnect.pb.h>
+#include <ydb/core/protos/resource_broker.pb.h>
+
 namespace NKikimr::NConsole {
 namespace NTests {
 
diff --git a/ydb/core/cms/json_proxy.h b/ydb/core/cms/json_proxy.h
index cda44d0c54da..243a9ed9caf9 100644
--- a/ydb/core/cms/json_proxy.h
+++ b/ydb/core/cms/json_proxy.h
@@ -9,6 +9,7 @@
 #include <ydb/core/cms/console/console.h>
 #include <ydb/core/mon/mon.h>
 #include <ydb/core/tx/datashard/datashard.h>
+#include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
 
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/cms/pdisk_state.h b/ydb/core/cms/pdisk_state.h
index b3c843754672..5f80f841069e 100644
--- a/ydb/core/cms/pdisk_state.h
+++ b/ydb/core/cms/pdisk_state.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/node_whiteboard.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 
 namespace NKikimr::NCms {
 
diff --git a/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp b/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
index b2be61504195..5cc0385bbe3c 100644
--- a/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
+++ b/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
@@ -2,6 +2,7 @@
 #include "cli_cmds.h"
 
 #include <ydb/core/tx/schemeshard/schemeshard_user_attr_limits.h>
+#include <ydb/core/protos/bind_channel_storage_pool.pb.h>
 
 #include <ydb/library/aclib/aclib.h>
 
diff --git a/ydb/core/driver_lib/cli_config_base/config_base.h b/ydb/core/driver_lib/cli_config_base/config_base.h
index d7d61590f2a0..f88c8ec939b7 100644
--- a/ydb/core/driver_lib/cli_config_base/config_base.h
+++ b/ydb/core/driver_lib/cli_config_base/config_base.h
@@ -4,6 +4,14 @@
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 #include <ydb/public/lib/deprecated/client/grpc_client.h>
 #include <ydb/core/util/pb.h>
+#include <ydb/core/protos/blobstorage_vdisk_config.pb.h>
+#include <ydb/core/protos/drivemodel.pb.h>
+#include <ydb/core/protos/feature_flags.pb.h>
+#include <ydb/core/protos/pqconfig.pb.h>
+#include <ydb/core/protos/netclassifier.pb.h>
+#include <ydb/core/protos/auth.pb.h>
+#include <ydb/core/protos/key.pb.h>
+#include <ydb/core/fq/libs/config/protos/fq_config.pb.h>
 
 #include <google/protobuf/text_format.h>
 
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp
index aae54255e919..2ff21c964415 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp
@@ -1,5 +1,6 @@
 #include <ydb/core/protos/blobstorage.pb.h>
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
 #include <ydb/library/yaml_config/yaml_config_parser.h>
 #include "cli.h"
 #include "cli_cmds.h"
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp
index 9577a8a456fc..2a810bdd2057 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp
@@ -2,6 +2,8 @@
 #include "cli_cmds.h"
 
 #include <ydb/library/yaml_config/console_dumper.h>
+#include <ydb/core/protos/console_base.pb.h>
+#include <ydb/core/protos/console.pb.h>
 
 #include <util/string/type.h>
 #include <util/string/split.h>
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_get.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_get.cpp
index 73c444474f10..e23f27729001 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_get.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_get.cpp
@@ -1,6 +1,7 @@
 #include "cli.h"
 #include "cli_cmds.h"
 #include <ydb/core/base/logoblob.h>
+#include <ydb/core/protos/base.pb.h>
 
 namespace NKikimr {
 namespace NDriverClient {
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp
index 43210bddce2a..0f26425319d9 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp
@@ -13,6 +13,11 @@
 #include <util/system/fs.h>
 #include <util/system/hostname.h>
 #include <google/protobuf/text_format.h>
+#include <ydb/core/protos/alloc.pb.h>
+#include <ydb/core/protos/http_config.pb.h>
+#include <ydb/core/protos/tenant_pool.pb.h>
+#include <ydb/core/protos/node_broker.pb.h>
+#include <ydb/core/protos/resource_broker.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_discovery/discovery.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_tablet.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_tablet.cpp
index c0738d1c58d5..28b686b61c0c 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_tablet.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_tablet.cpp
@@ -1,6 +1,8 @@
 #include "cli.h"
 #include "cli_cmds.h"
 
+#include <ydb/core/protos/base.pb.h>
+
 namespace NKikimr {
 namespace NDriverClient {
 
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_tenant.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_tenant.cpp
index 9b2ac66ad134..3ad6a62a0d9c 100644
--- a/ydb/core/driver_lib/cli_utils/cli_cmds_tenant.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_cmds_tenant.cpp
@@ -8,6 +8,7 @@
 #include <ydb/public/api/grpc/ydb_operation_v1.grpc.pb.h>
 #include <ydb/public/api/grpc/ydb_auth_v1.grpc.pb.h>
 #include <ydb/public/api/grpc/ydb_cms_v1.grpc.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
 
 #include <util/string/split.h>
 #include <util/string/join.h>
diff --git a/ydb/core/driver_lib/cli_utils/cli_keyvalue.cpp b/ydb/core/driver_lib/cli_utils/cli_keyvalue.cpp
index e65fbdda1e14..b0538f2abc73 100644
--- a/ydb/core/driver_lib/cli_utils/cli_keyvalue.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_keyvalue.cpp
@@ -2,6 +2,7 @@
 #include <google/protobuf/text_format.h>
 #include <util/stream/file.h>
 #include <util/string/printf.h>
+#include <ydb/core/protos/base.pb.h>
 
 namespace NKikimr {
 namespace NDriverClient {
diff --git a/ydb/core/driver_lib/cli_utils/cli_persqueue_stress.cpp b/ydb/core/driver_lib/cli_utils/cli_persqueue_stress.cpp
index b4198c8a7c42..824d61d97f66 100644
--- a/ydb/core/driver_lib/cli_utils/cli_persqueue_stress.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_persqueue_stress.cpp
@@ -1,6 +1,7 @@
 #include "cli.h"
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 #include <ydb/core/base/tablet_types.h>
+#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h>
 
 namespace NKikimr {
 namespace NDriverClient {
diff --git a/ydb/core/driver_lib/cli_utils/cli_scheme_initroot.cpp b/ydb/core/driver_lib/cli_utils/cli_scheme_initroot.cpp
index 7fb8c837876b..2a1b9037446f 100644
--- a/ydb/core/driver_lib/cli_utils/cli_scheme_initroot.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_scheme_initroot.cpp
@@ -3,6 +3,7 @@
 #include <ydb/core/scheme/tablet_scheme.h>
 #include <ydb/core/scheme/scheme_types_defs.h>
 #include <ydb/core/scheme/scheme_type_registry.h>
+#include <ydb/core/protos/tx_scheme.pb.h>
 
 namespace NKikimr {
 namespace NDriverClient {
diff --git a/ydb/core/driver_lib/run/config_parser.cpp b/ydb/core/driver_lib/run/config_parser.cpp
index a16c1743d4e4..553c9714d9e3 100644
--- a/ydb/core/driver_lib/run/config_parser.cpp
+++ b/ydb/core/driver_lib/run/config_parser.cpp
@@ -4,6 +4,7 @@
 #include <ydb/library/actors/core/log_settings.h>
 #include <ydb/public/lib/base/msgbus.h>
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
+#include <ydb/core/protos/alloc.pb.h>
 
 #include <util/stream/file.h>
 #include <util/stream/format.h>
diff --git a/ydb/core/driver_lib/run/dummy.cpp b/ydb/core/driver_lib/run/dummy.cpp
index 12624df93ab0..4fb99d4f06bd 100644
--- a/ydb/core/driver_lib/run/dummy.cpp
+++ b/ydb/core/driver_lib/run/dummy.cpp
@@ -1,5 +1,6 @@
 #include "dummy.h"
 #include <ydb/core/base/blobstorage_grouptype.h>
+#include <ydb/core/protos/alloc.pb.h>
 
 TAutoPtr<NKikimrConfig::TActorSystemConfig> DummyActorSystemConfig() {
     TAutoPtr<NKikimrConfig::TActorSystemConfig> ret(new NKikimrConfig::TActorSystemConfig());
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index 3d6d55867061..cb619577ff87 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -108,6 +108,7 @@
 
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/node_limits.pb.h>
 
 #include <ydb/core/public_http/http_service.h>
 
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index e670fe9a0a66..76888136af01 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -55,6 +55,9 @@
 #include <ydb/core/base/event_filter.h>
 #include <ydb/core/base/statestorage_impl.h>
 #include <ydb/library/services/services.pb.h>
+#include <ydb/core/protos/alloc.pb.h>
+#include <ydb/core/protos/http_config.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
 
 #include <ydb/core/mind/local.h>
 #include <ydb/core/mind/tenant_pool.h>
diff --git a/ydb/core/engine/minikql/flat_local_minikql_program.h b/ydb/core/engine/minikql/flat_local_minikql_program.h
index 2c548f529e07..9ef1f993efdf 100644
--- a/ydb/core/engine/minikql/flat_local_minikql_program.h
+++ b/ydb/core/engine/minikql/flat_local_minikql_program.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/tablet.h>
+#include <ydb/core/protos/tx_proxy.pb.h>
 
 namespace NKikimr {
 namespace NMiniKQL {
diff --git a/ydb/core/engine/minikql/flat_local_tx_read_columns.h b/ydb/core/engine/minikql/flat_local_tx_read_columns.h
index 3112d72a9a12..0bbb7b063ffb 100644
--- a/ydb/core/engine/minikql/flat_local_tx_read_columns.h
+++ b/ydb/core/engine/minikql/flat_local_tx_read_columns.h
@@ -5,6 +5,7 @@
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
 #include <ydb/core/tablet/tablet_exception.h>
 #include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 #include <ydb/core/formats/factory.h>
 #include <ydb/core/base/appdata.h>
 
diff --git a/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp b/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp
index 4055825c0c9b..7d0f22a4dd37 100644
--- a/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp
+++ b/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/fq/libs/actors/database_resolver.h>
 #include <ydb/core/fq/libs/events/events.h>
 #include <ydb/core/fq/libs/db_id_async_resolver_impl/mdb_endpoint_generator.h>
+#include <ydb/core/fq/libs/config/protos/checkpoint_coordinator.pb.h>
 
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/testlib/basics/helpers.h>
diff --git a/ydb/core/grpc_services/grpc_request_proxy.cpp b/ydb/core/grpc_services/grpc_request_proxy.cpp
index 388674a80225..8901a4566a26 100644
--- a/ydb/core/grpc_services/grpc_request_proxy.cpp
+++ b/ydb/core/grpc_services/grpc_request_proxy.cpp
@@ -13,6 +13,7 @@
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/tx/scheme_board/scheme_board.h>
 #include <ydb/library/wilson_ids/wilson.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 
 #include <shared_mutex>
 
diff --git a/ydb/core/grpc_services/grpc_request_proxy_simple.cpp b/ydb/core/grpc_services/grpc_request_proxy_simple.cpp
index 0060f7d1a1c6..b78fb7790861 100644
--- a/ydb/core/grpc_services/grpc_request_proxy_simple.cpp
+++ b/ydb/core/grpc_services/grpc_request_proxy_simple.cpp
@@ -4,6 +4,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/grpc_services/counters/proxy_counters.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 
 #include <util/system/hostname.h>
 
diff --git a/ydb/core/grpc_services/rpc_execute_data_query.cpp b/ydb/core/grpc_services/rpc_execute_data_query.cpp
index b96c36b1f7d6..9da6878fc36b 100644
--- a/ydb/core/grpc_services/rpc_execute_data_query.cpp
+++ b/ydb/core/grpc_services/rpc_execute_data_query.cpp
@@ -10,6 +10,7 @@
 #include <ydb/core/base/counters.h>
 #include <ydb/core/protos/console_config.pb.h>
 #include <ydb/core/ydb_convert/ydb_convert.h>
+#include <ydb/core/protos/query_stats.pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
diff --git a/ydb/core/grpc_services/rpc_export_base.h b/ydb/core/grpc_services/rpc_export_base.h
index 9a5b7d981eb1..93e2baae854f 100644
--- a/ydb/core/grpc_services/rpc_export_base.h
+++ b/ydb/core/grpc_services/rpc_export_base.h
@@ -2,6 +2,7 @@
 
 #include <ydb/core/protos/export.pb.h>
 #include <ydb/public/api/protos/ydb_operation.pb.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
 #include <util/string/cast.h>
diff --git a/ydb/core/grpc_services/rpc_import_base.h b/ydb/core/grpc_services/rpc_import_base.h
index ab4105c7abdf..aad6e26df5b7 100644
--- a/ydb/core/grpc_services/rpc_import_base.h
+++ b/ydb/core/grpc_services/rpc_import_base.h
@@ -2,6 +2,7 @@
 
 #include <ydb/core/protos/import.pb.h>
 #include <ydb/public/api/protos/ydb_operation.pb.h>
+#include <ydb/public/api/protos/ydb_import.pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
 #include <util/string/cast.h>
diff --git a/ydb/core/grpc_services/rpc_kqp_base.cpp b/ydb/core/grpc_services/rpc_kqp_base.cpp
index 35d06393afb6..0ff21c6b1d2a 100644
--- a/ydb/core/grpc_services/rpc_kqp_base.cpp
+++ b/ydb/core/grpc_services/rpc_kqp_base.cpp
@@ -1,5 +1,7 @@
 #include "rpc_kqp_base.h"
 
+#include <ydb/core/protos/kqp_stats.pb.h>
+
 namespace NKikimr {
 namespace NGRpcService {
 
diff --git a/ydb/core/http_proxy/http_service.cpp b/ydb/core/http_proxy/http_service.cpp
index 001881413146..396a717536ab 100644
--- a/ydb/core/http_proxy/http_service.cpp
+++ b/ydb/core/http_proxy/http_service.cpp
@@ -7,10 +7,11 @@
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/actors/http/http_proxy.h>
+#include <ydb/library/http_proxy/error/error.h>
 
-#include <util/stream/file.h>
+#include <ydb/core/protos/config.pb.h>
 
-#include <ydb/library/http_proxy/error/error.h>
+#include <util/stream/file.h>
 
 namespace NKikimr::NHttpProxy {
 
diff --git a/ydb/core/kafka_proxy/actors/actors.h b/ydb/core/kafka_proxy/actors/actors.h
index 4c0186ec3a76..6e1692f201ea 100644
--- a/ydb/core/kafka_proxy/actors/actors.h
+++ b/ydb/core/kafka_proxy/actors/actors.h
@@ -5,6 +5,7 @@
 #include <ydb/core/protos/config.pb.h>
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/public/api/protos/persqueue_error_codes_v1.pb.h>
+#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h> // strange
 
 #include "../kafka_messages.h"
 
diff --git a/ydb/core/kesus/proxy/events.h b/ydb/core/kesus/proxy/events.h
index 2062661bf632..b9694f7d3b42 100644
--- a/ydb/core/kesus/proxy/events.h
+++ b/ydb/core/kesus/proxy/events.h
@@ -4,6 +4,8 @@
 
 #include <ydb/core/base/events.h>
 #include <ydb/core/protos/kesus.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 
 namespace NKikimr {
diff --git a/ydb/core/kesus/tablet/events.h b/ydb/core/kesus/tablet/events.h
index 7995a206d026..9de056b3b422 100644
--- a/ydb/core/kesus/tablet/events.h
+++ b/ydb/core/kesus/tablet/events.h
@@ -4,6 +4,8 @@
 
 #include <ydb/core/base/events.h>
 #include <ydb/core/protos/kesus.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
 
 namespace NKikimr {
 namespace NKesus {
diff --git a/ydb/core/kesus/tablet/quoter_resource_tree.h b/ydb/core/kesus/tablet/quoter_resource_tree.h
index f2e027d00356..c1def93f669b 100644
--- a/ydb/core/kesus/tablet/quoter_resource_tree.h
+++ b/ydb/core/kesus/tablet/quoter_resource_tree.h
@@ -6,6 +6,7 @@
 
 #include <ydb/library/actors/core/actor.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <util/datetime/base.h>
 #include <util/generic/hash.h>
diff --git a/ydb/core/kqp/common/events/query.h b/ydb/core/kqp/common/events/query.h
index dac9241e55e7..71a4b63504dc 100644
--- a/ydb/core/kqp/common/events/query.h
+++ b/ydb/core/kqp/common/events/query.h
@@ -7,6 +7,7 @@
 #include <ydb/core/grpc_services/cancelation/cancelation.h>
 
 #include <ydb/public/api/protos/ydb_query.pb.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/library/actors/core/event_pb.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/core/kqp/common/events/script_executions.h b/ydb/core/kqp/common/events/script_executions.h
index f5157a1a10b2..c82633b2c8e2 100644
--- a/ydb/core/kqp/common/events/script_executions.h
+++ b/ydb/core/kqp/common/events/script_executions.h
@@ -1,8 +1,11 @@
 #pragma once
 #include <ydb/core/kqp/common/simple/kqp_event_ids.h>
 #include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/kqp_stats.pb.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
 #include <ydb/library/yql/public/issue/yql_issue.h>
 #include <ydb/public/api/protos/ydb_operation.pb.h>
+#include <ydb/public/api/protos/ydb_query.pb.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
diff --git a/ydb/core/kqp/common/kqp_timeouts.cpp b/ydb/core/kqp/common/kqp_timeouts.cpp
index 9d4c172466cb..4389a3e3241d 100644
--- a/ydb/core/kqp/common/kqp_timeouts.cpp
+++ b/ydb/core/kqp/common/kqp_timeouts.cpp
@@ -1,5 +1,7 @@
 #include "kqp_timeouts.h"
 
+#include <ydb/core/protos/table_service_config.pb.h>
+
 namespace NKikimr::NKqp {
 
 
diff --git a/ydb/core/kqp/common/kqp_timeouts.h b/ydb/core/kqp/common/kqp_timeouts.h
index 00cd245e2972..e5855b368324 100644
--- a/ydb/core/kqp/common/kqp_timeouts.h
+++ b/ydb/core/kqp/common/kqp_timeouts.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/kqp.pb.h>
 #include <util/datetime/base.h>
 
 
diff --git a/ydb/core/kqp/common/shutdown/controller.h b/ydb/core/kqp/common/shutdown/controller.h
index 761a6e3c21de..fd50ee7b6512 100644
--- a/ydb/core/kqp/common/shutdown/controller.h
+++ b/ydb/core/kqp/common/shutdown/controller.h
@@ -3,6 +3,7 @@
 #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>
 
 namespace NKikimr::NKqp {
 
diff --git a/ydb/core/kqp/common/simple/settings.h b/ydb/core/kqp/common/simple/settings.h
index dac06f471159..c7593eab7bd8 100644
--- a/ydb/core/kqp/common/simple/settings.h
+++ b/ydb/core/kqp/common/simple/settings.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/kqp.pb.h>
+#include <ydb/public/api/protos/ydb_query.pb.h>
 
 #include <util/str_stl.h>
 
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
index 3e9f324caa6e..d97a8efab5dd 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
@@ -12,6 +12,8 @@
 #include <ydb/library/yql/providers/generic/actors/yql_generic_source_factory.h>
 #include <ydb/library/yql/providers/s3/actors/yql_s3_sink_factory.h>
 #include <ydb/library/yql/providers/s3/actors/yql_s3_source_factory.h>
+#include <ydb/core/protos/ssa.pb.h>
+#include <ydb/library/yql/dq/proto/dq_tasks.pb.h>
 
 
 namespace NKikimr {
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_events.h b/ydb/core/kqp/compute_actor/kqp_compute_events.h
index f31f946d28fd..e2f8b547318f 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_events.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_events.h
@@ -3,6 +3,7 @@
 #include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/kqp/common/kqp.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
+#include <ydb/core/protos/data_events.pb.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/api.h>
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
index d4cd835e37fe..b57542916827 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
@@ -8,6 +8,7 @@
 #include <ydb/core/kqp/runtime/kqp_tasks_runner.h>
 #include <ydb/core/kqp/runtime/kqp_scan_data.h>
 #include <ydb/core/kqp/common/kqp_resolve.h>
+#include <ydb/core/protos/kqp_stats.pb.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h>
 
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp b/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
index da29486bd7d5..7a1b8733be41 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp
@@ -4,6 +4,7 @@
 #include <ydb/core/tx/datashard/range_ops.h>
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
+#include <ydb/core/protos/ssa.pb.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h>
 
diff --git a/ydb/core/kqp/counters/kqp_counters.cpp b/ydb/core/kqp/counters/kqp_counters.cpp
index c3ad52dcb6b5..96516e07f2a0 100644
--- a/ydb/core/kqp/counters/kqp_counters.cpp
+++ b/ydb/core/kqp/counters/kqp_counters.cpp
@@ -12,6 +12,7 @@
 #include <util/generic/size_literals.h>
 
 #include <ydb/library/yql/core/issue/protos/issue_id.pb.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 
 namespace NKikimr {
 namespace NKqp {
diff --git a/ydb/core/kqp/counters/kqp_counters.h b/ydb/core/kqp/counters/kqp_counters.h
index f62974344572..5f64c8496fe3 100644
--- a/ydb/core/kqp/counters/kqp_counters.h
+++ b/ydb/core/kqp/counters/kqp_counters.h
@@ -13,6 +13,7 @@
 
 #include <ydb/library/yql/minikql/aligned_page_pool.h>
 #include <ydb/library/yql/dq/actors/spilling/spilling_counters.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <util/system/spinlock.h>
 
diff --git a/ydb/core/kqp/executer_actor/kqp_executer.h b/ydb/core/kqp/executer_actor/kqp_executer.h
index 242c64027224..1503f0b2a1b2 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer.h
@@ -8,6 +8,7 @@
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/tx/long_tx_service/public/lock_handle.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io_factory.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 
 namespace NKikimr {
 namespace NKqp {
diff --git a/ydb/core/kqp/executer_actor/kqp_executer_stats.h b/ydb/core/kqp/executer_actor/kqp_executer_stats.h
index bea43d882dab..11da2a2ef7b8 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_stats.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer_stats.h
@@ -2,6 +2,8 @@
 
 #include "kqp_tasks_graph.h"
 #include <util/generic/vector.h>
+#include <ydb/library/yql/dq/actors/protos/dq_stats.pb.h>
+#include <ydb/core/protos/query_stats.pb.h>
 
 namespace NKikimr {
 namespace NKqp {
diff --git a/ydb/core/kqp/executer_actor/kqp_locks_helper.cpp b/ydb/core/kqp/executer_actor/kqp_locks_helper.cpp
index 5ec7be707116..3442de243ae1 100644
--- a/ydb/core/kqp/executer_actor/kqp_locks_helper.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_locks_helper.cpp
@@ -3,6 +3,8 @@
 #include <ydb/library/yql/minikql/mkql_node.h>
 #include <ydb/library/yql/utils/yql_panic.h>
 
+#include <ydb/core/protos/data_events.pb.h>
+
 
 namespace NKikimr::NKqp {
 
diff --git a/ydb/core/kqp/executer_actor/kqp_planner_strategy.h b/ydb/core/kqp/executer_actor/kqp_planner_strategy.h
index 8aae1108fc01..548e18e1511b 100644
--- a/ydb/core/kqp/executer_actor/kqp_planner_strategy.h
+++ b/ydb/core/kqp/executer_actor/kqp_planner_strategy.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/kqp/rm_service/kqp_resource_estimation.h>
+#include <ydb/core/protos/kqp.pb.h>
 
 #include <ydb/library/actors/core/actorid.h>
 
diff --git a/ydb/core/kqp/executer_actor/kqp_tasks_graph.h b/ydb/core/kqp/executer_actor/kqp_tasks_graph.h
index cc9e95ab5344..0e80e71e1dbe 100644
--- a/ydb/core/kqp/executer_actor/kqp_tasks_graph.h
+++ b/ydb/core/kqp/executer_actor/kqp_tasks_graph.h
@@ -5,6 +5,8 @@
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 
 #include <ydb/library/yql/dq/tasks/dq_connection_builder.h>
 #include <ydb/library/yql/dq/tasks/dq_tasks_graph.h>
diff --git a/ydb/core/kqp/gateway/kqp_gateway.h b/ydb/core/kqp/gateway/kqp_gateway.h
index 9171d2dbb71a..2dcb3ef66161 100644
--- a/ydb/core/kqp/gateway/kqp_gateway.h
+++ b/ydb/core/kqp/gateway/kqp_gateway.h
@@ -3,6 +3,8 @@
 #include <ydb/core/kqp/query_data/kqp_query_data.h>
 #include <ydb/core/protos/tx_proxy.pb.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/core/protos/data_events.pb.h>
 
 #include <ydb/core/kqp/topics/kqp_topics.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
diff --git a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp
index 763470536966..d7e45099ee66 100644
--- a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp
+++ b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp
@@ -15,6 +15,7 @@
 #include <ydb/core/kqp/gateway/utils/scheme_helpers.h>
 #include <ydb/core/kqp/rm_service/kqp_snapshot_manager.h>
 #include <ydb/core/protos/external_sources.pb.h>
+#include <ydb/core/protos/console_config.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/grpc_services/local_rpc/local_rpc.h>
diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp
index 90a411089378..838017a1f26b 100644
--- a/ydb/core/kqp/opt/kqp_query_plan.cpp
+++ b/ydb/core/kqp/opt/kqp_query_plan.cpp
@@ -15,6 +15,7 @@
 #include <ydb/library/yql/dq/tasks/dq_tasks_graph.h>
 #include <ydb/library/yql/utils/plan/plan_utils.h>
 #include <ydb/library/yql/providers/dq/common/yql_dq_settings.h>
+#include <ydb/library/yql/dq/actors/protos/dq_stats.pb.h>
 
 #include <ydb/public/lib/ydb_cli/common/format.h>
 
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp
index a4ed3c3c62bf..def4f0e632a4 100644
--- a/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp
+++ b/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp
@@ -4,6 +4,7 @@
 #include <ydb/core/kqp/common/kqp_yql.h>
 #include <ydb/core/kqp/opt/kqp_opt_impl.h>
 #include <ydb/core/kqp/provider/yql_kikimr_provider_impl.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 
 #include <ydb/library/yql/core/yql_opt_utils.h>
 #include <ydb/library/yql/dq/opt/dq_opt_log.h>
diff --git a/ydb/core/kqp/provider/yql_kikimr_exec.cpp b/ydb/core/kqp/provider/yql_kikimr_exec.cpp
index 4094a603ee3a..1eb5af3e2e62 100644
--- a/ydb/core/kqp/provider/yql_kikimr_exec.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_exec.cpp
@@ -17,6 +17,7 @@
 #include <ydb/library/yql/public/issue/yql_issue.h>
 
 #include <ydb/core/ydb_convert/ydb_convert.h>
+#include <ydb/core/protos/index_builder.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/public/api/protos/ydb_topic.pb.h>
diff --git a/ydb/core/kqp/provider/yql_kikimr_gateway.h b/ydb/core/kqp/provider/yql_kikimr_gateway.h
index 3c9b541eee70..1ba5c806b224 100644
--- a/ydb/core/kqp/provider/yql_kikimr_gateway.h
+++ b/ydb/core/kqp/provider/yql_kikimr_gateway.h
@@ -19,6 +19,7 @@
 #include <ydb/core/kqp/query_data/kqp_prepared_query.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
 #include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/kqp_stats.pb.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
 #include <library/cpp/json/json_reader.h>
diff --git a/ydb/core/kqp/provider/yql_kikimr_settings.cpp b/ydb/core/kqp/provider/yql_kikimr_settings.cpp
index b1dfad359e33..7a97a52e7e26 100644
--- a/ydb/core/kqp/provider/yql_kikimr_settings.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_settings.cpp
@@ -1,6 +1,7 @@
 #include "yql_kikimr_settings.h"
 
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 #include <util/generic/size_literals.h>
 
 namespace NYql {
diff --git a/ydb/core/kqp/query_data/kqp_prepared_query.h b/ydb/core/kqp/query_data/kqp_prepared_query.h
index e43a49c83af5..a92a79063137 100644
--- a/ydb/core/kqp/query_data/kqp_prepared_query.h
+++ b/ydb/core/kqp/query_data/kqp_prepared_query.h
@@ -4,6 +4,7 @@
 #include <ydb/core/kqp/query_data/kqp_predictor.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
 
 #include <util/generic/vector.h>
 
diff --git a/ydb/core/kqp/rm_service/kqp_resource_estimation.h b/ydb/core/kqp/rm_service/kqp_resource_estimation.h
index 08c1d674f9a2..e88c7065c2ed 100644
--- a/ydb/core/kqp/rm_service/kqp_resource_estimation.h
+++ b/ydb/core/kqp/rm_service/kqp_resource_estimation.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 #include <ydb/core/kqp/runtime/kqp_scan_data.h>
 
 #include <ydb/library/yql/dq/proto/dq_tasks.pb.h>
diff --git a/ydb/core/kqp/rm_service/kqp_rm_service.h b/ydb/core/kqp/rm_service/kqp_rm_service.h
index 6386b43946f2..c45965c402b2 100644
--- a/ydb/core/kqp/rm_service/kqp_rm_service.h
+++ b/ydb/core/kqp/rm_service/kqp_rm_service.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 #include <ydb/core/kqp/common/simple/kqp_event_ids.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_pattern_cache.h>
diff --git a/ydb/core/kqp/runtime/kqp_scan_data_meta.cpp b/ydb/core/kqp/runtime/kqp_scan_data_meta.cpp
index 23d03c4b9d0e..af057d445a3d 100644
--- a/ydb/core/kqp/runtime/kqp_scan_data_meta.cpp
+++ b/ydb/core/kqp/runtime/kqp_scan_data_meta.cpp
@@ -1,6 +1,7 @@
 #include "kqp_compute.h"
 #include "kqp_scan_data_meta.h"
 #include <ydb/core/protos/tx_datashard.pb.h>
+#include <ydb/core/protos/data_events.pb.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
 namespace NKikimr::NMiniKQL {
diff --git a/ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp b/ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp
index 5ff68ed0b79c..8ae26559cb69 100644
--- a/ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp
+++ b/ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp
@@ -3,6 +3,8 @@
 #include <ydb/core/kqp/common/kqp_resolve.h>
 #include <ydb/core/kqp/runtime/kqp_scan_data.h>
 #include <ydb/core/tx/datashard/range_ops.h>
+#include <ydb/core/scheme/protos/type_info.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <ydb/library/yql/minikql/mkql_node_serialization.h>
 
diff --git a/ydb/core/kqp/runtime/kqp_stream_lookup_worker.h b/ydb/core/kqp/runtime/kqp_stream_lookup_worker.h
index adf44c052c19..1df5a43d159f 100644
--- a/ydb/core/kqp/runtime/kqp_stream_lookup_worker.h
+++ b/ydb/core/kqp/runtime/kqp_stream_lookup_worker.h
@@ -6,6 +6,7 @@
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/tx/locks/sys_tables.h>
 #include <ydb/core/tx/datashard/datashard.h>
+#include <ydb/library/yql/dq/proto/dq_tasks.pb.h>
 
 namespace NKikimr {
 namespace NKqp {
diff --git a/ydb/core/kqp/runtime/kqp_write_actor.cpp b/ydb/core/kqp/runtime/kqp_write_actor.cpp
index 6d375d38eef3..4c49fceb5251 100644
--- a/ydb/core/kqp/runtime/kqp_write_actor.cpp
+++ b/ydb/core/kqp/runtime/kqp_write_actor.cpp
@@ -16,6 +16,7 @@
 #include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/interconnect.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
 
 
 namespace {
diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.h b/ydb/core/kqp/session_actor/kqp_session_actor.h
index 763e43de343d..b8590b17c6f7 100644
--- a/ydb/core/kqp/session_actor/kqp_session_actor.h
+++ b/ydb/core/kqp/session_actor/kqp_session_actor.h
@@ -5,6 +5,7 @@
 #include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io_factory.h>
 
 #include <ydb/library/actors/core/actorid.h>
diff --git a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
index 2c7f85a4854f..1c8cb4ee24df 100644
--- a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 
 #include <ydb/core/kqp/counters/kqp_counters.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
 
 #include <util/random/random.h>
 
diff --git a/ydb/core/load_test/aggregated_result.cpp b/ydb/core/load_test/aggregated_result.cpp
index 652a72241289..82ae3dee3e68 100644
--- a/ydb/core/load_test/aggregated_result.cpp
+++ b/ydb/core/load_test/aggregated_result.cpp
@@ -5,6 +5,8 @@
 #include <util/generic/xrange.h>
 #include <util/string/cast.h>
 
+#include <ydb/library/mkql_proto/protos/minikql.pb.h>
+
 namespace NKikimr {
 
 IOutputStream& operator<<(IOutputStream& output, const TAggregatedStats& stats) {
diff --git a/ydb/core/load_test/kqp.cpp b/ydb/core/load_test/kqp.cpp
index d7f9be86bd06..f93b6b8e37bc 100644
--- a/ydb/core/load_test/kqp.cpp
+++ b/ydb/core/load_test/kqp.cpp
@@ -3,6 +3,7 @@
 #include <ydb/core/base/counters.h>
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
 #include <ydb/core/kqp/common/kqp.h>
+#include <ydb/core/protos/kqp_stats.pb.h>
 
 #include <ydb/library/workload/workload_factory.h>
 #include <ydb/library/workload/stock_workload.h>
diff --git a/ydb/core/load_test/ycsb/bulk_mkql_upsert.cpp b/ydb/core/load_test/ycsb/bulk_mkql_upsert.cpp
index 0ad90398e399..0dd663aaa15f 100644
--- a/ydb/core/load_test/ycsb/bulk_mkql_upsert.cpp
+++ b/ydb/core/load_test/ycsb/bulk_mkql_upsert.cpp
@@ -3,6 +3,7 @@
 
 #include <ydb/core/base/tablet.h>
 #include <ydb/core/base/tablet_pipe.h>
+#include <ydb/core/protos/tx_proxy.pb.h>
 
 #include <library/cpp/monlib/service/pages/templates.h>
 
diff --git a/ydb/core/load_test/ycsb/common.cpp b/ydb/core/load_test/ycsb/common.cpp
index bdb1cfccadbd..f58f362b760d 100644
--- a/ydb/core/load_test/ycsb/common.cpp
+++ b/ydb/core/load_test/ycsb/common.cpp
@@ -3,6 +3,7 @@
 
 #include <ydb/core/base/tablet.h>
 #include <ydb/core/base/tablet_pipe.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <library/cpp/monlib/service/pages/templates.h>
 
diff --git a/ydb/core/mind/address_classification/net_classifier.cpp b/ydb/core/mind/address_classification/net_classifier.cpp
index de52c1bad616..2a227c47747b 100644
--- a/ydb/core/mind/address_classification/net_classifier.cpp
+++ b/ydb/core/mind/address_classification/net_classifier.cpp
@@ -8,6 +8,7 @@
 #include <ydb/core/cms/console/console.h>
 #include <ydb/core/cms/console/net_classifier_updater.h>
 #include <ydb/core/mon/mon.h>
+#include <ydb/core/protos/netclassifier.pb.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 
diff --git a/ydb/core/mind/bscontroller/config.h b/ydb/core/mind/bscontroller/config.h
index bfa0f9e6bfdd..b9f7a0ce89b5 100644
--- a/ydb/core/mind/bscontroller/config.h
+++ b/ydb/core/mind/bscontroller/config.h
@@ -4,6 +4,8 @@
 #include "error.h"
 #include "impl.h"
 
+#include <ydb/core/protos/blob_depot_config.pb.h>
+
 namespace NKikimr {
     namespace NBsController {
 
diff --git a/ydb/core/mind/hive/follower_group.h b/ydb/core/mind/hive/follower_group.h
index 328cfb4a6e75..1e6c4980190d 100644
--- a/ydb/core/mind/hive/follower_group.h
+++ b/ydb/core/mind/hive/follower_group.h
@@ -2,6 +2,7 @@
 
 #include "hive.h"
 #include <ydb/core/protos/hive.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
 #include <ydb/core/base/location.h>
 
 namespace NKikimr {
diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp
index 58367a60403f..f03874cd8650 100644
--- a/ydb/core/mind/hive/hive_ut.cpp
+++ b/ydb/core/mind/hive/hive_ut.cpp
@@ -9,6 +9,7 @@
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.h>
 #include <ydb/core/protos/counters_hive.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
 #include <ydb/core/mind/bscontroller/bsc.h>
 #include <ydb/core/mind/tenant_pool.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
diff --git a/ydb/core/mind/hive/leader_tablet_info.h b/ydb/core/mind/hive/leader_tablet_info.h
index fee394c9dc5d..e7bb91ae5ad9 100644
--- a/ydb/core/mind/hive/leader_tablet_info.h
+++ b/ydb/core/mind/hive/leader_tablet_info.h
@@ -4,6 +4,7 @@
 #include "tablet_info.h"
 #include "follower_tablet_info.h"
 #include <ydb/core/base/channel_profiles.h>
+#include <ydb/core/protos/blobstorage.pb.h>
 
 namespace NKikimr {
 namespace NHive {
diff --git a/ydb/core/node_whiteboard/node_whiteboard.h b/ydb/core/node_whiteboard/node_whiteboard.h
index 809a6c0f762e..ddab1853a362 100644
--- a/ydb/core/node_whiteboard/node_whiteboard.h
+++ b/ydb/core/node_whiteboard/node_whiteboard.h
@@ -7,6 +7,7 @@
 #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h>
 #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter.h>
 #include <ydb/core/protos/node_whiteboard.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
 #include <ydb/library/actors/interconnect/events_local.h>
 #include <ydb/library/actors/core/interconnect.h>
 #include <ydb/core/base/tracing.h>
diff --git a/ydb/core/persqueue/cluster_tracker.cpp b/ydb/core/persqueue/cluster_tracker.cpp
index d6c717f8854e..4b1d757b1fca 100644
--- a/ydb/core/persqueue/cluster_tracker.cpp
+++ b/ydb/core/persqueue/cluster_tracker.cpp
@@ -3,6 +3,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/kqp/common/kqp.h>
+#include <ydb/library/mkql_proto/protos/minikql.pb.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 
diff --git a/ydb/core/persqueue/config/config.cpp b/ydb/core/persqueue/config/config.cpp
index 04d93dbfb201..255f7a78665d 100644
--- a/ydb/core/persqueue/config/config.cpp
+++ b/ydb/core/persqueue/config/config.cpp
@@ -1,6 +1,8 @@
 #include "config.h"
 #include <util/generic/hash_set.h>
 #include <util/string/printf.h>
+#include <ydb/core/protos/pqconfig.pb.h>
+
 namespace NKikimr {
 
 bool CheckPersQueueConfig(const NKikimrPQ::TPQTabletConfig& config, const bool shouldHavePartitionsList, TString *error) {
diff --git a/ydb/core/persqueue/events/global.h b/ydb/core/persqueue/events/global.h
index 5054fe4e4d30..c00a485f721b 100644
--- a/ydb/core/persqueue/events/global.h
+++ b/ydb/core/persqueue/events/global.h
@@ -6,6 +6,7 @@
 #include <ydb/library/actors/core/actorid.h>
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/protos/msgbus.pb.h>
+#include <ydb/core/protos/msgbus_pq.pb.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/public/api/protos/draft/persqueue_common.pb.h>
 
diff --git a/ydb/core/persqueue/transaction.h b/ydb/core/persqueue/transaction.h
index b964df24fd49..dc42fd9f7e8f 100644
--- a/ydb/core/persqueue/transaction.h
+++ b/ydb/core/persqueue/transaction.h
@@ -2,6 +2,7 @@
 
 #include <ydb/core/persqueue/events/internal.h>
 #include <ydb/core/protos/pqconfig.pb.h>
+#include <ydb/core/protos/msgbus_kv.pb.h>
 #include <ydb/core/protos/tx.pb.h>
 #include <ydb/core/tx/tx_processing.h>
 
diff --git a/ydb/core/persqueue/ut/common/pq_ut_common.h b/ydb/core/persqueue/ut/common/pq_ut_common.h
index 301e836a1f47..f3e90c12d092 100644
--- a/ydb/core/persqueue/ut/common/pq_ut_common.h
+++ b/ydb/core/persqueue/ut/common/pq_ut_common.h
@@ -6,6 +6,7 @@
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/testlib/basics/runtime.h>
 #include <ydb/core/testlib/tablet_helpers.h>
+#include <ydb/core/protos/msgbus_kv.pb.h>
 
 
 const bool ENABLE_DETAILED_PQ_LOG = false;
diff --git a/ydb/core/persqueue/writer/common.h b/ydb/core/persqueue/writer/common.h
index 2d5a67c71faf..493776901884 100644
--- a/ydb/core/persqueue/writer/common.h
+++ b/ydb/core/persqueue/writer/common.h
@@ -3,6 +3,7 @@
 #include <ydb/core/base/defs.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/core/protos/msgbus_pq.pb.h>
+#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h>
 
 #include <ydb/public/lib/base/msgbus_status.h>
 
diff --git a/ydb/core/protos/out/out.cpp b/ydb/core/protos/out/out.cpp
index 00163dd6f83c..7ce23aba55db 100644
--- a/ydb/core/protos/out/out.cpp
+++ b/ydb/core/protos/out/out.cpp
@@ -9,6 +9,20 @@
 #include <ydb/core/protos/resource_broker.pb.h>
 #include <ydb/core/protos/tenant_pool.pb.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
+#include <ydb/core/protos/blobstorage_base.pb.h>
+#include <ydb/core/protos/base.pb.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
+#include <ydb/core/protos/blobstorage_base3.pb.h>
+#include <ydb/core/protos/node_broker.pb.h>
+#include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/tx_datashard.pb.h>
+#include <ydb/core/protos/blobstorage_disk.pb.h>
+#include <ydb/core/protos/blobstorage_disk_color.pb.h>
+#include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/node_whiteboard.pb.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
+#include <ydb/core/protos/data_events.pb.h>
 
 #include <util/stream/output.h>
 
diff --git a/ydb/core/protos/ya.make b/ydb/core/protos/ya.make
index 8c5e3dd9fc52..7eb2b832a82c 100644
--- a/ydb/core/protos/ya.make
+++ b/ydb/core/protos/ya.make
@@ -1,5 +1,7 @@
 PROTO_LIBRARY()
 
+SET(PROTOC_TRANSITIVE_HEADERS "no")
+
 GRPC()
 
 IF (OS_WINDOWS)
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp b/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp
index 7a4ba93dd6c1..1a5c4371cbf5 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp
@@ -5,6 +5,9 @@
 
 #include <ydb/core/kesus/tablet/events.h>
 
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+
 namespace NKikimr {
 
 TTestServer::TTestServer(const TOptions &opts)
diff --git a/ydb/core/quoter/quoter_service_ut.cpp b/ydb/core/quoter/quoter_service_ut.cpp
index 46772dedd667..696dfc03ee94 100644
--- a/ydb/core/quoter/quoter_service_ut.cpp
+++ b/ydb/core/quoter/quoter_service_ut.cpp
@@ -5,6 +5,9 @@
 #include <ydb/core/testlib/basics/helpers.h>
 #include <ydb/core/testlib/tablet_helpers.h>
 #include <ydb/core/testlib/test_client.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/security/ldap_auth_provider.h b/ydb/core/security/ldap_auth_provider.h
index e241e4fee3ea..e8dfedb0c4ad 100644
--- a/ydb/core/security/ldap_auth_provider.h
+++ b/ydb/core/security/ldap_auth_provider.h
@@ -2,6 +2,7 @@
 #include <ydb/core/base/defs.h>
 #include <ydb/core/base/events.h>
 #include <ydb/core/base/ticket_parser.h>
+#include <ydb/core/protos/auth.pb.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/statistics/aggregator/aggregator_impl.cpp b/ydb/core/statistics/aggregator/aggregator_impl.cpp
index 755eda40399b..ceeffc2cf654 100644
--- a/ydb/core/statistics/aggregator/aggregator_impl.cpp
+++ b/ydb/core/statistics/aggregator/aggregator_impl.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/engine/minikql/flat_local_tx_factory.h>
 #include <ydb/core/statistics/stat_service.h>
+#include <ydb/core/protos/feature_flags.pb.h>
 
 #include <library/cpp/monlib/service/pages/templates.h>
 
diff --git a/ydb/core/sys_view/common/db_counters.h b/ydb/core/sys_view/common/db_counters.h
index afd0e4386c8c..593d9d23779d 100644
--- a/ydb/core/sys_view/common/db_counters.h
+++ b/ydb/core/sys_view/common/db_counters.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <ydb/core/protos/sys_view.pb.h>
+#include <ydb/core/protos/tablet.pb.h>
+#include <ydb/core/protos/labeled_counters.pb.h>
 
 #include <util/generic/hash.h>
 
diff --git a/ydb/core/sys_view/common/events.h b/ydb/core/sys_view/common/events.h
index 7ea5cbb056bf..740b5689a6c8 100644
--- a/ydb/core/sys_view/common/events.h
+++ b/ydb/core/sys_view/common/events.h
@@ -7,6 +7,7 @@
 #include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/library/actors/core/events.h>
 #include <ydb/core/protos/sys_view.pb.h>
+#include <ydb/core/protos/tablet.pb.h>
 
 namespace NKikimr {
 namespace NSysView {
diff --git a/ydb/core/tablet_flat/flat_dbase_scheme.cpp b/ydb/core/tablet_flat/flat_dbase_scheme.cpp
index 94e22eb9f155..548bdf988489 100644
--- a/ydb/core/tablet_flat/flat_dbase_scheme.cpp
+++ b/ydb/core/tablet_flat/flat_dbase_scheme.cpp
@@ -1,5 +1,7 @@
 #include "flat_dbase_scheme.h"
 
+#include <ydb/core/scheme/protos/type_info.pb.h>
+
 namespace NKikimr {
 namespace NTable {
 
diff --git a/ydb/core/testlib/actors/test_runtime.h b/ydb/core/testlib/actors/test_runtime.h
index e43e636a4bf9..0c1cdd127b2f 100644
--- a/ydb/core/testlib/actors/test_runtime.h
+++ b/ydb/core/testlib/actors/test_runtime.h
@@ -3,6 +3,7 @@
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/mon/mon.h>
 #include <ydb/core/base/memobserver.h>
+#include <ydb/core/protos/shared_cache.pb.h>
 
 #include <ydb/library/actors/testlib/test_runtime.h>
 #include <library/cpp/testing/unittest/tests_data.h>
diff --git a/ydb/core/testlib/basics/appdata.h b/ydb/core/testlib/basics/appdata.h
index 5f65f941dbdf..82d356c5573e 100644
--- a/ydb/core/testlib/basics/appdata.h
+++ b/ydb/core/testlib/basics/appdata.h
@@ -10,6 +10,11 @@
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/tx/datashard/export_iface.h>
 #include <ydb/core/tx/datashard/export_s3.h>
+#include <ydb/core/protos/blobstorage.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
+#include <ydb/core/protos/kqp.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
+#include <ydb/core/protos/pqconfig.pb.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/testlib/cs_helper.cpp b/ydb/core/testlib/cs_helper.cpp
index 4853290f8637..8545bec37722 100644
--- a/ydb/core/testlib/cs_helper.cpp
+++ b/ydb/core/testlib/cs_helper.cpp
@@ -5,6 +5,7 @@
 #include <ydb/library/binary_json/write.h>
 
 #include <ydb/library/actors/core/event.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/buffer.h>
diff --git a/ydb/core/testlib/test_client.h b/ydb/core/testlib/test_client.h
index cc8feb752abb..7e187c729c19 100644
--- a/ydb/core/testlib/test_client.h
+++ b/ydb/core/testlib/test_client.h
@@ -21,6 +21,7 @@
 #include <ydb/core/testlib/basics/runtime.h>
 #include <ydb/core/testlib/basics/appdata.h>
 #include <ydb/core/protos/kesus.pb.h>
+#include <ydb/core/protos/table_service_config.pb.h>
 #include <ydb/core/kesus/tablet/events.h>
 #include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <ydb/core/security/ticket_parser.h>
diff --git a/ydb/core/testlib/test_pq_client.h b/ydb/core/testlib/test_pq_client.h
index d2fcfe117d47..d56a1f6fd0ec 100644
--- a/ydb/core/testlib/test_pq_client.h
+++ b/ydb/core/testlib/test_pq_client.h
@@ -5,6 +5,7 @@
 #include <ydb/core/persqueue/cluster_tracker.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 #include <ydb/core/mind/address_classification/net_classifier.h>
+#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h>
 #include <ydb/public/lib/deprecated/kicli/kicli.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
diff --git a/ydb/core/tx/columnshard/columnshard.cpp b/ydb/core/tx/columnshard/columnshard.cpp
index 7af0a0e384ed..c7dfeebdaba1 100644
--- a/ydb/core/tx/columnshard/columnshard.cpp
+++ b/ydb/core/tx/columnshard/columnshard.cpp
@@ -4,6 +4,8 @@
 #include "resource_subscriber/actor.h"
 #include "engines/writer/buffer/actor.h"
 
+#include <ydb/core/protos/table_stats.pb.h>
+
 namespace NKikimr {
 
 IActor* CreateColumnShard(const TActorId& tablet, TTabletStorageInfo* info) {
diff --git a/ydb/core/tx/columnshard/columnshard.h b/ydb/core/tx/columnshard/columnshard.h
index 5e5e6f10a000..7fd8410cd3d3 100644
--- a/ydb/core/tx/columnshard/columnshard.h
+++ b/ydb/core/tx/columnshard/columnshard.h
@@ -5,6 +5,7 @@
 #include <ydb/core/tx/tx.h>
 #include <ydb/core/tx/message_seqno.h>
 #include <ydb/core/protos/tx_columnshard.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 #include <ydb/core/tx/data_events/write_data.h>
 
 #include <ydb/core/tx/long_tx_service/public/types.h>
diff --git a/ydb/core/tx/columnshard/common/scalars.cpp b/ydb/core/tx/columnshard/common/scalars.cpp
index d614253e9ec1..ae575064d909 100644
--- a/ydb/core/tx/columnshard/common/scalars.cpp
+++ b/ydb/core/tx/columnshard/common/scalars.cpp
@@ -1,6 +1,7 @@
 #include "scalars.h"
 
 #include <ydb/core/formats/arrow/switch_type.h>
+#include <ydb/core/protos/ssa.pb.h>
 #include <ydb/library/yverify_stream/yverify_stream.h>
 #include <util/system/unaligned_mem.h>
 
diff --git a/ydb/core/tx/coordinator/public/events.cpp b/ydb/core/tx/coordinator/public/events.cpp
index 994cfa21e0ba..f625cb211041 100644
--- a/ydb/core/tx/coordinator/public/events.cpp
+++ b/ydb/core/tx/coordinator/public/events.cpp
@@ -1,5 +1,7 @@
 #include "events.h"
 
+#include <ydb/core/protos/base.pb.h>
+
 namespace NKikimr {
 
 TEvTxCoordinator::TEvCoordinatorStep::TEvCoordinatorStep(ui64 step, ui64 prevStep, ui64 mediatorId, ui64 coordinatorId, ui64 activeGeneration)
diff --git a/ydb/core/tx/data_events/events.h b/ydb/core/tx/data_events/events.h
index 81e685bbd17d..b57a2587945e 100644
--- a/ydb/core/tx/data_events/events.h
+++ b/ydb/core/tx/data_events/events.h
@@ -5,6 +5,7 @@
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/protos/data_events.pb.h>
 #include <ydb/core/base/events.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 
 #include <ydb/library/accessor/accessor.h>
 #include <ydb/library/actors/core/event_pb.h>
diff --git a/ydb/core/tx/datashard/change_record_cdc_serializer.cpp b/ydb/core/tx/datashard/change_record_cdc_serializer.cpp
index fb6f60833a40..5debdee9c0c5 100644
--- a/ydb/core/tx/datashard/change_record_cdc_serializer.cpp
+++ b/ydb/core/tx/datashard/change_record_cdc_serializer.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/protos/change_exchange.pb.h>
 #include <ydb/core/protos/grpc_pq_old.pb.h>
 #include <ydb/core/protos/msgbus_pq.pb.h>
+#include <ydb/core/protos/pqconfig.pb.h>
 #include <ydb/library/binary_json/read.h>
 #include <ydb/library/yverify_stream/yverify_stream.h>
 
diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp
index 3155d85a8459..9bd3e5b42782 100644
--- a/ydb/core/tx/datashard/datashard.cpp
+++ b/ydb/core/tx/datashard/datashard.cpp
@@ -9,6 +9,7 @@
 #include <ydb/core/tablet/tablet_counters_protobuf.h>
 #include <ydb/core/tx/long_tx_service/public/events.h>
 #include <ydb/core/protos/datashard_config.pb.h>
+#include <ydb/core/protos/query_stats.pb.h>
 
 #include <ydb/library/actors/core/monotonic_provider.h>
 #include <library/cpp/monlib/service/pages/templates.h>
diff --git a/ydb/core/tx/datashard/datashard_impl.h b/ydb/core/tx/datashard/datashard_impl.h
index 5e5329c67418..2002e4ae19e0 100644
--- a/ydb/core/tx/datashard/datashard_impl.h
+++ b/ydb/core/tx/datashard/datashard_impl.h
@@ -49,6 +49,7 @@
 #include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/protos/subdomains.pb.h>
 #include <ydb/core/protos/counters_datashard.pb.h>
+#include <ydb/core/protos/table_stats.pb.h>
 
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
diff --git a/ydb/core/tx/datashard/datashard_kqp.cpp b/ydb/core/tx/datashard/datashard_kqp.cpp
index 1ac9a6d20332..332e5cce8988 100644
--- a/ydb/core/tx/datashard/datashard_kqp.cpp
+++ b/ydb/core/tx/datashard/datashard_kqp.cpp
@@ -9,6 +9,8 @@
 #include <ydb/core/tx/locks/locks.h>
 #include <ydb/core/tx/datashard/datashard_user_table.h>
 #include <ydb/core/tx/datashard/range_ops.h>
+#include <ydb/core/protos/query_stats.pb.h>
+#include <ydb/core/protos/kqp_stats.pb.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
 #include <ydb/library/yql/dq/runtime/dq_transport.h>
diff --git a/ydb/core/tx/datashard/datashard_pipeline.cpp b/ydb/core/tx/datashard/datashard_pipeline.cpp
index 72878116fce8..a0d77715ab7e 100644
--- a/ydb/core/tx/datashard/datashard_pipeline.cpp
+++ b/ydb/core/tx/datashard/datashard_pipeline.cpp
@@ -9,6 +9,7 @@
 #include <ydb/core/base/cputime.h>
 #include <ydb/core/base/feature_flags.h>
 #include <ydb/core/tx/balance_coverage/balance_coverage_builder.h>
+#include <ydb/core/protos/kqp.pb.h>
 
 namespace NKikimr {
 namespace NDataShard {
diff --git a/ydb/core/tx/datashard/erase_rows_condition.cpp b/ydb/core/tx/datashard/erase_rows_condition.cpp
index 8131531b8c79..4d895e02ff81 100644
--- a/ydb/core/tx/datashard/erase_rows_condition.cpp
+++ b/ydb/core/tx/datashard/erase_rows_condition.cpp
@@ -3,6 +3,7 @@
 #include <ydb/library/dynumber/dynumber.h>
 
 #include <ydb/library/actors/core/log.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
 
 #include <util/datetime/base.h>
 #include <util/string/cast.h>
diff --git a/ydb/core/tx/datashard/export_common.h b/ydb/core/tx/datashard/export_common.h
index 631e8c71e1b9..aeabf182daba 100644
--- a/ydb/core/tx/datashard/export_common.h
+++ b/ydb/core/tx/datashard/export_common.h
@@ -3,6 +3,7 @@
 #include "datashard_user_table.h"
 
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
 #include <ydb/library/actors/core/log.h>
 
 #include <util/generic/map.h>
diff --git a/ydb/core/tx/datashard/extstorage_usage_config.h b/ydb/core/tx/datashard/extstorage_usage_config.h
index 0beeb43b8331..14efb7d2dece 100644
--- a/ydb/core/tx/datashard/extstorage_usage_config.h
+++ b/ydb/core/tx/datashard/extstorage_usage_config.h
@@ -6,6 +6,7 @@
 
 #include <ydb/core/base/events.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/StorageClass.h>
 #include <util/string/printf.h>
diff --git a/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp b/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
index da574f540ed8..a172650f5198 100644
--- a/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
+++ b/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
@@ -14,6 +14,7 @@
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/tx/tx_proxy/upload_rows.h>
 #include <ydb/core/tx/schemeshard/schemeshard_build_index.h>
+#include <ydb/core/protos/follower_group.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_result/result.h>
 
 #include <ydb/library/yql/minikql/mkql_node_serialization.h>
diff --git a/ydb/core/tx/long_tx_service/public/events.h b/ydb/core/tx/long_tx_service/public/events.h
index 529e723c8d9b..8bd7018cea7e 100644
--- a/ydb/core/tx/long_tx_service/public/events.h
+++ b/ydb/core/tx/long_tx_service/public/events.h
@@ -5,6 +5,7 @@
 #include <ydb/core/protos/long_tx_service.pb.h>
 
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <library/cpp/lwtrace/shuttle.h>
 
diff --git a/ydb/core/tx/scheme_board/events.h b/ydb/core/tx/scheme_board/events.h
index 8e686e8b92d3..4e4df3fba576 100644
--- a/ydb/core/tx/scheme_board/events.h
+++ b/ydb/core/tx/scheme_board/events.h
@@ -8,6 +8,7 @@
 #include <ydb/core/base/statestorage.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 #include <ydb/core/protos/scheme_board.pb.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
 
 #include <util/generic/string.h>
 #include <util/string/builder.h>
diff --git a/ydb/core/tx/scheme_board/helpers.cpp b/ydb/core/tx/scheme_board/helpers.cpp
index 7505f1c39f28..0337aa7fd824 100644
--- a/ydb/core/tx/scheme_board/helpers.cpp
+++ b/ydb/core/tx/scheme_board/helpers.cpp
@@ -8,6 +8,8 @@
 #include <ydb/library/actors/core/interconnect.h>
 
 #include <util/stream/format.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
 
 namespace NKikimr {
 namespace NSchemeBoard {
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp
index 4b0fa726cffb..72a419c96f0c 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp
@@ -2,6 +2,8 @@
 #include "schemeshard__operation_common.h"
 #include "schemeshard_impl.h"
 
+#include <ydb/core/protos/blob_depot_config.pb.h>
+
 namespace NKikimr::NSchemeShard {
 
     namespace {
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp
index 265c11c0140c..aa0bbc3cf745 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp
@@ -3,6 +3,7 @@
 #include "schemeshard_impl.h"
 
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
 
 #include <ydb/core/base/subdomain.h>
 
diff --git a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
index 12c04ccfe53f..c23085099962 100644
--- a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
@@ -2,6 +2,8 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
+#include <ydb/core/protos/index_builder.pb.h>
 #include <ydb/library/aclib/aclib.h>
 
 #include <util/string/builder.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_export.cpp b/ydb/core/tx/schemeshard/schemeshard_export.cpp
index e0bc7c099fb4..5906c188caa9 100644
--- a/ydb/core/tx/schemeshard/schemeshard_export.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_export.cpp
@@ -3,6 +3,8 @@
 #include "schemeshard_impl.h"
 
 #include <util/generic/xrange.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
+#include <ydb/public/api/protos/ydb_import.pb.h>
 
 namespace NKikimr {
 namespace NSchemeShard {
diff --git a/ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp b/ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp
index c4514bec9002..e80f3b09f958 100644
--- a/ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp
@@ -2,6 +2,7 @@
 #include "schemeshard_path_describer.h"
 
 #include <ydb/core/ydb_convert/compression.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 
 #include <util/string/builder.h>
 #include <util/string/cast.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_info_types.h b/ydb/core/tx/schemeshard/schemeshard_info_types.h
index d0c0e7a604f6..eebde411050e 100644
--- a/ydb/core/tx/schemeshard/schemeshard_info_types.h
+++ b/ydb/core/tx/schemeshard/schemeshard_info_types.h
@@ -27,6 +27,14 @@
 #include <ydb/library/login/protos/login.pb.h>
 
 #include <ydb/public/api/protos/ydb_import.pb.h>
+#include <ydb/core/protos/blockstore_config.pb.h>
+#include <ydb/core/protos/filestore_config.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/public/api/protos/ydb_cms.pb.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
+#include <ydb/core/protos/index_builder.pb.h>
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
+
 #include <ydb/public/lib/scheme_types/scheme_type_id.h>
 
 #include <google/protobuf/util/message_differencer.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_schema.h b/ydb/core/tx/schemeshard/schemeshard_schema.h
index 8f6c4ef6281b..225d36d50fde 100644
--- a/ydb/core/tx/schemeshard/schemeshard_schema.h
+++ b/ydb/core/tx/schemeshard/schemeshard_schema.h
@@ -5,6 +5,8 @@
 #include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/protos/tx.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/library/login/protos/login.pb.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 
 namespace NKikimr::NSchemeShard {
diff --git a/ydb/core/tx/schemeshard/schemeshard_utils.h b/ydb/core/tx/schemeshard/schemeshard_utils.h
index cde1d06c4caa..c4a4d1dcf244 100644
--- a/ydb/core/tx/schemeshard/schemeshard_utils.h
+++ b/ydb/core/tx/schemeshard/schemeshard_utils.h
@@ -7,6 +7,7 @@
 #include <ydb/core/tablet/tablet_counters.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/base/table_index.h>
+#include <ydb/core/protos/table_stats.pb.h>
 
 #include <ydb/public/lib/scheme_types/scheme_type_id.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/ut_bsvolume_reboots.cpp b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/ut_bsvolume_reboots.cpp
index 61da93434719..bc48cf17a2b9 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/ut_bsvolume_reboots.cpp
+++ b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/ut_bsvolume_reboots.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/blockstore_config.pb.h>
 
 #include <google/protobuf/text_format.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_export/ut_export.cpp b/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
index 67b7c2c204ce..823a6a421668 100644
--- a/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
+++ b/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/wrappers/ut_helpers/s3_mock.h>
 #include <ydb/core/wrappers/s3_wrapper.h>
 #include <ydb/core/metering/metering.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 
 #include <util/string/builder.h>
 #include <util/string/cast.h>
diff --git a/ydb/core/tx/schemeshard/ut_filestore_reboots/ut_filestore_reboots.cpp b/ydb/core/tx/schemeshard/ut_filestore_reboots/ut_filestore_reboots.cpp
index 6f35d6010851..037ffa747954 100644
--- a/ydb/core/tx/schemeshard/ut_filestore_reboots/ut_filestore_reboots.cpp
+++ b/ydb/core/tx/schemeshard/ut_filestore_reboots/ut_filestore_reboots.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/filestore_config.pb.h>
 
 #include <google/protobuf/text_format.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_helpers/export_reboots_common.cpp b/ydb/core/tx/schemeshard/ut_helpers/export_reboots_common.cpp
index a2d876fd0537..568e9e5749ed 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/export_reboots_common.cpp
+++ b/ydb/core/tx/schemeshard/ut_helpers/export_reboots_common.cpp
@@ -2,6 +2,10 @@
 
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/core/protos/msgbus_kv.pb.h>
+
 namespace NSchemeShardUT_Private {
 namespace NExportReboots {
 
diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
index 5a32528e961d..d8bfa0c69d92 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
+++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
@@ -14,6 +14,7 @@
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 
 #include <ydb/core/util/pb.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp
index 90cc00f16cd8..bf629f216bdd 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp
+++ b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp
@@ -5,6 +5,11 @@
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 #include <ydb/public/lib/scheme_types/scheme_type_id.h>
+#include <ydb/public/api/protos/ydb_cms.pb.h>
+#include <ydb/core/protos/pqconfig.pb.h>
+#include <ydb/core/protos/blockstore_config.pb.h>
+#include <ydb/core/protos/bind_channel_storage_pool.pb.h>
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
index 0c0731558042..efac13ab13f8 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
+++ b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
@@ -4,6 +4,9 @@
 
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/scheme/scheme_pathid.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
 
 #include <functional>
 
diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.h b/ydb/core/tx/schemeshard/ut_helpers/test_env.h
index da9b4de410e0..e7634bc74a24 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/test_env.h
+++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.h
@@ -9,6 +9,10 @@
 #include <ydb/core/tx/schemeshard/schemeshard_export.h>
 #include <ydb/core/tx/schemeshard/schemeshard_identificators.h>
 #include <ydb/core/tx/schemeshard/schemeshard_import.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/msgbus_kv.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_stats/ut_stats.cpp b/ydb/core/tx/schemeshard/ut_stats/ut_stats.cpp
index f434336aea67..1061a523840a 100644
--- a/ydb/core/tx/schemeshard/ut_stats/ut_stats.cpp
+++ b/ydb/core/tx/schemeshard/ut_stats/ut_stats.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/cms/console/console.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/datashard/datashard.h>
+#include <ydb/core/protos/table_stats.pb.h>
 
 using namespace NKikimr;
 using namespace NSchemeShardUT_Private;
diff --git a/ydb/core/tx/schemeshard/ut_subdomain/ut_subdomain.cpp b/ydb/core/tx/schemeshard/ut_subdomain/ut_subdomain.cpp
index 2bb6fae3d30a..25f3048c29da 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain/ut_subdomain.cpp
+++ b/ydb/core/tx/schemeshard/ut_subdomain/ut_subdomain.cpp
@@ -2,6 +2,8 @@
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/persqueue/events/internal.h>
 
+#include <ydb/core/protos/blockstore_config.pb.h>
+
 using namespace NKikimr;
 using namespace NSchemeShard;
 using namespace NSchemeShardUT_Private;
diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_impl.h b/ydb/core/tx/sequenceproxy/sequenceproxy_impl.h
index 65e9f8993c83..6868a82d2b28 100644
--- a/ydb/core/tx/sequenceproxy/sequenceproxy_impl.h
+++ b/ydb/core/tx/sequenceproxy/sequenceproxy_impl.h
@@ -6,6 +6,7 @@
 #include <ydb/core/tx/sequenceproxy/public/events.h>
 
 #include <ydb/core/base/counters.h>
+#include <ydb/library/services/services.pb.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/hfunc.h>
diff --git a/ydb/core/tx/sequenceshard/sequenceshard_impl.h b/ydb/core/tx/sequenceshard/sequenceshard_impl.h
index c1da07235f53..0a36fee2b17b 100644
--- a/ydb/core/tx/sequenceshard/sequenceshard_impl.h
+++ b/ydb/core/tx/sequenceshard/sequenceshard_impl.h
@@ -7,6 +7,7 @@
 #include <ydb/core/base/tablet_pipe.h>
 
 #include <ydb/core/protos/counters_sequenceshard.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
 
 #include <ydb/core/tablet/tablet_counters_aggregator.h>
 #include <ydb/core/tablet/tablet_counters_protobuf.h>
diff --git a/ydb/core/tx/tx_proxy/datareq.cpp b/ydb/core/tx/tx_proxy/datareq.cpp
index d5c66d3f6ab4..cfa4e1f100d5 100644
--- a/ydb/core/tx/tx_proxy/datareq.cpp
+++ b/ydb/core/tx/tx_proxy/datareq.cpp
@@ -17,6 +17,7 @@
 #include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/core/base/tx_processing.h>
 #include <ydb/library/mkql_proto/protos/minikql.pb.h>
+#include <ydb/core/protos/query_stats.pb.h>
 #include <ydb/core/engine/mkql_engine_flat.h>
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_defs.h>
diff --git a/ydb/core/tx/tx_proxy/describe.cpp b/ydb/core/tx/tx_proxy/describe.cpp
index aed5e9c91d8c..249effaa7fd8 100644
--- a/ydb/core/tx/tx_proxy/describe.cpp
+++ b/ydb/core/tx/tx_proxy/describe.cpp
@@ -8,6 +8,7 @@
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/feature_flags.h>
 #include <ydb/core/sys_view/common/schema.h>
+#include <ydb/core/protos/table_stats.pb.h>
 
 #include <ydb/library/aclib/aclib.h>
 
diff --git a/ydb/core/tx/tx_proxy/schemereq.cpp b/ydb/core/tx/tx_proxy/schemereq.cpp
index b3fafc13a948..a531de22d260 100644
--- a/ydb/core/tx/tx_proxy/schemereq.cpp
+++ b/ydb/core/tx/tx_proxy/schemereq.cpp
@@ -3,6 +3,7 @@
 #include <ydb/core/docapi/traits.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/tx_processing.h>
diff --git a/ydb/core/util/address_classifier.h b/ydb/core/util/address_classifier.h
index f5e25cd3e435..ecdd16af759a 100644
--- a/ydb/core/util/address_classifier.h
+++ b/ydb/core/util/address_classifier.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ydb/core/protos/netclassifier.pb.h>
+
 #include <library/cpp/ipmath/range_set.h>
 
 #include <util/generic/hash.h>
diff --git a/ydb/core/util/testactorsys.h b/ydb/core/util/testactorsys.h
index 147a04a950eb..7eb431905593 100644
--- a/ydb/core/util/testactorsys.h
+++ b/ydb/core/util/testactorsys.h
@@ -15,6 +15,9 @@
 #include <ydb/core/base/tablet_pipe.h>
 #include <util/system/env.h>
 #include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/netclassifier.pb.h>
+#include <ydb/core/protos/datashard_config.pb.h>
+#include <ydb/core/protos/shared_cache.pb.h>
 
 #include "single_thread_ic_mock.h"
 
diff --git a/ydb/core/viewer/browse_db.h b/ydb/core/viewer/browse_db.h
index 3af5491e3d22..f060baa72b68 100644
--- a/ydb/core/viewer/browse_db.h
+++ b/ydb/core/viewer/browse_db.h
@@ -4,6 +4,7 @@
 #include <ydb/core/base/tablet.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/library/services/services.pb.h>
+#include <ydb/core/protos/table_stats.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/viewer/protos/viewer.pb.h>
diff --git a/ydb/core/wrappers/s3_storage_config.h b/ydb/core/wrappers/s3_storage_config.h
index 6555e109b477..31067f4d3834 100644
--- a/ydb/core/wrappers/s3_storage_config.h
+++ b/ydb/core/wrappers/s3_storage_config.h
@@ -8,6 +8,7 @@
 #include <ydb/core/protos/flat_scheme_op.pb.h>
 #include <ydb/library/accessor/accessor.h>
 #include <ydb/public/api/protos/ydb_import.pb.h>
+#include <ydb/public/api/protos/ydb_export.pb.h>
 
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h>
 
diff --git a/ydb/core/ydb_convert/compression.h b/ydb/core/ydb_convert/compression.h
index 7cfd53abe07e..91d3cc563355 100644
--- a/ydb/core/ydb_convert/compression.h
+++ b/ydb/core/ydb_convert/compression.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/ydb_convert/table_description.cpp b/ydb/core/ydb_convert/table_description.cpp
index ad283f387571..d3296aea080c 100644
--- a/ydb/core/ydb_convert/table_description.cpp
+++ b/ydb/core/ydb_convert/table_description.cpp
@@ -9,6 +9,9 @@
 #include <ydb/library/ydb_issue/proto/issue_id.pb.h>
 #include <ydb/library/yql/public/issue/yql_issue.h>
 #include <ydb/core/scheme/scheme_pathid.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
+#include <ydb/core/protos/table_stats.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
 
 #include <util/generic/hash.h>
 
diff --git a/ydb/core/ydb_convert/table_description.h b/ydb/core/ydb_convert/table_description.h
index b3cd7d15a27c..a81401bee522 100644
--- a/ydb/core/ydb_convert/table_description.h
+++ b/ydb/core/ydb_convert/table_description.h
@@ -4,6 +4,7 @@
 
 #include <ydb/library/mkql_proto/protos/minikql.pb.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
+#include <ydb/core/protos/index_builder.pb.h>
 #include <ydb/core/scheme/scheme_type_info.h>
 #include <ydb/public/api/protos/ydb_table.pb.h>
 
diff --git a/ydb/core/ydb_convert/table_profiles.cpp b/ydb/core/ydb_convert/table_profiles.cpp
index e9ca019196a3..a5871b91e427 100644
--- a/ydb/core/ydb_convert/table_profiles.cpp
+++ b/ydb/core/ydb_convert/table_profiles.cpp
@@ -2,6 +2,7 @@
 #include "table_description.h"
 
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
 #include <ydb/core/base/feature_flags.h>
 #include <ydb/core/base/domain.h>
 
diff --git a/ydb/core/ydb_convert/table_settings.cpp b/ydb/core/ydb_convert/table_settings.cpp
index b209e834e8e1..f118da3732b5 100644
--- a/ydb/core/ydb_convert/table_settings.cpp
+++ b/ydb/core/ydb_convert/table_settings.cpp
@@ -2,6 +2,8 @@
 #include "table_settings.h"
 #include "column_families.h"
 
+#include <ydb/core/protos/follower_group.pb.h>
+
 #include <util/generic/list.h>
 #include <util/string/builder.h>
 
diff --git a/ydb/core/ydb_convert/tx_proxy_status.cpp b/ydb/core/ydb_convert/tx_proxy_status.cpp
index 83767aa6f305..523d78a46706 100644
--- a/ydb/core/ydb_convert/tx_proxy_status.cpp
+++ b/ydb/core/ydb_convert/tx_proxy_status.cpp
@@ -1,5 +1,7 @@
 #include "tx_proxy_status.h"
 
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
+
 namespace NKikimr {
 
 
@@ -72,4 +74,4 @@ Ydb::StatusIds::StatusCode YdbStatusFromProxyStatus(TEvTxUserProxy::TEvProposeTr
     return Ydb::StatusIds::INTERNAL_ERROR;
 }
 
-}  // namespace NKikimr
\ No newline at end of file
+}  // namespace NKikimr
diff --git a/ydb/core/ydb_convert/ydb_convert.cpp b/ydb/core/ydb_convert/ydb_convert.cpp
index f43a75cc272d..3c70b1565c74 100644
--- a/ydb/core/ydb_convert/ydb_convert.cpp
+++ b/ydb/core/ydb_convert/ydb_convert.cpp
@@ -3,6 +3,8 @@
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/library/ydb_issue/issue_helpers.h>
+#include <ydb/core/protos/table_stats.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_value/value.h>
 
diff --git a/ydb/core/ydb_convert/ydb_convert.h b/ydb/core/ydb_convert/ydb_convert.h
index 2d236e56e2a1..6f13c28055bb 100644
--- a/ydb/core/ydb_convert/ydb_convert.h
+++ b/ydb/core/ydb_convert/ydb_convert.h
@@ -7,6 +7,7 @@
 #include <ydb/public/api/protos/ydb_table.pb.h>
 #include <ydb/public/api/protos/ydb_value.pb.h>
 #include <ydb/public/api/protos/ydb_scheme.pb.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_value/value.h>
 
diff --git a/ydb/core/ymq/actor/auth_multi_factory.cpp b/ydb/core/ymq/actor/auth_multi_factory.cpp
index 24377276fb43..e812d45a5d8b 100644
--- a/ydb/core/ymq/actor/auth_multi_factory.cpp
+++ b/ydb/core/ymq/actor/auth_multi_factory.cpp
@@ -9,6 +9,7 @@
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/library/folder_service/events.h>
 #include <ydb/library/ycloud/api/access_service.h>
+#include <ydb/library/folder_service/proto/config.pb.h>
 
 #include <library/cpp/logger/global/global.h>
 
diff --git a/ydb/core/ymq/actor/events.h b/ydb/core/ymq/actor/events.h
index f8b1c2ca69a5..21097a2c7168 100644
--- a/ydb/core/ymq/actor/events.h
+++ b/ydb/core/ymq/actor/events.h
@@ -16,6 +16,8 @@
 #include <ydb/core/ymq/base/queue_path.h>
 #include <ydb/core/ymq/proto/events.pb.h>
 #include <ydb/core/ymq/proto/records.pb.h>
+#include <ydb/core/protos/http_config.pb.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 
 #include <ydb/library/actors/core/event_pb.h>
 #include <ydb/library/actors/core/event_local.h>
diff --git a/ydb/core/ymq/base/secure_protobuf_printer.cpp b/ydb/core/ymq/base/secure_protobuf_printer.cpp
index 55898466fb5d..40eb772a306b 100644
--- a/ydb/core/ymq/base/secure_protobuf_printer.cpp
+++ b/ydb/core/ymq/base/secure_protobuf_printer.cpp
@@ -10,6 +10,8 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/text_format.h>
 
+#include <ydb/core/protos/sqs.pb.h>
+
 namespace NKikimr::NSQS {
 
 namespace {
diff --git a/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp b/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp
index 3ef6b6a956dc..9e922b6b0c36 100644
--- a/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp
+++ b/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/ymq/base/secure_protobuf_printer.h>
 
 #include <library/cpp/testing/unittest/registar.h>
+#include <ydb/core/protos/sqs.pb.h>
 
 namespace NKikimr::NSQS {
 
diff --git a/ydb/core/ymq/http/xml.cpp b/ydb/core/ymq/http/xml.cpp
index 0cb6f85274f5..0b2f2967f03b 100644
--- a/ydb/core/ymq/http/xml.cpp
+++ b/ydb/core/ymq/http/xml.cpp
@@ -3,6 +3,7 @@
 
 #include <library/cpp/protobuf/json/proto2json.h>
 #include <library/cpp/string_utils/base64/base64.h>
+#include <ydb/core/protos/sqs.pb.h>
 
 #include <util/string/builder.h>
 #include <util/string/cast.h>
diff --git a/ydb/library/actors/core/log.h b/ydb/library/actors/core/log.h
index 6ce70d0b844d..6aec13aa7a97 100644
--- a/ydb/library/actors/core/log.h
+++ b/ydb/library/actors/core/log.h
@@ -21,6 +21,7 @@
 #include <library/cpp/svnversion/svnversion.h>
 
 #include <ydb/library/actors/memory_log/memlog.h>
+#include <ydb/library/services/services.pb.h>
 
 // TODO: limit number of messages per second
 // TODO: make TLogComponentLevelRequest/Response network messages
diff --git a/ydb/library/actors/core/ya.make b/ydb/library/actors/core/ya.make
index a86b8e32970e..caf67b2af632 100644
--- a/ydb/library/actors/core/ya.make
+++ b/ydb/library/actors/core/ya.make
@@ -107,6 +107,7 @@ PEERDIR(
     ydb/library/actors/prof
     ydb/library/actors/protos
     ydb/library/actors/util
+    ydb/library/services
     library/cpp/execprofile
     library/cpp/json/writer
     library/cpp/logger
diff --git a/ydb/library/yaml_config/console_dumper_ut.cpp b/ydb/library/yaml_config/console_dumper_ut.cpp
index 7de690921679..1ec27b708ad7 100644
--- a/ydb/library/yaml_config/console_dumper_ut.cpp
+++ b/ydb/library/yaml_config/console_dumper_ut.cpp
@@ -2,6 +2,11 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
+#include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/cms.pb.h>
+#include <ydb/core/protos/netclassifier.pb.h>
+#include <ydb/core/protos/key.pb.h>
+
 using namespace NKikimr;
 
 Y_UNIT_TEST_SUITE(ConsoleDumper) {
diff --git a/ydb/library/yaml_config/yaml_config.cpp b/ydb/library/yaml_config/yaml_config.cpp
index 116a0efa2971..21c4c79a95e1 100644
--- a/ydb/library/yaml_config/yaml_config.cpp
+++ b/ydb/library/yaml_config/yaml_config.cpp
@@ -6,6 +6,8 @@
 
 #include <library/cpp/protobuf/json/json2proto.h>
 
+#include <ydb/core/protos/netclassifier.pb.h>
+
 namespace NKikimr::NYamlConfig {
 
 NKikimrConfig::TAppConfig YamlToProto(
diff --git a/ydb/library/yaml_config/yaml_config_parser.cpp b/ydb/library/yaml_config/yaml_config_parser.cpp
index 3757aea7b979..982fdb8d3610 100644
--- a/ydb/library/yaml_config/yaml_config_parser.cpp
+++ b/ydb/library/yaml_config/yaml_config_parser.cpp
@@ -6,6 +6,7 @@
 
 #include <ydb/core/base/domain.h>
 #include <ydb/core/erasure/erasure.h>
+#include <ydb/core/protos/blobstorage_config.pb.h>
 
 #include <library/cpp/json/writer/json.h>
 #include <library/cpp/protobuf/json/util.h>
diff --git a/ydb/library/yaml_config/yaml_config_parser.h b/ydb/library/yaml_config/yaml_config_parser.h
index 5a62e5b11e0a..b405384bdd4d 100644
--- a/ydb/library/yaml_config/yaml_config_parser.h
+++ b/ydb/library/yaml_config/yaml_config_parser.h
@@ -8,6 +8,8 @@
 #include <library/cpp/yaml/as/tstring.h>
 
 #include <google/protobuf/message.h>
+#include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/blobstorage.pb.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/library/yaml_config/yaml_config_ut.cpp b/ydb/library/yaml_config/yaml_config_ut.cpp
index 2b9467081be9..633959a974ed 100644
--- a/ydb/library/yaml_config/yaml_config_ut.cpp
+++ b/ydb/library/yaml_config/yaml_config_ut.cpp
@@ -4,6 +4,8 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
+#include <ydb/core/protos/key.pb.h>
+
 using namespace NKikimr;
 
 const char *WholeConfig = R"(---
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
index 43821c5ab9eb..949aa8d62dc4 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
@@ -35,12 +35,6 @@
 #include <queue>
 #include <variant>
 
-namespace NKikimrServices {
-    // using constant value from ydb/core/protos/services.proto
-    // but to avoid peerdir on ydb/core/protos we introduce this constant
-    constexpr ui32 KQP_COMPUTE = 535;
-};
-
 #define SRC_LOG_T(s) \
     LOG_TRACE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
 #define SRC_LOG_D(s) \
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
index d7ddfce2fa0d..218f7d43ab86 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.cpp
@@ -31,12 +31,6 @@
 #include <queue>
 #include <variant>
 
-namespace NKikimrServices {
-    // using constant value from ydb/core/protos/services.proto
-    // but to avoid peerdir on ydb/core/protos we introduce this constant
-    constexpr ui32 KQP_COMPUTE = 535;
-};
-
 #define LOG_T(s) \
     LOG_TRACE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, s)
 #define LOG_D(s) \
diff --git a/ydb/public/lib/deprecated/client/grpc_client.h b/ydb/public/lib/deprecated/client/grpc_client.h
index 487852fdc525..264d5ad5c9a8 100644
--- a/ydb/public/lib/deprecated/client/grpc_client.h
+++ b/ydb/public/lib/deprecated/client/grpc_client.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include <ydb/core/protos/grpc.pb.h>
+#include <ydb/core/protos/msgbus.pb.h>
+#include <ydb/core/protos/msgbus_pq.pb.h>
+#include <ydb/core/protos/msgbus_kv.pb.h>
 
 #include <util/datetime/base.h>
 #include <ydb/library/grpc/client/grpc_common.h>
diff --git a/ydb/public/lib/deprecated/kicli/configurator.cpp b/ydb/public/lib/deprecated/kicli/configurator.cpp
index f3a28b4a3fdf..0cf7c4f67eb8 100644
--- a/ydb/public/lib/deprecated/kicli/configurator.cpp
+++ b/ydb/public/lib/deprecated/kicli/configurator.cpp
@@ -2,6 +2,10 @@
 
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 
+#include <ydb/core/protos/node_broker.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
+#include <ydb/core/protos/console_config.pb.h>
+
 namespace NKikimr {
 namespace NClient {
 
diff --git a/ydb/public/lib/deprecated/kicli/dynamic_node.cpp b/ydb/public/lib/deprecated/kicli/dynamic_node.cpp
index f5095a622c4d..6f1347e60c8d 100644
--- a/ydb/public/lib/deprecated/kicli/dynamic_node.cpp
+++ b/ydb/public/lib/deprecated/kicli/dynamic_node.cpp
@@ -2,6 +2,8 @@
 
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 
+#include <ydb/core/protos/node_broker.pb.h>
+
 namespace NKikimr {
 namespace NClient {
 
diff --git a/ydb/public/lib/deprecated/kicli/kicli.h b/ydb/public/lib/deprecated/kicli/kicli.h
index efb04f95977f..1f996ad611cc 100644
--- a/ydb/public/lib/deprecated/kicli/kicli.h
+++ b/ydb/public/lib/deprecated/kicli/kicli.h
@@ -3,6 +3,10 @@
 #include <ydb/core/protos/kqp.pb.h>
 #include <ydb/core/protos/msgbus.pb.h>
 #include <ydb/core/protos/ydb_result_set_old.pb.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/config.pb.h>
+#include <ydb/core/protos/tx_proxy.pb.h>
 #include <ydb/public/lib/deprecated/client/grpc_client.h>
 #include <ydb/public/lib/deprecated/client/msgbus_client_config.h>
 #include <ydb/public/lib/base/msgbus_status.h>
diff --git a/ydb/public/lib/deprecated/kicli/kikimr.cpp b/ydb/public/lib/deprecated/kicli/kikimr.cpp
index 93198bcb3cd5..a279e637689d 100644
--- a/ydb/public/lib/deprecated/kicli/kikimr.cpp
+++ b/ydb/public/lib/deprecated/kicli/kikimr.cpp
@@ -1,6 +1,7 @@
 #include "kicli.h"
 
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
+#include <ydb/core/protos/console_config.pb.h>
 #include <util/string/builder.h>
 
 namespace NKikimr {
diff --git a/ydb/services/cms/cms_ut.cpp b/ydb/services/cms/cms_ut.cpp
index 3286891d557f..b51c9a94e3f3 100644
--- a/ydb/services/cms/cms_ut.cpp
+++ b/ydb/services/cms/cms_ut.cpp
@@ -5,6 +5,11 @@
 #include <grpc++/create_channel.h>
 
 #include <ydb/core/testlib/test_client.h>
+#include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
+#include <ydb/core/protos/console.pb.h>
+#include <ydb/core/protos/cms.pb.h>
+#include <ydb/core/protos/console_tenant.pb.h>
 
 #include <ydb/library/aclib/aclib.h>
 
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_clusters_updater_actor.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_clusters_updater_actor.cpp
index adafac71490e..875c768a7195 100644
--- a/ydb/services/deprecated/persqueue_v0/grpc_pq_clusters_updater_actor.cpp
+++ b/ydb/services/deprecated/persqueue_v0/grpc_pq_clusters_updater_actor.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/persqueue/pq_database.h>
+#include <ydb/library/mkql_proto/protos/minikql.pb.h>
 
 namespace NKikimr {
 namespace NGRpcProxy {
diff --git a/ydb/services/persqueue_v1/actors/persqueue_utils.cpp b/ydb/services/persqueue_v1/actors/persqueue_utils.cpp
index 1d6ed8a4be1b..e7ee40954dc2 100644
--- a/ydb/services/persqueue_v1/actors/persqueue_utils.cpp
+++ b/ydb/services/persqueue_v1/actors/persqueue_utils.cpp
@@ -3,6 +3,7 @@
 #include <ydb/core/base/path.h>
 
 #include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
+#include <ydb/public/api/protos/ydb_issue_message.pb.h>
 
 namespace NKikimr::NGRpcProxy::V1 {
 
diff --git a/ydb/services/persqueue_v1/actors/persqueue_utils.h b/ydb/services/persqueue_v1/actors/persqueue_utils.h
index 534e1932b8e5..51c2e2b84401 100644
--- a/ydb/services/persqueue_v1/actors/persqueue_utils.h
+++ b/ydb/services/persqueue_v1/actors/persqueue_utils.h
@@ -7,6 +7,8 @@
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/ticket_parser.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
+#include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h> // double check
 
 namespace NKikimr::NGRpcProxy::V1 {
 
diff --git a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
index 4ab649e0e446..5466c2e8df49 100644
--- a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
+++ b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
@@ -8,6 +8,8 @@
 #include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/formats/arrow/size_calcer.h>
 
+#include <ydb/public/api/protos/ydb_formats.pb.h>
+
 using namespace NYdb;
 
 namespace {
diff --git a/ydb/services/ydb/ydb_coordination_ut.cpp b/ydb/services/ydb/ydb_coordination_ut.cpp
index 54c973a7e855..36a7c9752ab8 100644
--- a/ydb/services/ydb/ydb_coordination_ut.cpp
+++ b/ydb/services/ydb/ydb_coordination_ut.cpp
@@ -4,6 +4,7 @@
 #include <ydb/public/sdk/cpp/client/ydb_scheme/scheme.h>
 
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
+#include <ydb/library/ydb_issue/proto/issue_id.pb.h>
 
 #include <library/cpp/testing/unittest/tests_data.h>
 #include <library/cpp/testing/unittest/registar.h>
diff --git a/ydb/services/ydb/ydb_table_ut.cpp b/ydb/services/ydb/ydb_table_ut.cpp
index 2316c15a99f3..64b0a00b1c92 100644
--- a/ydb/services/ydb/ydb_table_ut.cpp
+++ b/ydb/services/ydb/ydb_table_ut.cpp
@@ -15,6 +15,9 @@
 #include <ydb/library/yql/public/issue/yql_issue.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 #include <ydb/library/yql/core/issue/protos/issue_id.pb.h>
+#include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <ydb/library/grpc/client/grpc_client_low.h>
 
diff --git a/ydb/services/ydb/ydb_ut.cpp b/ydb/services/ydb/ydb_ut.cpp
index cd3fc0dd6fed..40a0f2c5eb57 100644
--- a/ydb/services/ydb/ydb_ut.cpp
+++ b/ydb/services/ydb/ydb_ut.cpp
@@ -14,6 +14,10 @@
 #include <ydb/public/api/grpc/ydb_table_v1.grpc.pb.h>
 #include <ydb/public/api/grpc/draft/dummy.grpc.pb.h>
 #include <ydb/public/api/protos/ydb_table.pb.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/console_base.pb.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 #include <ydb/library/grpc/client/grpc_client_low.h>
 
diff --git a/ydb/tests/tools/kqprun/src/kqp_runner.h b/ydb/tests/tools/kqprun/src/kqp_runner.h
index de01588dce74..273cca024d87 100644
--- a/ydb/tests/tools/kqprun/src/kqp_runner.h
+++ b/ydb/tests/tools/kqprun/src/kqp_runner.h
@@ -2,6 +2,7 @@
 
 #include "common.h"
 
+#include <ydb/core/protos/kqp.pb.h>
 
 namespace NKqpRun {