diff --git a/base/common/ya.make b/base/common/ya.make
index b64ab93f2fc..caa0d067ef2 100644
--- a/base/common/ya.make
+++ b/base/common/ya.make
@@ -1,3 +1,4 @@
+# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
 LIBRARY()
 
 ADDINCL(
@@ -35,8 +36,10 @@ SRCS(
     DateLUT.cpp
     DateLUTImpl.cpp
     demangle.cpp
+    errnoToString.cpp
     getFQDNOrHostName.cpp
     getMemoryAmount.cpp
+    getResource.cpp
     getThreadId.cpp
     JSON.cpp
     LineReader.cpp
@@ -47,7 +50,7 @@ SRCS(
     shift10.cpp
     sleep.cpp
     terminalColors.cpp
-    errnoToString.cpp
+
 )
 
 END()
diff --git a/base/common/ya.make.in b/base/common/ya.make.in
new file mode 100644
index 00000000000..957ae4d68b7
--- /dev/null
+++ b/base/common/ya.make.in
@@ -0,0 +1,36 @@
+LIBRARY()
+
+ADDINCL(
+    GLOBAL clickhouse/base
+    GLOBAL contrib/libs/cctz/include
+)
+
+CFLAGS (GLOBAL -DARCADIA_BUILD)
+
+CFLAGS (GLOBAL -DUSE_CPUID=1)
+CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
+CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
+
+IF (OS_DARWIN)
+    CFLAGS (GLOBAL -DOS_DARWIN)
+ELSEIF (OS_FREEBSD)
+    CFLAGS (GLOBAL -DOS_FREEBSD)
+ELSEIF (OS_LINUX)
+    CFLAGS (GLOBAL -DOS_LINUX)
+ENDIF ()
+
+PEERDIR(
+    contrib/libs/cctz/src
+    contrib/libs/cxxsupp/libcxx-filesystem
+    contrib/libs/poco/Net
+    contrib/libs/poco/Util
+    contrib/libs/fmt
+    contrib/restricted/boost
+    contrib/restricted/cityhash-1.0.2
+)
+
+SRCS(
+<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
+)
+
+END()
diff --git a/src/Disks/ya.make b/src/Disks/ya.make
index f82cc4e2868..a64e5508ca8 100644
--- a/src/Disks/ya.make
+++ b/src/Disks/ya.make
@@ -7,6 +7,8 @@ PEERDIR(
 
 SRCS(
     createVolume.cpp
+    DiskCacheWrapper.cpp
+    DiskDecorator.cpp
     DiskFactory.cpp
     DiskLocal.cpp
     DiskMemory.cpp