diff --git a/samples/curl/build.gradle.kts b/samples/curl/build.gradle.kts
index 7b080269538..aeb26f73f18 100644
--- a/samples/curl/build.gradle.kts
+++ b/samples/curl/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
                 entryPoint = "sample.curl.main"
                 if (isMingwX64) {
                     // Add lib path to `libcurl` and its dependencies:
-                    linkerOpts(mingwPath.resolve("lib").toString())
+                    linkerOpts("-L${mingwPath.resolve("lib")}")
                     runTask?.environment("PATH" to mingwPath.resolve("bin"))
                 }
                 runTask?.args("https://www.jetbrains.com/")
diff --git a/samples/gitchurn/build.gradle.kts b/samples/gitchurn/build.gradle.kts
index ae82dcb7f97..825991898b3 100644
--- a/samples/gitchurn/build.gradle.kts
+++ b/samples/gitchurn/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
             executable {
                 entryPoint = "sample.gitchurn.main"
                 if (isMingwX64) {
-                    linkerOpts(mingwPath.resolve("lib").toString())
+                    linkerOpts("-L${mingwPath.resolve("lib")}")
                     runTask?.environment("PATH" to mingwPath.resolve("bin"))
                 }
                 runTask?.args(rootProject.rootDir.resolve(".."))
diff --git a/samples/gtk/build.gradle.kts b/samples/gtk/build.gradle.kts
index dc70e18b128..181ce488847 100644
--- a/samples/gtk/build.gradle.kts
+++ b/samples/gtk/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
             executable {
                 entryPoint = "sample.gtk.main"
                 if (isMingwX64) {
-                    linkerOpts(mingwPath.resolve("lib").toString())
+                    linkerOpts("-L${mingwPath.resolve("lib")}")
                     runTask?.environment("PATH" to mingwPath.resolve("bin"))
                 }
             }
@@ -50,13 +50,13 @@ kotlin {
                     }
                     presets["mingwX64"] -> {
                         listOf(
-                            "/include/atk-1.0",
-                            "/include/gdk-pixbuf-2.0",
-                            "/include/cairo",
-                            "/include/pango-1.0",
-                            "/include/gtk-3.0",
-                            "/include/glib-2.0",
-                            "/lib/glib-2.0/include"
+                            "include/atk-1.0",
+                            "include/gdk-pixbuf-2.0",
+                            "include/cairo",
+                            "include/pango-1.0",
+                            "include/gtk-3.0",
+                            "include/glib-2.0",
+                            "lib/glib-2.0/include"
                         ).forEach {
                             includeDirs(mingwPath.resolve(it))
                         }
diff --git a/samples/html5Canvas/build.gradle.kts b/samples/html5Canvas/build.gradle.kts
index a9d7bd4d7d4..e4022a79711 100644
--- a/samples/html5Canvas/build.gradle.kts
+++ b/samples/html5Canvas/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile
 
 plugins {
     kotlin("multiplatform")
@@ -43,7 +43,7 @@ kotlin {
 val jsinterop by tasks.creating(Exec::class) {
     workingDir = projectDir
 
-    val ext = if (isWindows) ".bar" else ""
+    val ext = if (isWindows) ".bat" else ""
     val distributionPath = project.properties["org.jetbrains.kotlin.native.home"] as String?
 
     if (distributionPath != null) {
@@ -73,7 +73,7 @@ val jsinterop by tasks.creating(Exec::class) {
     }
 }
 
-tasks.withType(KotlinNativeCompile::class).all {
+tasks.withType(AbstractKotlinNativeCompile::class).all {
     dependsOn(jsinterop)
 }
 
diff --git a/samples/libcurl/build.gradle.kts b/samples/libcurl/build.gradle.kts
index b3d3e70708c..f6f0bfdff67 100644
--- a/samples/libcurl/build.gradle.kts
+++ b/samples/libcurl/build.gradle.kts
@@ -39,7 +39,7 @@ kotlin {
                 when (preset) {
                     presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include")
                     presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu")
-                    presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("/include"))
+                    presets["mingwX64"] -> includeDirs.headerFilterOnly(mingwPath.resolve("include"))
                 }
             }
         }
diff --git a/samples/tetris/build.gradle.kts b/samples/tetris/build.gradle.kts
index 704b142be12..416c1160fb3 100644
--- a/samples/tetris/build.gradle.kts
+++ b/samples/tetris/build.gradle.kts
@@ -37,7 +37,7 @@ kotlin {
                     presets["linuxX64"] -> linkerOpts("-L/usr/lib64", "-L/usr/lib/x86_64-linux-gnu", "-lSDL2")
                     presets["mingwX64"], presets["mingwX86"] -> linkerOpts(
                         winCompiledResourceFile.toString(),
-                        mingwPath.resolve("lib").toString(),
+                        "-L${mingwPath.resolve("lib")}",
                         "-Wl,-Bstatic",
                         "-lstdc++",
                         "-static",
@@ -64,7 +64,7 @@ kotlin {
                 when (preset) {
                     presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
                     presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
-                    presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("/include/SDL2"))
+                    presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("include/SDL2"))
                     presets["linuxArm32Hfp"] -> includeDirs(kotlinNativeDataPath.resolve("dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2"))
                 }
             }
diff --git a/samples/videoplayer/build.gradle.kts b/samples/videoplayer/build.gradle.kts
index 8a520c100be..0ec31dd14fe 100644
--- a/samples/videoplayer/build.gradle.kts
+++ b/samples/videoplayer/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin {
                 when (preset) {
                     presets["macosX64"] -> linkerOpts("-L/opt/local/lib", "-L/usr/local/lib")
                     presets["linuxX64"] -> linkerOpts("-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib64")
-                    presets["mingwX64"] -> linkerOpts(mingwPath.resolve("lib").toString())
+                    presets["mingwX64"] -> linkerOpts("-L${mingwPath.resolve("lib")}")
                 }
             }
         }
@@ -34,14 +34,14 @@ kotlin {
                 when (preset) {
                     presets["macosX64"] -> includeDirs.headerFilterOnly("/opt/local/include", "/usr/local/include")
                     presets["linuxX64"] -> includeDirs.headerFilterOnly("/usr/include", "/usr/include/x86_64-linux-gnu", "/usr/include/ffmpeg")
-                    presets["mingwX64"] -> includeDirs(mingwPath.resolve("/include"))
+                    presets["mingwX64"] -> includeDirs(mingwPath.resolve("include"))
                 }
             }
             val sdl by creating {
                 when (preset) {
                     presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
                     presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
-                    presets["mingwX64"] -> includeDirs(mingwPath.resolve("/include/SDL2"))
+                    presets["mingwX64"] -> includeDirs(mingwPath.resolve("include/SDL2"))
                 }
             }
         }