diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/CInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/CInteropTask.kt
index 987eaa214ef..c52509b2741 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/CInteropTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/CInteropTask.kt
@@ -108,7 +108,9 @@ open class CInteropTask @Inject constructor(val settings: CInteropSettingsImpl):
             addArgs("-copt", allHeadersDirs.map { "-I${it.absolutePath}" })
             addArgs("-headerFilterAdditionalSearchPrefix", headerFilterDirs.map { it.absolutePath })
 
-            libraries.files.forEach {
+            libraries.files.filter {
+                it.extension == "klib"
+            }.forEach {
                 addArg("-l", it.absolutePath)
             }
 
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
index 6c2e8c3d80c..d9384b8bacd 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
@@ -158,7 +158,9 @@ open class KotlinNativeCompile @Inject constructor(internal val binary: Abstract
 
             addAll(additionalCompilerOptions)
 
-            libraries.files.forEach {
+            libraries.files.filter {
+                it.extension == "klib"
+            }.forEach {
                 addArg("-l", it.absolutePath)
             }
 
diff --git a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
index 04e56141c03..d5181780f6d 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
+++ b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
@@ -932,6 +932,11 @@ class ExperimentalPluginTests {
 
                 kotlin {
                     sourceSets {
+                        commonMain {
+                            dependencies {
+                                implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
+                            }
+                        }
                         wasmMain {
                             dependencies {
                                 implementation 'test:native-producer:1.0'
@@ -973,6 +978,8 @@ class ExperimentalPluginTests {
 
                 repositories {
                     maven { url '$repoPath' }
+                    maven { url "${MultiplatformSpecification.KOTLIN_REPO}" }
+                    jcenter()
                 }
 
                 sourceSets.main.component {