diff --git a/compiler/frontend.common.jvm/build.gradle.kts b/compiler/frontend.common.jvm/build.gradle.kts
index 2c27c289978..a1cc3b7dc5b 100644
--- a/compiler/frontend.common.jvm/build.gradle.kts
+++ b/compiler/frontend.common.jvm/build.gradle.kts
@@ -8,8 +8,8 @@ dependencies {
     api(project(":core:deserialization.common"))
     api(project(":core:deserialization.common.jvm"))
     implementation(project(":core:compiler.common.jvm"))
-    api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
-    implementation(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 
     implementation(project(":core:descriptors.jvm"))
 
diff --git a/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts b/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts
index b80062b9769..2350aa7e8d7 100644
--- a/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts
+++ b/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":core:deserialization.common.jvm.impl"))
     implementation(project(":core:compiler.common.jvm"))
 
-    api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    api(intellijCore())
 
     testImplementation(projectTests(":compiler:tests-common"))
 
diff --git a/compiler/psi/cls-psi-stub-builder/build.gradle.kts b/compiler/psi/cls-psi-stub-builder/build.gradle.kts
index 31bca730316..c2014ca900e 100644
--- a/compiler/psi/cls-psi-stub-builder/build.gradle.kts
+++ b/compiler/psi/cls-psi-stub-builder/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(project(":core:deserialization"))
     implementation(project(":core:compiler.common.jvm"))
 
-    api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    api(intellijCore())
 
 }