diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBackendClassResolver.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBackendClassResolver.kt
new file mode 100644
index 00000000000..352a6b06d20
--- /dev/null
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBackendClassResolver.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
+import org.jetbrains.org.objectweb.asm.Type
+
+interface JvmBackendClassResolver {
+    fun resolveToClassDescriptors(type: Type): List<ClassDescriptor>
+
+    object Dummy : JvmBackendClassResolver {
+        override fun resolveToClassDescriptors(type: Type): List<ClassDescriptor> = emptyList()
+    }
+}
+
+
+class JvmBackendClassResolverForModuleWithDependencies(
+    private val moduleDescriptor: ModuleDescriptor
+) : JvmBackendClassResolver {
+
+    override fun resolveToClassDescriptors(type: Type): List<ClassDescriptor> {
+        if (type.sort != Type.OBJECT) return emptyList()
+
+        val className = type.className
+        val lastDotIndex = className.lastIndexOf('.')
+        val packageFQN = if (lastDotIndex >= 0) FqName(className.substring(0, lastDotIndex)) else FqName.ROOT
+        val classRelativeNameWithDollars = if (lastDotIndex >= 0) className.substring(lastDotIndex + 1) else className
+        val classFQN = FqName(classRelativeNameWithDollars.replace('$', '.'))
+        val platformClass = moduleDescriptor.findClassAcrossModuleDependencies(ClassId(packageFQN, classFQN, false)) ?: return emptyList()
+
+        return JavaToKotlinClassMap.mapPlatformClass(platformClass) + platformClass
+    }
+}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 804aa162128..29097fac87c 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -51,7 +51,8 @@ class GenerationState private constructor(
     moduleName: String?,
     val outDirectory: File?,
     private val onIndependentPartCompilationEnd: GenerationStateEventCallback,
-    wantsDiagnostics: Boolean
+    wantsDiagnostics: Boolean,
+    val jvmBackendClassResolver: JvmBackendClassResolver
 ) {
 
     class Builder(
@@ -94,11 +95,16 @@ class GenerationState private constructor(
         fun wantsDiagnostics(v: Boolean) =
             apply { wantsDiagnostics = v }
 
+        var jvmBackendClassResolver: JvmBackendClassResolver = JvmBackendClassResolverForModuleWithDependencies(module); private set
+        fun jvmBackendClassResolver(v: JvmBackendClassResolver) =
+            apply { jvmBackendClassResolver = v }
+
         fun build() =
             GenerationState(
                 project, builderFactory, module, bindingContext, files, configuration,
                 generateDeclaredClassFilter, codegenFactory, targetId,
-                moduleName, outDirectory, onIndependentPartCompilationEnd, wantsDiagnostics
+                moduleName, outDirectory, onIndependentPartCompilationEnd, wantsDiagnostics,
+                jvmBackendClassResolver
             )
     }