intermediate changes

ref:84de00009e51ecf595c13dfc2c9846069069605d

67 files changed, 977 insertions, 31 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index cfccc145768..e3decdfe930 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -48,6 +48,9 @@ add_subdirectory(contrib/libs/xxhash)
 add_subdirectory(ydb/library/yql/public/decimal)
 add_subdirectory(ydb/library/yql/public/types)
 add_subdirectory(contrib/libs/protobuf)
+add_subdirectory(contrib/tools/protoc/bin)
+add_subdirectory(contrib/libs/protoc)
+add_subdirectory(contrib/tools/protoc/plugins/cpp_styleguide)
 add_subdirectory(ydb/library/yql/utils)
 add_subdirectory(library/cpp/digest/md5)
 add_subdirectory(contrib/libs/nayuki_md5)
@@ -110,7 +113,6 @@ add_subdirectory(ydb/public/api/protos)
 add_subdirectory(ydb/public/api/protos/annotations)
 add_subdirectory(tools/enum_parser/enum_serialization_runtime)
 add_subdirectory(ydb/public/lib/validation)
-add_subdirectory(contrib/libs/protoc)
 add_subdirectory(tools/enum_parser/enum_parser/bin)
 add_subdirectory(tools/enum_parser/parse_enum)
 add_subdirectory(library/cpp/cppparser)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index 35d27852df6..2b096d75ca2 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -125,6 +125,10 @@ add_subdirectory(contrib/libs/xxhash)
 add_subdirectory(ydb/library/yql/public/decimal)
 add_subdirectory(ydb/library/yql/public/types)
 add_subdirectory(contrib/libs/protobuf)
+add_subdirectory(contrib/tools/protoc/bin)
+add_subdirectory(library/cpp/lfalloc)
+add_subdirectory(contrib/libs/protoc)
+add_subdirectory(contrib/tools/protoc/plugins/cpp_styleguide)
 add_subdirectory(ydb/library/yql/utils)
 add_subdirectory(library/cpp/digest/md5)
 add_subdirectory(contrib/libs/nayuki_md5)
@@ -187,8 +191,6 @@ add_subdirectory(ydb/public/api/protos)
 add_subdirectory(ydb/public/api/protos/annotations)
 add_subdirectory(tools/enum_parser/enum_serialization_runtime)
 add_subdirectory(ydb/public/lib/validation)
-add_subdirectory(library/cpp/lfalloc)
-add_subdirectory(contrib/libs/protoc)
 add_subdirectory(tools/enum_parser/enum_parser/bin)
 add_subdirectory(tools/enum_parser/parse_enum)
 add_subdirectory(library/cpp/cppparser)
diff --git a/build/conf/docs.conf b/build/conf/docs.conf
index b79e7a29e76..dc669488c00 100644
--- a/build/conf/docs.conf
+++ b/build/conf/docs.conf
@@ -3,11 +3,11 @@ TOUCH_DOCS=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${kv;hide:"p DC"} ${k
 TOUCH_DOCS_MF=$TOUCH_DOCS && $GENERATE_MF
 
 # tag:docs
-### @usage: DOCS_COPY_FILE(SRCDIR src_dir [NAMESPCE dst_dir] files...)
+### @usage: DOCS_COPY_FILE(FROM src_dir [NAMESPCE dst_dir] files...)
 ###
 ### Copy files from src_dir to $BINDIR/dst_dir
-macro DOCS_COPY_FILES(SRCDIR="${CURDIR}", NAMESPACE=".", FILES...) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/copy_docs_files.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --src-dir $SRCDIR --dst-dir $BINDIR/$NAMESPACE $FILES ${input;hide;context=TEXT;pre=${SRCDIR}/:FILES} ${output;hide;pre=${NAMESPACE}/:FILES}
+macro DOCS_COPY_FILES(FROM="${CURDIR}", NAMESPACE=".", FILES...) {
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/copy_docs_files.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --src-dir $FROM --dst-dir $BINDIR/$NAMESPACE $FILES ${input;hide;context=TEXT;pre=${FROM}/:FILES} ${output;hide;pre=${NAMESPACE}/:FILES}
 }
 
 # tag:docs
diff --git a/cmake/conan.cmake b/cmake/conan.cmake
index 662c71a8724..72548473633 100644
--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
@@ -33,7 +33,7 @@
 # but it is only necessary on the end-user side. It is not necessary to create conan
 # packages, in fact it shouldn't be use for that. Check the project documentation.
 
-# version: 0.16.1
+# version: 0.17.0
 
 include(CMakeParseArguments)
 
@@ -55,6 +55,8 @@ function(_get_msvc_ide_version result)
         set(${result} 15 PARENT_SCOPE)
     elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930)
         set(${result} 16 PARENT_SCOPE)
+    elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940)
+        set(${result} 17 PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
     endif()
@@ -126,6 +128,10 @@ macro(_conan_detect_compiler)
         set(_CONAN_SETTING_ARCH ${ARGUMENTS_ARCH})
     endif()
 
+    if(USING_CXX)
+        set(_CONAN_SETTING_COMPILER_CPPSTD ${CMAKE_CXX_STANDARD})
+    endif()
+
     if (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL GNU)
         # using GCC
         # TODO: Handle other params
@@ -415,7 +421,8 @@ endfunction()
 
 function(_collect_settings result)
     set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
-                            compiler.runtime compiler.libcxx compiler.toolset)
+                            compiler.runtime compiler.libcxx compiler.toolset
+                            compiler.cppstd)
     foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
         string(TOUPPER ${ARG} _arg_name)
         string(REPLACE "." "_" _arg_name ${_arg_name})
@@ -427,10 +434,10 @@ function(_collect_settings result)
 endfunction()
 
 function(conan_cmake_autodetect detected_settings)
-    _conan_detect_build_type()
+    _conan_detect_build_type(${ARGV})
     _conan_check_system_name()
     _conan_check_language()
-    _conan_detect_compiler()
+    _conan_detect_compiler(${ARGV})
     _collect_settings(collected_settings)
     set(${detected_settings} ${collected_settings} PARENT_SCOPE)
 endfunction()
@@ -807,7 +814,8 @@ macro(conan_check)
     endif()
               
     if(NOT CONAN_DETECT_QUIET)
-        message(STATUS "Conan: Version found ${CONAN_VERSION_OUTPUT}")
+        string(STRIP "${CONAN_VERSION_OUTPUT}" _CONAN_VERSION_OUTPUT)
+        message(STATUS "Conan: Version found ${_CONAN_VERSION_OUTPUT}")
     endif()
 
     if(DEFINED CONAN_VERSION)
@@ -837,7 +845,7 @@ function(conan_add_remote)
     if(DEFINED CONAN_COMMAND)
         set(CONAN_CMD ${CONAN_COMMAND})
     else()
-        conan_check(REQUIRED)
+        conan_check(REQUIRED DETECT_QUIET)
     endif()
     set(CONAN_VERIFY_SSL_ARG "True")
     if(DEFINED CONAN_VERIFY_SSL)
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
index fce76a3cc05..017b9d9a46b 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
@@ -7,6 +7,18 @@ function(target_proto_plugin Tgt Name PluginTarget)
   )
 endfunction()
 
+function(target_proto_addincls Tgt)
+  set_property(TARGET ${Tgt} APPEND PROPERTY
+    PROTO_ADDINCL ${ARGN}
+  )
+endfunction()
+
+function(target_proto_outs Tgt)
+  set_property(TARGET ${Tgt} APPEND PROPERTY
+    PROTO_OUTS ${ARGN}
+  )
+endfunction()
+
 function(target_proto_messages Tgt Scope)
   get_property(ProtocExtraOutsSuf TARGET ${Tgt} PROPERTY PROTOC_EXTRA_OUTS)
   foreach(proto ${ARGN})
@@ -27,9 +39,8 @@ function(target_proto_messages Tgt Scope)
           ${ProtocExtraOuts}
         COMMAND protoc
           ${COMMON_PROTOC_FLAGS}
-          -I=${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-          --cpp_out=${CMAKE_BINARY_DIR}
-          --cpp_styleguide_out=${CMAKE_BINARY_DIR}
+          "-I$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},PROTO_ADDINCL>>,;-I>"
+          "$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},PROTO_OUTS>>,;>"
           --plugin=protoc-gen-cpp_styleguide=${CMAKE_BINARY_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide
           "$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},PROTOC_OPTS>>,;>"
           ${protoRel}
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index 75cc746a283..6705cbfe097 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -61,3 +61,16 @@ target_sources(libs-apache-orc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/src/io/OutputStream.cc
   ${CMAKE_BINARY_DIR}/contrib/libs/apache/orc/proto/orc_proto.pb.cc
 )
+target_proto_addincls(libs-apache-orc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(libs-apache-orc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/contrib/tools/protoc/bin/CMakeLists.darwin.txt b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..00c5ae2afaf
--- /dev/null
+++ b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
@@ -0,0 +1,27 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(protoc)
+target_link_libraries(protoc PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  contrib-libs-protoc
+)
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
+target_link_flags(protoc
+  PUBLIC
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+)
+vcs_info(protoc)
diff --git a/contrib/tools/protoc/bin/CMakeLists.linux.txt b/contrib/tools/protoc/bin/CMakeLists.linux.txt
new file mode 100644
index 00000000000..d0e1886d1e2
--- /dev/null
+++ b/contrib/tools/protoc/bin/CMakeLists.linux.txt
@@ -0,0 +1,32 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(protoc)
+target_link_libraries(protoc PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  library-cpp-cpuid_check
+  contrib-libs-protoc
+)
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
+target_link_flags(protoc
+  PUBLIC
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+vcs_info(protoc)
diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt
new file mode 100644
index 00000000000..a681d385f3e
--- /dev/null
+++ b/contrib/tools/protoc/bin/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (UNIX)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..c86c30114f1
--- /dev/null
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
@@ -0,0 +1,27 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(cpp_styleguide)
+target_link_libraries(cpp_styleguide PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  contrib-libs-protoc
+)
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
+target_link_flags(cpp_styleguide
+  PUBLIC
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+)
+vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
new file mode 100644
index 00000000000..f7cbff28a25
--- /dev/null
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
@@ -0,0 +1,32 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(cpp_styleguide)
+target_link_libraries(cpp_styleguide PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  library-cpp-cpuid_check
+  contrib-libs-protoc
+)
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
+target_link_flags(cpp_styleguide
+  PUBLIC
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
new file mode 100644
index 00000000000..a681d385f3e
--- /dev/null
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (UNIX)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/library/cpp/actors/protos/CMakeLists.txt b/library/cpp/actors/protos/CMakeLists.txt
index 456b1a40e36..3f421a344bd 100644
--- a/library/cpp/actors/protos/CMakeLists.txt
+++ b/library/cpp/actors/protos/CMakeLists.txt
@@ -25,3 +25,16 @@ target_sources(cpp-actors-protos PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/actors/protos/services_common.pb.cc
   ${CMAKE_BINARY_DIR}/library/cpp/actors/protos/unittests.pb.cc
 )
+target_proto_addincls(cpp-actors-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(cpp-actors-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
index 1f3b57f44ef..444c6c85dcf 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(histogram-adaptive-protos PRIVATE
 target_sources(histogram-adaptive-protos PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/histogram/adaptive/protos/histo.pb.cc
 )
+target_proto_addincls(histogram-adaptive-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(histogram-adaptive-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/lwtrace/protos/CMakeLists.txt b/library/cpp/lwtrace/protos/CMakeLists.txt
index 177651b47bc..b08053444f8 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(cpp-lwtrace-protos PRIVATE
 target_sources(cpp-lwtrace-protos PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/lwtrace/protos/lwtrace.pb.cc
 )
+target_proto_addincls(cpp-lwtrace-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(cpp-lwtrace-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.txt b/library/cpp/messagebus/monitoring/CMakeLists.txt
index 931249f18f9..f3892181662 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.txt
@@ -20,3 +20,16 @@ target_proto_messages(cpp-messagebus-monitoring PRIVATE
 target_sources(cpp-messagebus-monitoring PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/messagebus/monitoring/mon_proto.pb.cc
 )
+target_proto_addincls(cpp-messagebus-monitoring
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(cpp-messagebus-monitoring
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
index 29c2893565e..7a0c8e732a5 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(encode-legacy_protobuf-protos PRIVATE
 target_sources(encode-legacy_protobuf-protos PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.cc
 )
+target_proto_addincls(encode-legacy_protobuf-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(encode-legacy_protobuf-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.txt b/library/cpp/protobuf/util/proto/CMakeLists.txt
index cc257aeeb7c..6b2ad285a60 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(protobuf-util-proto PRIVATE
 target_sources(protobuf-util-proto PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/protobuf/util/proto/merge.pb.cc
 )
+target_proto_addincls(protobuf-util-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(protobuf-util-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/library/cpp/retry/protos/CMakeLists.txt b/library/cpp/retry/protos/CMakeLists.txt
index d9c38efdd3b..9cd13c271c3 100644
--- a/library/cpp/retry/protos/CMakeLists.txt
+++ b/library/cpp/retry/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(cpp-retry-protos PRIVATE
 target_sources(cpp-retry-protos PRIVATE
   ${CMAKE_BINARY_DIR}/library/cpp/retry/protos/retry_options.pb.cc
 )
+target_proto_addincls(cpp-retry-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(cpp-retry-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
index 592814aef97..e104d0eedf6 100644
--- a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
+++ b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
@@ -23,6 +23,19 @@ target_proto_messages(grpc_streaming-ut-grpc PRIVATE
 target_sources(grpc_streaming-ut-grpc PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/grpc_streaming/ut/grpc/streaming_service.pb.cc
 )
+target_proto_addincls(grpc_streaming-ut-grpc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(grpc_streaming-ut-grpc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(grpc_streaming-ut-grpc
   grpc_cpp
   grpc_cpp
diff --git a/ydb/core/keyvalue/protos/CMakeLists.txt b/ydb/core/keyvalue/protos/CMakeLists.txt
index 912e2dda5d2..3310da7fb51 100644
--- a/ydb/core/keyvalue/protos/CMakeLists.txt
+++ b/ydb/core/keyvalue/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(core-keyvalue-protos PRIVATE
 target_sources(core-keyvalue-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/keyvalue/protos/events.pb.cc
 )
+target_proto_addincls(core-keyvalue-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-keyvalue-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/protos/CMakeLists.txt b/ydb/core/protos/CMakeLists.txt
index cd234cfa19d..8672caaf3ca 100644
--- a/ydb/core/protos/CMakeLists.txt
+++ b/ydb/core/protos/CMakeLists.txt
@@ -269,6 +269,19 @@ generate_enum_serilization(ydb-core-protos
   INCLUDE_HEADERS
   ydb/core/protos/blobstorage_pdisk_config.pb.h
 )
+target_proto_addincls(ydb-core-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(ydb-core-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(ydb-core-protos
   grpc_cpp
   grpc_cpp
diff --git a/ydb/core/tablet_flat/CMakeLists.txt b/ydb/core/tablet_flat/CMakeLists.txt
index f47af63e785..93bdf75605d 100644
--- a/ydb/core/tablet_flat/CMakeLists.txt
+++ b/ydb/core/tablet_flat/CMakeLists.txt
@@ -108,3 +108,16 @@ generate_enum_serilization(ydb-core-tablet_flat
   INCLUDE_HEADERS
   ydb/core/tablet_flat/flat_row_eggs.h
 )
+target_proto_addincls(ydb-core-tablet_flat
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(ydb-core-tablet_flat
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.txt b/ydb/core/tablet_flat/protos/CMakeLists.txt
index 34717ea181d..652bdb64f4e 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.txt
@@ -22,3 +22,16 @@ target_sources(core-tablet_flat-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/tablet_flat/protos/flat_table_part.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/core/tablet_flat/protos/flat_table_shard.pb.cc
 )
+target_proto_addincls(core-tablet_flat-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-tablet_flat-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/viewer/protos/CMakeLists.txt b/ydb/core/viewer/protos/CMakeLists.txt
index 248fd7bd99e..808fd0c70ed 100644
--- a/ydb/core/viewer/protos/CMakeLists.txt
+++ b/ydb/core/viewer/protos/CMakeLists.txt
@@ -20,3 +20,16 @@ target_proto_messages(core-viewer-protos PRIVATE
 target_sources(core-viewer-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/viewer/protos/viewer.pb.cc
 )
+target_proto_addincls(core-viewer-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-viewer-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/ymq/proto/CMakeLists.txt b/ydb/core/ymq/proto/CMakeLists.txt
index 7db2a8c0265..d71d654c57b 100644
--- a/ydb/core/ymq/proto/CMakeLists.txt
+++ b/ydb/core/ymq/proto/CMakeLists.txt
@@ -20,3 +20,16 @@ target_proto_messages(core-ymq-proto PRIVATE
 target_sources(core-ymq-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/ymq/proto/records.pb.cc
 )
+target_proto_addincls(core-ymq-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-ymq-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
index 3686df73c18..5b7f1c4328e 100644
--- a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
@@ -20,3 +20,16 @@ target_proto_messages(libs-checkpoint_storage-proto PRIVATE
 target_sources(libs-checkpoint_storage-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/checkpoint_storage/proto/graph_description.pb.cc
 )
+target_proto_addincls(libs-checkpoint_storage-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(libs-checkpoint_storage-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/yq/libs/config/protos/CMakeLists.txt b/ydb/core/yq/libs/config/protos/CMakeLists.txt
index 24822f78547..50a796422b9 100644
--- a/ydb/core/yq/libs/config/protos/CMakeLists.txt
+++ b/ydb/core/yq/libs/config/protos/CMakeLists.txt
@@ -58,3 +58,16 @@ target_sources(libs-config-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/config/protos/token_accessor.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/config/protos/yq_config.pb.cc
 )
+target_proto_addincls(libs-config-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(libs-config-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
index 6eea1730f25..06e1283377a 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
@@ -22,3 +22,16 @@ target_proto_messages(libs-control_plane_storage-proto PRIVATE
 target_sources(libs-control_plane_storage-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/control_plane_storage/proto/yq_internal.pb.cc
 )
+target_proto_addincls(libs-control_plane_storage-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(libs-control_plane_storage-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt b/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
index 61e3ecea6a0..fe1523741a9 100644
--- a/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
@@ -21,3 +21,16 @@ target_proto_messages(libs-graph_params-proto PRIVATE
 target_sources(libs-graph_params-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/graph_params/proto/graph_params.pb.cc
 )
+target_proto_addincls(libs-graph_params-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(libs-graph_params-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/aclib/protos/CMakeLists.txt b/ydb/library/aclib/protos/CMakeLists.txt
index a33ebfcfba2..f706ebb8c68 100644
--- a/ydb/library/aclib/protos/CMakeLists.txt
+++ b/ydb/library/aclib/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(library-aclib-protos PRIVATE
 target_sources(library-aclib-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/aclib/protos/aclib.pb.cc
 )
+target_proto_addincls(library-aclib-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-aclib-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/folder_service/proto/CMakeLists.txt b/ydb/library/folder_service/proto/CMakeLists.txt
index 725de010b3b..f28bce4a3a6 100644
--- a/ydb/library/folder_service/proto/CMakeLists.txt
+++ b/ydb/library/folder_service/proto/CMakeLists.txt
@@ -21,3 +21,16 @@ target_sources(library-folder_service-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/folder_service/proto/config.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/folder_service/proto/folder_service.pb.cc
 )
+target_proto_addincls(library-folder_service-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-folder_service-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/login/protos/CMakeLists.txt b/ydb/library/login/protos/CMakeLists.txt
index 9b5824629cb..2b171b87383 100644
--- a/ydb/library/login/protos/CMakeLists.txt
+++ b/ydb/library/login/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(library-login-protos PRIVATE
 target_sources(library-login-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/login/protos/login.pb.cc
 )
+target_proto_addincls(library-login-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-login-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/mkql_proto/protos/CMakeLists.txt b/ydb/library/mkql_proto/protos/CMakeLists.txt
index 0b81c1b6247..4da07be3755 100644
--- a/ydb/library/mkql_proto/protos/CMakeLists.txt
+++ b/ydb/library/mkql_proto/protos/CMakeLists.txt
@@ -23,6 +23,19 @@ target_proto_messages(library-mkql_proto-protos PRIVATE
 target_sources(library-mkql_proto-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/mkql_proto/protos/minikql.pb.cc
 )
+target_proto_addincls(library-mkql_proto-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-mkql_proto-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(library-mkql_proto-protos
   grpc_cpp
   grpc_cpp
diff --git a/ydb/library/pdisk_io/protos/CMakeLists.txt b/ydb/library/pdisk_io/protos/CMakeLists.txt
index c6ac23a7a20..29b3ed7d27c 100644
--- a/ydb/library/pdisk_io/protos/CMakeLists.txt
+++ b/ydb/library/pdisk_io/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(library-pdisk_io-protos PRIVATE
 target_sources(library-pdisk_io-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/pdisk_io/protos/sector_map.pb.cc
 )
+target_proto_addincls(library-pdisk_io-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-pdisk_io-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt b/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt
index 064cb1a3ee7..19d23266570 100644
--- a/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt
+++ b/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt
@@ -46,4 +46,17 @@ target_link_flags(ydb-library-protobuf_printer-ut
   -framework
   CoreFoundation
 )
+target_proto_addincls(ydb-library-protobuf_printer-ut
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(ydb-library-protobuf_printer-ut
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 vcs_info(ydb-library-protobuf_printer-ut)
diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt b/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt
index a63dae5bdd9..b4fa1c695ed 100644
--- a/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt
+++ b/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt
@@ -49,4 +49,17 @@ target_link_flags(ydb-library-protobuf_printer-ut
   -lrt
   -ldl
 )
+target_proto_addincls(ydb-library-protobuf_printer-ut
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(ydb-library-protobuf_printer-ut
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 vcs_info(ydb-library-protobuf_printer-ut)
diff --git a/ydb/library/schlab/protos/CMakeLists.txt b/ydb/library/schlab/protos/CMakeLists.txt
index 2ef61bc0189..f24d8fc3aa7 100644
--- a/ydb/library/schlab/protos/CMakeLists.txt
+++ b/ydb/library/schlab/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(library-schlab-protos PRIVATE
 target_sources(library-schlab-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/schlab/protos/schlab.pb.cc
 )
+target_proto_addincls(library-schlab-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-schlab-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
index a61b898e9e8..5dadf437211 100644
--- a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(file_storage-http_download-proto PRIVATE
 target_sources(file_storage-http_download-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/file_storage/http_download/proto/http_download.pb.cc
 )
+target_proto_addincls(file_storage-http_download-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(file_storage-http_download-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/core/file_storage/proto/CMakeLists.txt b/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
index c8a41c2f5b1..c4f12df0cde 100644
--- a/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(core-file_storage-proto PRIVATE
 target_sources(core-file_storage-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/file_storage/proto/file_storage.pb.cc
 )
+target_proto_addincls(core-file_storage-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-file_storage-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/core/issue/protos/CMakeLists.txt b/ydb/library/yql/core/issue/protos/CMakeLists.txt
index 9b8dee7cb07..3ddff0ce0ec 100644
--- a/ydb/library/yql/core/issue/protos/CMakeLists.txt
+++ b/ydb/library/yql/core/issue/protos/CMakeLists.txt
@@ -20,3 +20,16 @@ target_proto_messages(core-issue-protos PRIVATE
 target_sources(core-issue-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/issue/protos/issue_id.pb.cc
 )
+target_proto_addincls(core-issue-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-issue-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/dq/actors/protos/CMakeLists.txt b/ydb/library/yql/dq/actors/protos/CMakeLists.txt
index 03517e7ee4e..ac68aef54fd 100644
--- a/ydb/library/yql/dq/actors/protos/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/protos/CMakeLists.txt
@@ -27,3 +27,16 @@ target_sources(dq-actors-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/actors/protos/dq_events.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/actors/protos/dq_stats.pb.cc
 )
+target_proto_addincls(dq-actors-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(dq-actors-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/dq/proto/CMakeLists.txt b/ydb/library/yql/dq/proto/CMakeLists.txt
index 9c1da9a923a..3e9ec1f96df 100644
--- a/ydb/library/yql/dq/proto/CMakeLists.txt
+++ b/ydb/library/yql/dq/proto/CMakeLists.txt
@@ -26,3 +26,16 @@ target_sources(yql-dq-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/proto/dq_tasks.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/proto/dq_transport.pb.cc
 )
+target_proto_addincls(yql-dq-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(yql-dq-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
index 184762d0fbb..d8483e55539 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
@@ -21,6 +21,31 @@ target_sources(proto_ast-gen-jsonpath PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathLexer.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.pb.cc
 )
+run_antlr(
+  OUTPUT
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.proto
+  DEPENDS
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
+  WORKING_DIRECTORY
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+  ANTLER_ARGS
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/jsonpath/JsonPath.g
+  -lib
+  .
+  -fo
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
+  -language
+  protobuf
+)
+set(
+  ANTLR_PACKAGE_NAME
+  NJsonPathGenerated
+)
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
+)
 set(
   ANTLR_PACKAGE_NAME
   NJsonPathGenerated
@@ -37,14 +62,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-set(
-  ANTLR_PACKAGE_NAME
-  NJsonPathGenerated
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 run_antlr(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/JsonPathParser.cpp
@@ -63,3 +80,16 @@ run_antlr(
   -fo
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath
 )
+target_proto_addincls(proto_ast-gen-jsonpath
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(proto_ast-gen-jsonpath
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
index 482590a2d31..9901a1b6e7d 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
@@ -21,6 +21,31 @@ target_sources(proto_ast-gen-v0 PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLLexer.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.pb.cc
 )
+run_antlr(
+  OUTPUT
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.proto
+  DEPENDS
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
+  WORKING_DIRECTORY
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+  ANTLER_ARGS
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v0/SQL.g
+  -lib
+  .
+  -fo
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
+  -language
+  protobuf
+)
+set(
+  ANTLR_PACKAGE_NAME
+  NSQLGenerated
+)
+configure_file(
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
+)
 set(
   ANTLR_PACKAGE_NAME
   NSQLGenerated
@@ -37,14 +62,6 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp/Cpp.stg
 )
-set(
-  ANTLR_PACKAGE_NAME
-  NSQLGenerated
-)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf/protobuf.stg
-)
 run_antlr(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/SQLParser.cpp
@@ -63,3 +80,16 @@ run_antlr(
   -fo
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0
 )
+target_proto_addincls(proto_ast-gen-v0
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(proto_ast-gen-v0
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
index e580cf9a1a3..1b7041b7814 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
@@ -19,6 +19,23 @@ target_proto_messages(proto_ast-gen-v1_proto PRIVATE
 target_sources(proto_ast-gen-v1_proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.pb.cc
 )
+run_antlr(
+  OUTPUT
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1Parser.proto
+  DEPENDS
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
+  WORKING_DIRECTORY
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
+  ANTLER_ARGS
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g
+  -lib
+  .
+  -fo
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto
+  -language
+  protobuf
+)
 set(
   ANTLR_PACKAGE_NAME
   NSQLv1Generated
@@ -27,6 +44,19 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in
   ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf/protobuf.stg
 )
+target_proto_addincls(proto_ast-gen-v1_proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(proto_ast-gen-v1_proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)")
 set(GRAMMAR_MULTILINE_COMMENT_CORE       ".")
diff --git a/ydb/library/yql/protos/CMakeLists.txt b/ydb/library/yql/protos/CMakeLists.txt
index 75714a11637..e111ebf252e 100644
--- a/ydb/library/yql/protos/CMakeLists.txt
+++ b/ydb/library/yql/protos/CMakeLists.txt
@@ -23,3 +23,16 @@ target_sources(library-yql-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/protos/yql_mount.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/protos/clickhouse.pb.cc
 )
+target_proto_addincls(library-yql-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(library-yql-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
index aa06386fd20..d180108dca5 100644
--- a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
@@ -21,3 +21,16 @@ target_sources(providers-clickhouse-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/proto/source.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/proto/range.pb.cc
 )
+target_proto_addincls(providers-clickhouse-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-clickhouse-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
index 40e984c8df7..7b1069652fc 100644
--- a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(common-metrics-protos PRIVATE
 target_sources(common-metrics-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/common/metrics/protos/metrics_registry.pb.cc
 )
+target_proto_addincls(common-metrics-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(common-metrics-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/common/proto/CMakeLists.txt b/ydb/library/yql/providers/common/proto/CMakeLists.txt
index 38504a52bf6..d33053d0c13 100644
--- a/ydb/library/yql/providers/common/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/proto/CMakeLists.txt
@@ -22,3 +22,16 @@ target_sources(providers-common-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/common/proto/gateways_config.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/common/proto/udf_resolver.pb.cc
 )
+target_proto_addincls(providers-common-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-common-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
index 9b4026d8fe5..05fa132582e 100644
--- a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
@@ -23,6 +23,19 @@ target_proto_messages(common-token_accessor-grpc PRIVATE
 target_sources(common-token_accessor-grpc PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/common/token_accessor/grpc/token_accessor_pb.pb.cc
 )
+target_proto_addincls(common-token_accessor-grpc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(common-token_accessor-grpc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(common-token_accessor-grpc
   grpc_cpp
   grpc_cpp
diff --git a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
index 81e1b7b8e98..d02523d53e2 100644
--- a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
@@ -24,6 +24,19 @@ target_proto_messages(dq-api-grpc PRIVATE
 target_sources(dq-api-grpc PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/api/grpc/api.pb.cc
 )
+target_proto_addincls(dq-api-grpc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(dq-api-grpc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(dq-api-grpc
   grpc_cpp
   grpc_cpp
diff --git a/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt b/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
index 44527f2d8de..94d1d0ed29e 100644
--- a/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
@@ -28,3 +28,16 @@ target_sources(dq-api-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/api/protos/dqs.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/api/protos/task_command_executor.pb.cc
 )
+target_proto_addincls(dq-api-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(dq-api-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/dq/config/CMakeLists.txt b/ydb/library/yql/providers/dq/config/CMakeLists.txt
index 3e3138fd7c4..43e87b3d44b 100644
--- a/ydb/library/yql/providers/dq/config/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/config/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(providers-dq-config PRIVATE
 target_sources(providers-dq-config PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/config/config.pb.cc
 )
+target_proto_addincls(providers-dq-config
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-dq-config
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/pq/proto/CMakeLists.txt b/ydb/library/yql/providers/pq/proto/CMakeLists.txt
index 92b7bff4e2c..b9b8632dfda 100644
--- a/ydb/library/yql/providers/pq/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/proto/CMakeLists.txt
@@ -23,3 +23,16 @@ target_sources(providers-pq-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/proto/dq_io_state.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/proto/dq_task_params.pb.cc
 )
+target_proto_addincls(providers-pq-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-pq-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/s3/proto/CMakeLists.txt b/ydb/library/yql/providers/s3/proto/CMakeLists.txt
index 92607725296..46c09ac5667 100644
--- a/ydb/library/yql/providers/s3/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/proto/CMakeLists.txt
@@ -23,3 +23,16 @@ target_sources(providers-s3-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/proto/retry_config.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/proto/source.pb.cc
 )
+target_proto_addincls(providers-s3-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-s3-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/solomon/proto/CMakeLists.txt b/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
index 6cd1aa4d2db..895a3e5bb43 100644
--- a/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(providers-solomon-proto PRIVATE
 target_sources(providers-solomon-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/solomon/proto/dq_solomon_shard.pb.cc
 )
+target_proto_addincls(providers-solomon-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-solomon-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/providers/ydb/proto/CMakeLists.txt b/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
index 24ab0519346..54f77672004 100644
--- a/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
@@ -21,3 +21,16 @@ target_sources(providers-ydb-proto PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/proto/range.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/proto/source.pb.cc
 )
+target_proto_addincls(providers-ydb-proto
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(providers-ydb-proto
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/public/issue/protos/CMakeLists.txt b/ydb/library/yql/public/issue/protos/CMakeLists.txt
index ddd44bea3ef..83d95f66374 100644
--- a/ydb/library/yql/public/issue/protos/CMakeLists.txt
+++ b/ydb/library/yql/public/issue/protos/CMakeLists.txt
@@ -21,3 +21,16 @@ target_sources(public-issue-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/public/issue/protos/issue_message.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/library/yql/public/issue/protos/issue_severity.pb.cc
 )
+target_proto_addincls(public-issue-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(public-issue-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/public/types/CMakeLists.txt b/ydb/library/yql/public/types/CMakeLists.txt
index cb608dcc4a6..396708dc7cd 100644
--- a/ydb/library/yql/public/types/CMakeLists.txt
+++ b/ydb/library/yql/public/types/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(yql-public-types PRIVATE
 target_sources(yql-public-types PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/library/yql/public/types/yql_types.pb.cc
 )
+target_proto_addincls(yql-public-types
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(yql-public-types
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt b/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
index 30d5a980e79..88df5818157 100644
--- a/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
@@ -28,3 +28,16 @@ target_sources(common-stat-static PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/stat/static/tdigest.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/udfs/common/stat/static/tdigest.pb.cc
 )
+target_proto_addincls(common-stat-static
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(common-stat-static
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/public/api/grpc/CMakeLists.txt b/ydb/public/api/grpc/CMakeLists.txt
index a658cfca5f1..091a08a009d 100644
--- a/ydb/public/api/grpc/CMakeLists.txt
+++ b/ydb/public/api/grpc/CMakeLists.txt
@@ -48,6 +48,19 @@ target_sources(api-grpc PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/api/grpc/ydb_table_v1.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/grpc/yq_v1.pb.cc
 )
+target_proto_addincls(api-grpc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(api-grpc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(api-grpc
   grpc_cpp
   grpc_cpp
diff --git a/ydb/public/api/grpc/draft/CMakeLists.txt b/ydb/public/api/grpc/draft/CMakeLists.txt
index d6280ceec91..df2574e64f4 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.txt
@@ -40,6 +40,19 @@ target_sources(api-grpc-draft PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/api/grpc/draft/ydb_logstore_v1.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/grpc/draft/yql_db_v1.pb.cc
 )
+target_proto_addincls(api-grpc-draft
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(api-grpc-draft
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(api-grpc-draft
   grpc_cpp
   grpc_cpp
diff --git a/ydb/public/api/protos/CMakeLists.txt b/ydb/public/api/protos/CMakeLists.txt
index 981605b9ba3..2d7e3fef14b 100644
--- a/ydb/public/api/protos/CMakeLists.txt
+++ b/ydb/public/api/protos/CMakeLists.txt
@@ -96,6 +96,19 @@ generate_enum_serilization(api-protos
   INCLUDE_HEADERS
   ydb/public/api/protos/draft/datastreams.pb.h
 )
+target_proto_addincls(api-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(api-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(api-protos
   validation
   validation
diff --git a/ydb/public/api/protos/annotations/CMakeLists.txt b/ydb/public/api/protos/annotations/CMakeLists.txt
index 84eaf476315..8bc704d218a 100644
--- a/ydb/public/api/protos/annotations/CMakeLists.txt
+++ b/ydb/public/api/protos/annotations/CMakeLists.txt
@@ -21,3 +21,16 @@ target_sources(api-protos-annotations PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/annotations/sensitive.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/annotations/validation.pb.cc
 )
+target_proto_addincls(api-protos-annotations
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(api-protos-annotations
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/public/lib/operation_id/protos/CMakeLists.txt b/ydb/public/lib/operation_id/protos/CMakeLists.txt
index 24fd46f39a4..ad7fb91e2da 100644
--- a/ydb/public/lib/operation_id/protos/CMakeLists.txt
+++ b/ydb/public/lib/operation_id/protos/CMakeLists.txt
@@ -19,3 +19,16 @@ target_proto_messages(lib-operation_id-protos PRIVATE
 target_sources(lib-operation_id-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/lib/operation_id/protos/operation_id.pb.cc
 )
+target_proto_addincls(lib-operation_id-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(lib-operation_id-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/public/lib/validation/ut/protos/CMakeLists.txt b/ydb/public/lib/validation/ut/protos/CMakeLists.txt
index eb674f908c7..334cebacc3c 100644
--- a/ydb/public/lib/validation/ut/protos/CMakeLists.txt
+++ b/ydb/public/lib/validation/ut/protos/CMakeLists.txt
@@ -20,6 +20,19 @@ target_proto_messages(validation-ut-protos PRIVATE
 target_sources(validation-ut-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/lib/validation/ut/protos/validation_test.pb.cc
 )
+target_proto_addincls(validation-ut-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(validation-ut-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
 target_proto_plugin(validation-ut-protos
   validation
   validation