diff --git a/ydb/library/yql/public/purecalc/common/no_llvm/ya.make b/ydb/library/yql/public/purecalc/common/no_llvm/ya.make
new file mode 100644
index 000000000000..3a90e236e1fa
--- /dev/null
+++ b/ydb/library/yql/public/purecalc/common/no_llvm/ya.make
@@ -0,0 +1,14 @@
+LIBRARY()
+
+INCLUDE(../ya.make.inc)
+
+PEERDIR(
+    ydb/library/yql/providers/yt/codec/codegen/no_llvm
+    ydb/library/yql/minikql/computation/no_llvm
+    ydb/library/yql/minikql/invoke_builtins/no_llvm
+    ydb/library/yql/minikql/comp_nodes/no_llvm
+    ydb/library/yql/minikql/codegen/no_llvm
+)
+
+END()
+
diff --git a/ydb/library/yql/public/purecalc/common/ya.make b/ydb/library/yql/public/purecalc/common/ya.make
index 1ab76c9fdd67..091b58754f66 100644
--- a/ydb/library/yql/public/purecalc/common/ya.make
+++ b/ydb/library/yql/public/purecalc/common/ya.make
@@ -1,46 +1,17 @@
 LIBRARY()
 
-SRCS(
-    compile_mkql.cpp
-    fwd.cpp
-    inspect_input.cpp
-    interface.cpp
-    logger_init.cpp
-    names.cpp
-    processor_mode.cpp
-    program_factory.cpp
-    transformations/align_output_schema.cpp
-    transformations/extract_used_columns.cpp
-    transformations/output_columns_filter.cpp
-    transformations/replace_table_reads.cpp
-    transformations/type_annotation.cpp
-    type_from_schema.cpp
-    worker.cpp
-    worker_factory.cpp
-    wrappers.cpp
-)
+INCLUDE(ya.make.inc)
 
 PEERDIR(
-    ydb/library/yql/sql/pg
-    ydb/library/yql/ast
-    ydb/library/yql/core/services
-    ydb/library/yql/core/services/mounts
-    ydb/library/yql/core/user_data
-    ydb/library/yql/utils/backtrace
-    ydb/library/yql/utils/log
-    ydb/library/yql/core
-    ydb/library/yql/core/type_ann
-    ydb/library/yql/parser/pg_wrapper
-    ydb/library/yql/providers/common/codec
-    ydb/library/yql/providers/common/comp_nodes
-    ydb/library/yql/providers/common/mkql
-    ydb/library/yql/providers/common/provider
-    ydb/library/yql/providers/common/schema/expr
-    ydb/library/yql/providers/common/udf_resolve
+    ydb/library/yql/providers/yt/codec/codegen
+    ydb/library/yql/minikql/computation/llvm
+    ydb/library/yql/minikql/invoke_builtins/llvm
+    ydb/library/yql/minikql/comp_nodes/llvm
 )
 
-YQL_LAST_ABI_VERSION()
+END()
 
-GENERATE_ENUM_SERIALIZATION(interface.h)
+RECURSE(
+    no_llvm
+)
 
-END()
diff --git a/ydb/library/yql/public/purecalc/common/ya.make.inc b/ydb/library/yql/public/purecalc/common/ya.make.inc
new file mode 100644
index 000000000000..8404177207c3
--- /dev/null
+++ b/ydb/library/yql/public/purecalc/common/ya.make.inc
@@ -0,0 +1,51 @@
+SRCDIR(
+    ydb/library/yql/public/purecalc/common
+)
+
+ADDINCL(
+    ydb/library/yql/public/purecalc/common
+)
+
+SRCS(
+    compile_mkql.cpp
+    fwd.cpp
+    inspect_input.cpp
+    interface.cpp
+    logger_init.cpp
+    names.cpp
+    processor_mode.cpp
+    program_factory.cpp
+    transformations/align_output_schema.cpp
+    transformations/extract_used_columns.cpp
+    transformations/output_columns_filter.cpp
+    transformations/replace_table_reads.cpp
+    transformations/type_annotation.cpp
+    type_from_schema.cpp
+    worker.cpp
+    worker_factory.cpp
+    wrappers.cpp
+)
+
+PEERDIR(
+    ydb/library/yql/sql/pg
+    ydb/library/yql/ast
+    ydb/library/yql/core/services
+    ydb/library/yql/core/services/mounts
+    ydb/library/yql/core/user_data
+    ydb/library/yql/utils/backtrace
+    ydb/library/yql/utils/log
+    ydb/library/yql/core
+    ydb/library/yql/core/type_ann
+    ydb/library/yql/parser/pg_wrapper
+    ydb/library/yql/providers/common/codec
+    ydb/library/yql/providers/common/comp_nodes
+    ydb/library/yql/providers/common/mkql
+    ydb/library/yql/providers/common/provider
+    ydb/library/yql/providers/common/schema/expr
+    ydb/library/yql/providers/common/udf_resolve
+)
+
+YQL_LAST_ABI_VERSION()
+
+GENERATE_ENUM_SERIALIZATION(interface.h)
+
diff --git a/ydb/library/yql/public/purecalc/io_specs/mkql/no_llvm/ya.make b/ydb/library/yql/public/purecalc/io_specs/mkql/no_llvm/ya.make
new file mode 100644
index 000000000000..d34d298bb042
--- /dev/null
+++ b/ydb/library/yql/public/purecalc/io_specs/mkql/no_llvm/ya.make
@@ -0,0 +1,10 @@
+LIBRARY()
+
+INCLUDE(../ya.make.inc)
+
+PEERDIR(
+    ydb/library/yql/public/purecalc/common/no_llvm
+)
+
+END()
+
diff --git a/ydb/library/yql/public/purecalc/io_specs/mkql/ut/no_llvm/ya.make b/ydb/library/yql/public/purecalc/io_specs/mkql/ut/no_llvm/ya.make
index 4fd86e8e085c..5bf5cc76be90 100644
--- a/ydb/library/yql/public/purecalc/io_specs/mkql/ut/no_llvm/ya.make
+++ b/ydb/library/yql/public/purecalc/io_specs/mkql/ut/no_llvm/ya.make
@@ -7,7 +7,7 @@ TIMEOUT(300)
 PEERDIR(
     ydb/library/yql/public/udf/service/exception_policy
     ydb/library/yql/public/purecalc/no_llvm
-    ydb/library/yql/public/purecalc/io_specs/mkql
+    ydb/library/yql/public/purecalc/io_specs/mkql/no_llvm
     ydb/library/yql/public/purecalc/ut/lib
 )
 
diff --git a/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make b/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make
index 4cd8eb41cad8..00fdbd702d31 100644
--- a/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make
+++ b/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make
@@ -1,26 +1,19 @@
 LIBRARY()
 
+INCLUDE(ya.make.inc)
+
 PEERDIR(
     ydb/library/yql/public/purecalc/common
-    ydb/library/yql/providers/yt/codec
-    ydb/library/yql/providers/yt/common
-    ydb/library/yql/providers/yt/lib/mkql_helpers
-    ydb/library/yql/providers/common/codec
-    ydb/library/yql/providers/common/schema/mkql
 )
 
+END()
 
-   YQL_LAST_ABI_VERSION()
-
-
-SRCS(
-    spec.cpp
-    spec.h
+RECURSE(
+    no_llvm
 )
 
-END()
-
 RECURSE_FOR_TESTS(
     ut
     ut/no_llvm
 )
+
diff --git a/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make.inc b/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make.inc
new file mode 100644
index 000000000000..093cccb8e3a3
--- /dev/null
+++ b/ydb/library/yql/public/purecalc/io_specs/mkql/ya.make.inc
@@ -0,0 +1,25 @@
+SRCDIR(
+    ydb/library/yql/public/purecalc/io_specs/mkql
+)
+
+ADDINCL(
+    ydb/library/yql/public/purecalc/io_specs/mkql
+)
+
+PEERDIR(
+    ydb/library/yql/providers/yt/codec
+    ydb/library/yql/providers/yt/common
+    ydb/library/yql/providers/yt/lib/mkql_helpers
+    ydb/library/yql/providers/common/codec
+    ydb/library/yql/providers/common/schema/mkql
+)
+
+
+YQL_LAST_ABI_VERSION()
+
+
+SRCS(
+    spec.cpp
+    spec.h
+)
+
diff --git a/ydb/library/yql/public/purecalc/no_llvm/ya.make b/ydb/library/yql/public/purecalc/no_llvm/ya.make
index 58d1142359f3..e47a677686fb 100644
--- a/ydb/library/yql/public/purecalc/no_llvm/ya.make
+++ b/ydb/library/yql/public/purecalc/no_llvm/ya.make
@@ -14,7 +14,7 @@ SRCS(
 
 PEERDIR(
     ydb/library/yql/public/udf/service/exception_policy
-    ydb/library/yql/public/purecalc/common
+    ydb/library/yql/public/purecalc/common/no_llvm
     ydb/library/yql/providers/yt/codec/codegen/no_llvm
     ydb/library/yql/minikql/codegen/no_llvm
     ydb/library/yql/minikql/computation/no_llvm
diff --git a/ydb/library/yql/public/purecalc/ya.make b/ydb/library/yql/public/purecalc/ya.make
index 6688b4aa5df3..b896669d1844 100644
--- a/ydb/library/yql/public/purecalc/ya.make
+++ b/ydb/library/yql/public/purecalc/ya.make
@@ -7,10 +7,6 @@ SRCS(
 PEERDIR(
     ydb/library/yql/public/udf/service/exception_policy
     ydb/library/yql/public/purecalc/common
-    ydb/library/yql/providers/yt/codec/codegen
-    ydb/library/yql/minikql/computation/llvm
-    ydb/library/yql/minikql/invoke_builtins/llvm
-    ydb/library/yql/minikql/comp_nodes/llvm
 )
 
 YQL_LAST_ABI_VERSION()