diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt
index a278bb552e3..a3f65856d15 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt
@@ -16,17 +16,29 @@
 
 package org.jetbrains.kotlin.native.interop.gen
 
+import org.jetbrains.kotlin.konan.library.KonanLibrary
 import org.jetbrains.kotlin.native.interop.indexer.*
 
 interface Imports {
     fun getPackage(location: Location): String?
 }
 
-class ImportsImpl(internal val headerIdToPackage: Map<HeaderId, String>) : Imports {
 
-    override fun getPackage(location: Location): String? =
-            headerIdToPackage[location.headerId]
+class PackageInfo(val name: String, val library: KonanLibrary)
 
+class ImportsImpl(internal val headerIdToPackage: Map<HeaderId, PackageInfo>) : Imports {
+
+    override fun getPackage(location: Location): String? {
+        val packageInfo = headerIdToPackage[location.headerId]
+                ?: return null
+        accessedLibraries += packageInfo.library
+        return packageInfo.name
+    }
+
+    private val accessedLibraries = mutableSetOf<KonanLibrary>()
+
+    val requiredLibraries: Set<KonanLibrary>
+        get() = accessedLibraries.toSet()
 }
 
 class HeaderInclusionPolicyImpl(private val nameGlobs: List<String>) : HeaderInclusionPolicy {
diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
index 702a2106ef8..3680535f575 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.Distribution
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.library.KotlinLibrary
+import org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverImpl
 import org.jetbrains.kotlin.library.resolver.impl.libraryResolver
 import org.jetbrains.kotlin.library.toUnresolvedLibraries
 import org.jetbrains.kotlin.util.removeSuffixIfPresent
@@ -109,7 +110,7 @@ private fun parseImports(dependencies: List<KotlinLibrary>): ImportsImpl =
             // TODO: handle missing properties?
             library.packageFqName?.let { packageFqName ->
                 val headerIds = library.includedHeaders
-                headerIds.map { HeaderId(it) to packageFqName }
+                headerIds.map { HeaderId(it) to PackageInfo(packageFqName, library) }
             }
         }.reversed().flatten().toMap().let(::ImportsImpl)
 
@@ -225,8 +226,10 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
         }
     }
 
+    val resolver = getLibraryResolver(cinteropArguments, tool.target)
+
     val allLibraryDependencies = when (flavor) {
-        KotlinPlatform.NATIVE -> resolveDependencies(cinteropArguments, tool.target)
+        KotlinPlatform.NATIVE -> resolveDependencies(resolver, cinteropArguments)
         else -> listOf()
     }
 
@@ -337,6 +340,11 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
             argsToCompiler(staticLibraries, libraryPaths) + bitcodePaths
         }
         is StubIrDriver.Result.Metadata -> {
+            val stdlibDependency = resolver.resolveWithDependencies(
+                    emptyList(),
+                    noDefaultLibs = true,
+                    noEndorsedLibs = true
+            ).getFullList()
             createInteropLibrary(
                     metadata = stubIrOutput.metadata,
                     nativeBitcodeFiles = compiledFiles + nativeOutputPath,
@@ -344,7 +352,7 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
                     moduleName = moduleName,
                     outputPath = cinteropArguments.output,
                     manifest = def.manifestAddendProperties,
-                    dependencies = allLibraryDependencies,
+                    dependencies = stdlibDependency + imports.requiredLibraries.toList(),
                     nopack = cinteropArguments.nopack
             )
             return null
@@ -366,19 +374,25 @@ private fun compileSources(
     outputFileName
 }
 
-private fun resolveDependencies(
+private fun getLibraryResolver(
         cinteropArguments: CInteropArguments, target: KonanTarget
-): List<KotlinLibrary> {
+): KotlinLibraryResolverImpl<KonanLibrary> {
     val libraries = cinteropArguments.library
     val repos = cinteropArguments.repo
-    val noDefaultLibs = cinteropArguments.nodefaultlibs || cinteropArguments.nodefaultlibsDeprecated
-    val noEndorsedLibs = cinteropArguments.noendorsedlibs
-    val resolver = defaultResolver(
+    return defaultResolver(
             repos,
             libraries.filter { it.contains(org.jetbrains.kotlin.konan.file.File.separator) },
             target,
             Distribution()
     ).libraryResolver()
+}
+
+private fun resolveDependencies(
+        resolver: KotlinLibraryResolverImpl<KonanLibrary>, cinteropArguments: CInteropArguments
+): List<KotlinLibrary> {
+    val libraries = cinteropArguments.library
+    val noDefaultLibs = cinteropArguments.nodefaultlibs || cinteropArguments.nodefaultlibsDeprecated
+    val noEndorsedLibs = cinteropArguments.noendorsedlibs
     return resolver.resolveWithDependencies(
             libraries.toUnresolvedLibraries,
             noStdLib = false,