diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
index 21ec18286c0..3219774c4b2 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
@@ -57,8 +57,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
             new ImportPath("java.lang.*"),
             new ImportPath("kotlin.*"),
             new ImportPath("kotlin.jvm.*"),
-            new ImportPath("kotlin.io.*"),
-            new ImportPath("kotlin.reflect.*")
+            new ImportPath("kotlin.io.*")
     );
 
     public static class JvmSetup extends BasicSetup {
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt
index cc80b293bf7..d83348c141c 100644
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt
+++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberProperty
+
 class A {
     class object {
         val ref: KMemberProperty<A, String> = A::foo
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt
index 21971bd98a0..a762b05c1df 100644
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt
+++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt
@@ -1,3 +1,4 @@
+import kotlin.reflect.KMemberProperty
 import kotlin.reflect.jvm.accessible
 
 class Result {
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt
index 25d98f9e51a..19a42534cb0 100644
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt
+++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt
@@ -1,3 +1,4 @@
+import kotlin.reflect.KMutableMemberProperty
 import kotlin.reflect.jvm.accessible
 
 class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
index 11bb1bd83fc..462064ebe54 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A {
     fun main() {
         val x = ::A
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
index c23a053d56d..fcbf938987f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A
 class B
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
index fa6faa6831e..3b8fe60c2ba 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A
 
 class B {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
index e1df8095685..8ce80f50e2b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
index 025c7684eea..52f172c7abf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
@@ -12,6 +12,8 @@ class A {
 
 package other
 
+import kotlin.reflect.*
+
 import first.A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
index 1e7843a21a2..f38f0066a55 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
@@ -12,6 +12,8 @@ fun A.baz() {}
 
 package other
 
+import kotlin.reflect.KExtensionFunction0
+
 import first.A
 import first.foo
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
index b00730fd8d5..9ae2ffb4b6f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
@@ -10,6 +10,8 @@ fun baz() = "OK"
 
 package other
 
+import kotlin.reflect.*
+
 import first.foo
 import first.bar
 import first.baz
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
index 1d0677bd72b..28a873e4de2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun main() {
         val x = ::foo
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
index 36ded52ce56..14c0c8d8e07 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun A.main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
index 6140d60cfa3..c3007c9c8d1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class B
 
 class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
index ce3c841e007..65b9ae17169 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun A.foo() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt
index f6fb90d4f42..2651906c74d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun foo() {}
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
index 3486f124379..2d8d3ebcb59 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 class A<T>(val t: T) {
     fun foo(): T = t
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
index 72a822aefa6..d9054508aab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 class A {
     inner class Inner
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
index 41425e238cb..c5d6df1fda4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 class A {
     inner class Inner
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
index 578e4af8c80..e34e9399877 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 class A {
     inner class Inner
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
index 17b77ce4c47..68c1740041f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 fun main() {
     class A
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
index 51b7e12ce2c..4ef1b50c476 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 fun main() {
     class A
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
index 9b9803bf138..0bcab8a24d6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 fun main() {
     class A
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
index 8265c3f8b34..3f14d265479 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 fun main() {
     class A
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
index 635d0f5dad0..14620b7956e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 fun main() {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
index c9667d03acc..bdcd5d1a5ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
index 75887872fee..63bda446c3a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 fun main() {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
index e98cf12bdb7..38f840c4c01 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
index 58aec0eb4db..0ab329ba58b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
@@ -8,6 +8,8 @@ class D {
 
 // FILE: b.kt
 
+import kotlin.reflect.KMemberFunction0
+
 fun main() {
     val x = a.b.c.D::foo
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
index 78b70bd0dbd..2c7a0a4113d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
@@ -8,6 +8,8 @@ class D<E, F> {
 
 // FILE: b.kt
 
+import kotlin.reflect.KMemberFunction2
+
 fun main() {
     val x = a.b.c.D<String, Int>::foo
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
index 1cf9d13122f..ff31682084e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
index 4b49761e193..548a84bf43b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
index 8dc01bad473..83705355ae4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
index a54d91d3d42..22162d65a52 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun foo() {}
     fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
index a51da3e20b5..2cdcc7910eb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A {
     class Nested
     
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
index c874250ee53..007cf137c21 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A {
     class Nested
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
index 9bf36c2d77a..d464aa9de07 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KFunction0
+
 class A {
     class Nested
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
index 273da3b2b73..b3e8a6756af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 class A {
     fun foo() = 42
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
index bb33818fe4b..b6f1f6a9d49 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberFunction0
+
 fun foo() {}
 
 class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
index 1dae56d6c7b..d71da504022 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
@@ -12,6 +12,8 @@ fun A.baz(<!UNUSED_PARAMETER!>x<!>: String) {}
 
 // FILE: b.kt
 
+import kotlin.reflect.*
+
 import other.foo as foofoo
 import other.A as AA
 import other.baz as bazbaz
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
index 7c3660f0ce3..25908ce1b8b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 fun foo() {}
 fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
 fun baz() = "OK"
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
index f18c7b46a44..c39d37b241d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun foo() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
index bffbab043f6..7d717d2d4e6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A
 
 fun foo() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
index fc7d114c8bf..f3d0b9a7bd3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 fun foo() {}
 fun bar(<!UNUSED_PARAMETER!>x<!>: Int) {}
 fun baz() = "OK"
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt
index 5054f0a717c..55c17425814 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberProperty
+
 trait Base {
     val x: Any
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt
index d3081f85a95..8c533fbc044 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberProperty
+
 open class Base {
     val foo: Int = 42
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt
index f99c615756a..f4686a586d8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A(var g: A) {
     val f: Int = 0
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt
index 581b698c8e4..a15f054d3ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     fun test() {
         ::foo : KExtensionProperty<A, String>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt
index 9a2b860ecb1..3fcedb39072 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 val String.countCharacters: Int
     get() = length
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt
index 4e89f7155d6..9b1ff0d1b05 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.KMemberProperty
+
 class A<T>(val t: T) {
     val foo: T = t
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt
index fa2f1f436ec..18ec86372b4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt
@@ -13,6 +13,8 @@ public class JavaClass {
 
 // FILE: test.kt
 
+import kotlin.reflect.*
+
 fun test() {
     JavaClass::publicFinal : KMemberProperty<JavaClass, Int>
     JavaClass::publicMutable : KMutableMemberProperty<JavaClass, Long>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt
index 555b296f0c6..51bb4a55793 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt
@@ -15,6 +15,8 @@ public class JavaClass {
 
 import JavaClass.*
 
+import kotlin.reflect.*
+
 fun test() {
     ::publicFinal : KTopLevelProperty<String>
     ::publicMutable : KMutableTopLevelProperty<Any?>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt
index 091e60a2893..624022a2b87 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     val foo: Unit = Unit.VALUE
     var bar: String = ""
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt
index 93e5bb0601c..a95d1dbfc39 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 class A {
     val foo: Int = 42
     var bar: String = ""
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt
index 88ca4f1037d..8069c3ae562 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt
@@ -1,3 +1,5 @@
+import kotlin.reflect.*
+
 var x: Int = 42
 val y: String get() = "y"
 
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
index 0164fcbc513..99ccfa51476 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
@@ -16,4 +16,6 @@
 
 package kotlin.reflect.jvm.internal
 
+import kotlin.reflect.KCallable
+
 trait KCallableImpl<out R> : KCallable<R>
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index ca2f4efba63..442d7f9fcb6 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
@@ -16,6 +16,8 @@
 
 package kotlin.reflect.jvm.internal
 
+import kotlin.reflect.*
+
 enum class KClassOrigin {
     BUILT_IN
     KOTLIN
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KForeignMemberProperty.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KForeignMemberProperty.kt
index 97ef4430acf..1aa2139d374 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KForeignMemberProperty.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KForeignMemberProperty.kt
@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import java.lang.reflect.*
+import kotlin.reflect.*
 
 open class KForeignMemberProperty<T : Any, out R>(
         public override val name: String,
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt
index d237f450004..3872a48bf3d 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt
@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import java.lang.reflect.*
+import kotlin.reflect.*
 
 // TODO: properties of built-in classes
 
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
index 1bd38d78641..c19eafafd96 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
@@ -15,6 +15,7 @@
  */
 
 package kotlin.reflect.jvm.internal
+import kotlin.reflect.*
 
 class KPackageImpl(
         val jClass: Class<*>
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
index 335a159eeb5..76b1e61f29f 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import java.lang.reflect.*
+import kotlin.reflect.*
 
 trait KPropertyImpl<out R> : KProperty<R>, KCallableImpl<R> {
     val field: Field?
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt
index 5e58247c5e3..07b4ef66c4f 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt
@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import java.lang.reflect.*
+import kotlin.reflect.*
 
 open class KTopLevelExtensionPropertyImpl<T, out R>(
         public override val name: String,
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt
index eb765c13d08..ba15cb675f2 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt
@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import java.lang.reflect.*
+import kotlin.reflect.*
 
 open class KTopLevelVariableImpl<out R>(
         public override val name: String,
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KVariableImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KVariableImpl.kt
index 5fac1d5141a..1dacc258385 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KVariableImpl.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KVariableImpl.kt
@@ -16,6 +16,8 @@
 
 package kotlin.reflect.jvm.internal
 
+import kotlin.reflect.*
+
 trait KVariableImpl<out R> : KVariable<R>, KPropertyImpl<R>
 
 trait KMutableVariableImpl<R> : KMutableVariable<R>, KVariableImpl<R>, KMutablePropertyImpl<R>
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/factory.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/factory.kt
index 07c18b226ef..5fa0730bf36 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/factory.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/factory.kt
@@ -16,6 +16,7 @@
 
 package kotlin.reflect.jvm.internal
 
+import kotlin.reflect.*
 
 fun <T> kClass(jClass: Class<T>): KClassImpl<T> =
         KClassImpl<T>(jClass)
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/properties.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/properties.kt
index 1c7825f0489..20df3d6b801 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/properties.kt
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/properties.kt
@@ -16,6 +16,7 @@
 
 package kotlin.reflect.jvm
 
+import kotlin.reflect.*
 import kotlin.reflect.jvm.internal.*
 
 public var <R> KProperty<R>.accessible: Boolean
diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
index 0b01f55f84b..bfdd2a91803 100644
--- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
+++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
@@ -49,8 +49,7 @@ public final class AnalyzerFacadeForJS {
     public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
             new ImportPath("js.*"),
             new ImportPath("java.lang.*"),
-            new ImportPath("kotlin.*"),
-            new ImportPath("kotlin.reflect.*")
+            new ImportPath("kotlin.*")
     );
 
     private AnalyzerFacadeForJS() {