diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index db168dd2d83..aeefc791f57 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Build Common"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compileOnly(project(":core:util.runtime"))
diff --git a/build.gradle.kts b/build.gradle.kts
index eef40e1d965..f91c52c9aa0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -249,6 +249,9 @@ apply {
     }
 }
 
+apply { plugin("jps-compatible") }
+apply { plugin("jps-compatible-root") }
+
 fun Project.allprojectsRecursive(body: Project.() -> Unit) {
     this.body()
     this.subprojects { allprojectsRecursive(body) }
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index b84d0776c56..527d41255ea 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index 4004ff38820..db9cedcdbae 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts
index 362a0f1470d..8016c36fb5f 100644
--- a/compiler/backend/build.gradle.kts
+++ b/compiler/backend/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 862fb851b7f..904353249f4 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -4,6 +4,7 @@ import org.gradle.api.tasks.bundling.Jar
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index defd1e4afb5..bcdd49c5913 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.8"
 
diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts
index 8b11e3bf7a4..54793af9984 100644
--- a/compiler/cli/cli-common/build.gradle.kts
+++ b/compiler/cli/cli-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts
index a2f74f3e0f9..dbd7b9095d5 100644
--- a/compiler/cli/cli-runner/build.gradle.kts
+++ b/compiler/cli/cli-runner/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Runner"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index f2a60bcc605..b51cff6d205 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -4,6 +4,7 @@ import org.gradle.jvm.tasks.Jar
 description = "Compiler runner + daemon client"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/conditional-preprocessor/build.gradle.kts b/compiler/conditional-preprocessor/build.gradle.kts
index 9edc1b64e16..6c31ce6c1f7 100644
--- a/compiler/conditional-preprocessor/build.gradle.kts
+++ b/compiler/conditional-preprocessor/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index 166aea09e46..34ab0dc181e 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index e82e6234d26..16ddf7cc3b8 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index 28253d8a4b4..e24eafee2c0 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 description = "Kotlin Daemon Client"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index 103e13746c0..c254c6e150c 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts
index 4819df4e9c5..fd9535887b2 100644
--- a/compiler/frontend.java/build.gradle.kts
+++ b/compiler/frontend.java/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts
index d19c97ce414..775010db1e7 100644
--- a/compiler/frontend.script/build.gradle.kts
+++ b/compiler/frontend.script/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index 0231d3fc796..d053ff3f018 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index d9441d83c0f..c29e95ae504 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.ir2cfg/build.gradle.kts b/compiler/ir/ir.ir2cfg/build.gradle.kts
index 8a49d208449..8f8e2bf27f7 100644
--- a/compiler/ir/ir.ir2cfg/build.gradle.kts
+++ b/compiler/ir/ir.ir2cfg/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts
index 28e41af9b81..362785ebeff 100644
--- a/compiler/ir/ir.psi2ir/build.gradle.kts
+++ b/compiler/ir/ir.psi2ir/build.gradle.kts
@@ -1,4 +1,5 @@
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.tree/build.gradle.kts b/compiler/ir/ir.tree/build.gradle.kts
index 8639a547868..59ace3614da 100644
--- a/compiler/ir/ir.tree/build.gradle.kts
+++ b/compiler/ir/ir.tree/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts
index ea7108e920c..eb2f0b3bae8 100644
--- a/compiler/light-classes/build.gradle.kts
+++ b/compiler/light-classes/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts
index ab9a89c0c18..173fdce4079 100644
--- a/compiler/plugin-api/build.gradle.kts
+++ b/compiler/plugin-api/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts
index 4476f196388..c63d0def4c7 100644
--- a/compiler/preloader/build.gradle.kts
+++ b/compiler/preloader/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Preloader"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index 0f2468ddb83..65a6ab63d34 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index 04e7be31ac4..170df193680 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index c1e74486d51..acb76c9fe65 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index a6c41ef773a..fbb03a6e4cd 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testCompile(project(":core:descriptors"))
diff --git a/compiler/tests-ir-jvm/build.gradle.kts b/compiler/tests-ir-jvm/build.gradle.kts
index 42bfa906a2c..aa76b08ec88 100644
--- a/compiler/tests-ir-jvm/build.gradle.kts
+++ b/compiler/tests-ir-jvm/build.gradle.kts
@@ -1,4 +1,5 @@
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 6d90bae33c7..051ef8ef279 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index 9ccf86badc0..ad06af501f0 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index a35b8577ff7..a920ed04084 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -1,4 +1,5 @@
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index d5e4967ec49..32cc74f2e94 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -1,4 +1,5 @@
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index b47589433b5..7a48c507e54 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 7b7fc6cf1cb..9c880e9f56f 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -2,6 +2,7 @@
 apply {
     plugin("java")
     plugin("kotlin")
+    plugin("jps-compatible")
 }
 
 jvmTarget = "1.6"
diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts
index abdebd06eab..453f5c92ef7 100644
--- a/eval4j/build.gradle.kts
+++ b/eval4j/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 8c694b4d8a1..ceb0111cab2 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectTests(":compiler:cli"))
diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts
index cdf268fab1e..05bbd283ce5 100644
--- a/generators/test-generator/build.gradle.kts
+++ b/generators/test-generator/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts
index 5844b803ea9..c240ef8821c 100644
--- a/idea-runner/build.gradle.kts
+++ b/idea-runner/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compileOnly(project(":idea"))
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 3655b5e68cf..d6bfda79fa0 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.gradle.jvm.tasks.Jar
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts
index 108ad69d447..8a5b1580c25 100644
--- a/idea/formatter/build.gradle.kts
+++ b/idea/formatter/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts
index 8d04af6dd85..526414f7028 100644
--- a/idea/ide-common/build.gradle.kts
+++ b/idea/ide-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index 65d88c6331c..a8553170f43 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -2,6 +2,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 33b2a459f76..16a9a80dc00 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 26f6d461211..71737e23ead 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts
index 11220234466..43e3ac5ffd8 100644
--- a/idea/idea-jps-common/build.gradle.kts
+++ b/idea/idea-jps-common/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts
index 278d3ade4ed..cac598ece73 100644
--- a/idea/idea-jvm/build.gradle.kts
+++ b/idea/idea-jvm/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":idea"))
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index a85b9d76dc2..18e682d882e 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":core:util.runtime"))
diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts
index e10e3a3bcfb..61a76dedd55 100644
--- a/idea/idea-test-framework/build.gradle.kts
+++ b/idea/idea-test-framework/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":compiler:frontend"))
diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts
index abcd150e8df..ede2afbd2f5 100644
--- a/idea/kotlin-gradle-tooling/build.gradle.kts
+++ b/idea/kotlin-gradle-tooling/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Gradle Tooling support"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index 7ad5a3af885..11ae2c86057 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index e472eb53902..733b570e002 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -1,4 +1,5 @@
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 val compilerModules: Array<String> by rootProject.extra
 
diff --git a/jps-plugin/jps-services-declarations/build.gradle.kts b/jps-plugin/jps-services-declarations/build.gradle.kts
index fc51a1b40bc..dcf3d7b0a7e 100644
--- a/jps-plugin/jps-services-declarations/build.gradle.kts
+++ b/jps-plugin/jps-services-declarations/build.gradle.kts
@@ -10,6 +10,7 @@
  */
 
 plugins { java }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compileOnly(intellijDep()) { includeJars("annotations", "util") }
diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts
index f0ed3bb19f6..0c00ccc8cfb 100644
--- a/js/js.ast/build.gradle.kts
+++ b/js/js.ast/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts
index 08bdaa883df..446e590a2ff 100644
--- a/js/js.dce/build.gradle.kts
+++ b/js/js.dce/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index 7caa28c4f28..509f2746612 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts
index 83301a4ca3b..e9aeacd5032 100644
--- a/js/js.parser/build.gradle.kts
+++ b/js/js.parser/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts
index 1d25bdd3bc8..db575bed77c 100644
--- a/js/js.serializer/build.gradle.kts
+++ b/js/js.serializer/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index e43c6952d96..2c40fff7437 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -11,6 +11,7 @@ node {
 }
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 val antLauncherJar by configurations.creating
 
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 08462890074..18953c3654d 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index 7fc97d949ee..b652a3f5300 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin scripting support utilities"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(project(":kotlin-stdlib"))
diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts
index 8ba0f4436ca..917fdcb7ac5 100644
--- a/plugins/allopen/allopen-cli/build.gradle.kts
+++ b/plugins/allopen/allopen-cli/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin AllOpen Compiler Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts
index 4febb10fb60..28cbc34ff1a 100644
--- a/plugins/allopen/allopen-ide/build.gradle.kts
+++ b/plugins/allopen/allopen-ide/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin AllOpen IDEA Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index a1f9fcaf1f8..df7c5969969 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Android Extensions Compiler"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 val robolectricClasspath by configurations.creating
 
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 68a4b01069b..18042186a1b 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin Android Extensions IDEA"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
index 6fb8e3c719b..584b10429e2 100644
--- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
index 4ce2de4308b..d098782eaec 100644
--- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
@@ -1,6 +1,7 @@
 description = "Kotlin Android Extensions Runtime"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
index 4853c393fd1..7a1bfe84df0 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+++ b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index 13e8f7b5deb..d195374b731 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Annotation Processor for Kotlin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts
index b2039e81181..76881922a8d 100644
--- a/plugins/kapt3/kapt3-idea/build.gradle.kts
+++ b/plugins/kapt3/kapt3-idea/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts
index c18293d6c9b..6cd3ff6e98d 100644
--- a/plugins/kapt3/kapt3-runtime/build.gradle.kts
+++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts
@@ -1,6 +1,11 @@
 description = "Kotlin Annotation Processing Runtime"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
+
+dependencies {
+    compile(projectDist(":kotlin-stdlib"))
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts
index 4bf82f26601..cec7465f072 100644
--- a/plugins/lint/build.gradle.kts
+++ b/plugins/lint/build.gradle.kts
@@ -2,6 +2,7 @@
 apply {
     plugin("kotlin")
     plugin("java")
+    plugin("jps-compatible")
 }
 
 dependencies {
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index 61f3e092a54..44c2f5d2df2 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin NoArg Compiler Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts
index 1bf77f4c2b7..6b12effab4d 100644
--- a/plugins/noarg/noarg-ide/build.gradle.kts
+++ b/plugins/noarg/noarg-ide/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin NoArg IDEA Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index 639e5d0a0bb..89be4d29ac4 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin SamWithReceiver Compiler Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compileOnly(project(":compiler:frontend"))
diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
index 1763d861588..86390c90b21 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin SamWithReceiver IDEA Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 jvmTarget = "1.6"
 
diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts
index 3b5b7c0689d..1b30a8894e3 100644
--- a/plugins/source-sections/source-sections-compiler/build.gradle.kts
+++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts
@@ -2,6 +2,7 @@
 description = "Kotlin SourceSections Compiler Plugin"
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 
 dependencies {
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 34cb2ec4749..85bec180384 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index de83a5d7552..f6b4959d074 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -1,5 +1,6 @@
 
 apply { plugin("kotlin") }
+apply { plugin("jps-compatible") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))