diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
index 75a0cd46646..7c369c60e42 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.konan.exec.Command
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.Family
 import org.jetbrains.kotlin.konan.target.LinkerOutputKind
+import org.jetbrains.kotlin.konan.target.PlatformManager
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.util.regex.Pattern
@@ -481,7 +482,8 @@ open class KonanDynamicTest : KonanStandaloneTest() {
 
     private fun clang() {
         val log = ByteArrayOutputStream()
-        val plugin = project.extensions.getByType<ExecClang>()
+        val platformManager = project.extensions.getByType<PlatformManager>()
+        val plugin = ExecClang.create(project.objects, platformManager)
         val artifactsDir = "$outputDirectory/${project.testTarget}"
 
         fun flagsContain(opt: String) = project.globalTestArgs.contains(opt) || flags.contains(opt)
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
index 15c12af7331..b26b1f996a7 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cpp.*
 import org.jetbrains.kotlin.dependencies.NativeDependenciesExtension
 import org.jetbrains.kotlin.dependencies.NativeDependenciesPlugin
 import org.jetbrains.kotlin.konan.target.KonanTarget
+import org.jetbrains.kotlin.konan.target.PlatformManager
 import org.jetbrains.kotlin.konan.target.SanitizerKind
 import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer
 import org.jetbrains.kotlin.konan.target.TargetWithSanitizer
@@ -205,7 +206,8 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) :
         }
 
         private val compilationDatabase = project.extensions.getByType<CompilationDatabaseExtension>()
-        private val execClang = project.extensions.getByType<ExecClang>()
+        private val platformManager = project.extensions.getByType<PlatformManager>()
+        private val execClang = ExecClang.create(project.objects, platformManager)
         private val nativeDependencies = project.extensions.getByType<NativeDependenciesExtension>()
 
         /**
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index 9af3b1221c6..a4d6aec91d7 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -88,7 +88,6 @@ void setupHostAndTarget() {
 
 void setupClang(Project project) {
     project.extensions.platformManager = project.project(":kotlin-native").ext.platformManager
-    project.extensions.execClang = org.jetbrains.kotlin.ExecClang.create(project)
 }
 
 configurations {