diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 6d108e84414..70a739a6102 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:backend"))
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-reflect"))
     compile(projectTests(":compiler:tests-common"))
     compile(commonDep("junit:junit"))
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index 87be07331d2..b98617c8646 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:ir.tree"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index 7244a876719..0ce0a7cd7af 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compileOnly("org.jetbrains:annotations:13.0")
 
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts
index f541cb1c1d5..e0fb34c0c51 100644
--- a/compiler/cli/cli-runner/build.gradle.kts
+++ b/compiler/cli/cli-runner/build.gradle.kts
@@ -10,6 +10,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index d01a85dd572..da2984a9cbe 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly(project(":compiler:util"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
     runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
 }
 
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index 3d07327f33c..8ca206f0813 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -9,8 +9,10 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
     compileOnly(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(project(":kotlin-stdlib"))
+    testCompileOnly("org.jetbrains:annotations:13.0")
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index 73192de66f7..f1c2c1ba18a 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 }
 
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index 13a84bc0cf2..6bfa7912b10 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":js:js.frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts
index c260a899932..69ad40d5d0a 100644
--- a/compiler/frontend.script/build.gradle.kts
+++ b/compiler/frontend.script/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index d19ff0e4c84..f02d5d12baa 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(project(":kotlin-stdlib"))
+    testCompileOnly("org.jetbrains:annotations:13.0")
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts
index c34e43582e0..8d464fe542e 100644
--- a/compiler/plugin-api/build.gradle.kts
+++ b/compiler/plugin-api/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts
index d941e847a7e..2b29239ff65 100644
--- a/compiler/preloader/build.gradle.kts
+++ b/compiler/preloader/build.gradle.kts
@@ -10,6 +10,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index b3f06407a07..683c135ccd5 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":core:descriptors"))
     compileOnly(intellijDep()) { includeJars("trove4j") }
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index d49eb1f2f2c..bcce9d0f413 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":core:descriptors"))
     compile(project(":core:deserialization"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index 642f111e36c..54cbf54caab 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -8,6 +8,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
 }
 
diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index e326954f9c1..5a045652956 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     testRuntime(intellijDep())
     testRuntime(intellijDep())
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index b3a1b610d1a..c2cfeda4473 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
     testRuntime(project(":kotlin-reflect"))
     testRuntime(intellijDep())
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 707d1d6f8c9..6a168d6bf57 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     testCompile(projectTests(":compiler"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index 928a9bbc5f5..94c695244ae 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -8,6 +8,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":core:deserialization"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index ae0a64b550b..ce7f3beb693 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     compile(project(":core:metadata.jvm"))
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 9ac94724366..5fbb27fd7b0 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
     compileOnly(project(":core:util.runtime"))
     compileOnly(project(":core:descriptors"))
     compileOnly(project(":core:descriptors.jvm"))
+    compileOnly("org.jetbrains:annotations:13.0")
 
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":generators:test-generator"))
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index c885799b26b..7afd8576373 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -9,6 +9,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-annotations-jvm"))
 }
 
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index e6c0e6dc127..54d98212bd1 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":core:descriptors"))
     compile(commonDep("javax.inject"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 20c824b80f0..951f8317b97 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -8,6 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:metadata"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index 8ea40fca9e0..54ce446e705 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -11,6 +11,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(protobufLite())
     compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 6f29bb57dab..a4d5ccbc763 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -10,6 +10,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compileOnly(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/idea/fir-view/build.gradle.kts b/idea/fir-view/build.gradle.kts
index 3e26bbc4418..f127b5c225a 100644
--- a/idea/fir-view/build.gradle.kts
+++ b/idea/fir-view/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
     compile(project(":idea:idea-core"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava", rootProject = rootProject) }
     compileOnly(intellijPluginDep("gradle")) //{ includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
 }
diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts
index 888dcbf88bc..58417128644 100644
--- a/idea/ide-common/build.gradle.kts
+++ b/idea/ide-common/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":js:js.frontend"))
     compile(project(":js:js.serializer"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep())
 }
 
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 7e105f376b1..94072a538f1 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     compile(project(":kotlin-scripting-compiler"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep()) {
         Ide.IJ191.orHigher {
             this@compileOnly.includeJars("platform-api")
diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts
index 64679287fe2..d35ad3bffea 100644
--- a/js/js.ast/build.gradle.kts
+++ b/js/js.ast/build.gradle.kts
@@ -9,7 +9,7 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep()) { includeJars("trove4j") }
 }
 
diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts
index bd20caedd3e..14acb03c152 100644
--- a/js/js.dce/build.gradle.kts
+++ b/js/js.dce/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":js:js.ast"))
     compile(project(":js:js.translator"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }
 
 sourceSets {
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index f24c2acd488..46c705338e1 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     compile(project(":js:js.ast"))
     compile(project(":js:js.parser"))
     compile(project(":js:js.serializer"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
 }
 
diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts
index 14884a562ac..9997bb7a16c 100644
--- a/js/js.parser/build.gradle.kts
+++ b/js/js.parser/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":js:js.ast"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }
 
 sourceSets {
diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts
index 368d7e00ef8..59bafe55053 100644
--- a/js/js.serializer/build.gradle.kts
+++ b/js/js.serializer/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:serialization"))
     compile(project(":js:js.ast"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }
 
 sourceSets {
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 028b560549a..905062cea3c 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     testCompileOnly(project(":compiler:frontend"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":compiler:util"))
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
     testCompile(project(":compiler:backend.js"))
     testCompile(project(":js:js.translator"))
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 79d4a66f22a..e728a3f8f65 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     compile(project(":js:js.ast"))
     compile(project(":js:js.frontend"))
     compile(project(":js:js.parser"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
     compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
 }
 
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index 805f1d8704e..4ba4bb9dc89 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     compileOnly project(':core:deserialization')
     compileOnly project(':core:descriptors.runtime')
     compileOnly project(':core:util.runtime')
+    compileOnly "org.jetbrains:annotations:13.0"
 }
 
 compileJava9Sources(
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 553b9a950ec..b436b1345ff 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -62,7 +62,9 @@ dependencies {
     shadows(project(":core:descriptors.runtime"))
     shadows(project(":core:util.runtime"))
     shadows("javax.inject:javax.inject:1")
-    shadows(project(":custom-dependencies:protobuf-lite", configuration = "default"))
+    shadows(protobufLite())
+
+    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {