diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
index b74ceec4e7e4..0de21c6be738 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
@@ -5,7 +5,7 @@
 #include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
-#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
index ab644753f963..0086e8b8ffaf 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
-#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h> // Y_IGNORE
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/arrow/mkql_bit_utils.h>
 #include <ydb/library/yql/minikql/mkql_type_builder.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
index c26294a0faa9..68caf0a315bd 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
@@ -3,7 +3,7 @@
 #include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
-#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>  // Y_IGNORE
 
 #include <ydb/library/yql/public/udf/arrow/block_item_comparator.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
index 3949919faaa8..7ccefce51a44 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
@@ -3,7 +3,7 @@
 #include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 #include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
-#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>  // Y_IGNORE
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp
index b85d7062d128..dc5eae170435 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp
@@ -1,7 +1,7 @@
 #include "mkql_combine.h"
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_stats_registry.h>
 #include <ydb/library/yql/minikql/defs.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
index 68ed4cddfe7e..0a07c8717e13 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
@@ -1,7 +1,7 @@
 #include "mkql_extend.h"
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/mkql_custom_list.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
index b98153d66991..990f14cde9eb 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
@@ -10,7 +10,7 @@
 #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_program_builder.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_join.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_join.cpp
index 2dcd1161f446..b0383389ef60 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_join.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_join.cpp
@@ -4,7 +4,7 @@
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders_codegen.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_program_builder.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_squeeze_to_list.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_squeeze_to_list.cpp
index a7a450c46dee..8b62fbb92338 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_squeeze_to_list.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_squeeze_to_list.cpp
@@ -3,7 +3,7 @@
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 
 namespace NKikimr {
 namespace NMiniKQL {
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp
index bcb37a583700..1f0db7ea16f3 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp
@@ -1,7 +1,7 @@
 #include "mkql_switch.h"
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_stats_registry.h>
 #include <ydb/library/yql/utils/cast.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_todict.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_todict.cpp
index 558fa8fd2e1b..87b75223cf46 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_todict.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_todict.cpp
@@ -4,7 +4,7 @@
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/presort.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_string_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp
index 418a141b8ef8..025688bb817e 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp
@@ -2,7 +2,7 @@
 #include "mkql_rh_hash.h"
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_runtime_version.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_wide_top_sort.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_wide_top_sort.cpp
index 3715f4bc4f8e..324cb1d72ef8 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_wide_top_sort.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_wide_top_sort.cpp
@@ -1,7 +1,7 @@
 #include "mkql_wide_top_sort.h"
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>  // Y_IGNORE
-#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
+#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>  // Y_IGNORE
 #include <ydb/library/yql/minikql/computation/presort.h>
 #include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/ya.make.inc b/ydb/library/yql/minikql/comp_nodes/ya.make.inc
index 594c4a682c59..3c3841e0ee7d 100644
--- a/ydb/library/yql/minikql/comp_nodes/ya.make.inc
+++ b/ydb/library/yql/minikql/comp_nodes/ya.make.inc
@@ -141,8 +141,11 @@ COPY(
     ${ORIG_SOURCES}
     OUTPUT_INCLUDES 
     ${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
+    ${BINDIR}/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
+    ${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
     ${BINDIR}/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_codegen.h
     ${BINDIR}/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_decimal.h
+    llvm/Support/raw_ostream.h
 )
 
 PEERDIR(
diff --git a/ydb/library/yql/minikql/computation/header.ya.make.inc b/ydb/library/yql/minikql/computation/header.ya.make.inc
index 91b417664c49..2d6d8202211e 100644
--- a/ydb/library/yql/minikql/computation/header.ya.make.inc
+++ b/ydb/library/yql/minikql/computation/header.ya.make.inc
@@ -19,3 +19,24 @@ COPY_FILE(TEXT
        llvm/IR/Instructions.h
        llvm/IR/Constants.h
 )
+
+COPY_FILE(TEXT
+    ydb/library/yql/minikql/computation/mkql_llvm_base.h.txt
+    ${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
+    OUTPUT_INCLUDES
+        ${ARCADIA_ROOT}/ydb/library/yql/minikql/computation/mkql_computation_node_impl.h
+        llvm/IR/LLVMContext.h
+        llvm/IR/Type.h
+        llvm/IR/Constant.h
+        llvm/IR/DerivedTypes.h
+        llvm/IR/Constants.h
+)
+
+COPY_FILE(TEXT
+    ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h.txt
+    ${BINDIR}/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
+    OUTPUT_INCLUDES
+        ${ARCADIA_ROOT}/ydb/library/yql/minikql/computation/mkql_block_item.h
+        ${ARCADIA_ROOT}/ydb/library/yql/minikql/codegen/codegen.h
+        mkql_llvm_base.h
+)
diff --git a/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h b/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h.txt
similarity index 96%
rename from ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
rename to ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h.txt
index 326432002ee1..2698270da4c4 100644
--- a/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
+++ b/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h.txt
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mkql_block_item.h"
+#include <ydb/library/yql/minikql/computation/mkql_block_item.h>
 #include "mkql_llvm_base.h"
 
 #include <ydb/library/yql/minikql/codegen/codegen.h>
diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
index 9a2bf24a2818..d4e4f71e4751 100644
--- a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
@@ -13,7 +13,7 @@
 #include <util/digest/city.h>
 
 #ifndef MKQL_DISABLE_CODEGEN
-#include <llvm/Support/raw_ostream.h>
+#include <llvm/Support/raw_ostream.h>  // Y_IGNORE
 #endif
 
 namespace NKikimr {
diff --git a/ydb/library/yql/minikql/computation/mkql_llvm_base.cpp b/ydb/library/yql/minikql/computation/mkql_llvm_base.cpp
index 6244af1630be..d7d6bf3e711d 100644
--- a/ydb/library/yql/minikql/computation/mkql_llvm_base.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_llvm_base.cpp
@@ -1,4 +1,4 @@
-#include "mkql_llvm_base.h"
+#include "mkql_llvm_base.h"  // Y_IGNORE
 
 namespace NKikimr::NMiniKQL {
 
diff --git a/ydb/library/yql/minikql/computation/mkql_llvm_base.h b/ydb/library/yql/minikql/computation/mkql_llvm_base.h.txt
similarity index 100%
rename from ydb/library/yql/minikql/computation/mkql_llvm_base.h
rename to ydb/library/yql/minikql/computation/mkql_llvm_base.h.txt
diff --git a/ydb/library/yql/minikql/computation/ya.make.inc b/ydb/library/yql/minikql/computation/ya.make.inc
index 9de6ecfff377..df45ee68c50f 100644
--- a/ydb/library/yql/minikql/computation/ya.make.inc
+++ b/ydb/library/yql/minikql/computation/ya.make.inc
@@ -43,7 +43,9 @@ COPY(
     AUTO
     FROM ${ORIG_SRC_DIR}
     ${ORIG_SOURCES}
-    OUTPUT_INCLUDES ${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
+    OUTPUT_INCLUDES 
+        ${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
+        ${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
 )
 
 PROVIDES(MINIKQL_COMPUTATION)