diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
index fe04184dd75..33e6e9062d6 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
@@ -58,7 +58,8 @@ internal fun Context.psiToIr(
 
     val stubGenerator = DeclarationStubGeneratorImpl(
             moduleDescriptor, symbolTable,
-            generatorContext.irBuiltIns
+            generatorContext.irBuiltIns,
+            KonanManglerDesc
     )
     val irBuiltInsOverDescriptors = generatorContext.irBuiltIns as IrBuiltInsOverDescriptors
     val functionIrClassFactory: KonanIrAbstractDescriptorBasedFunctionFactory =
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIdSignaturer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIdSignaturer.kt
index 67e2132420b..0d1bfa448a4 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIdSignaturer.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIdSignaturer.kt
@@ -11,12 +11,11 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
 class KonanIdSignaturer(private val mangler: KotlinMangler.DescriptorMangler) : IdSignatureDescriptor(mangler) {
 
     override fun createSignatureBuilder(type: SpecialDeclarationType): DescriptorBasedSignatureBuilder =
-            KonanDescriptorBasedSignatureBuilder(mangler, type)
+            KonanDescriptorBasedSignatureBuilder(type)
 
     private inner class KonanDescriptorBasedSignatureBuilder(
-            mangler: KotlinMangler.DescriptorMangler,
             type: SpecialDeclarationType
-    ) : DescriptorBasedSignatureBuilder(mangler, type) {
+    ) : DescriptorBasedSignatureBuilder(type) {
 
         /**
          * We need a way to distinguish interop declarations from usual ones
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
index 5dfcf240a51..5ec53839a25 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
@@ -569,7 +569,7 @@ internal class KonanIrLinker(
 
         private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
                 moduleDescriptor, KonanManglerDesc,
-                DescriptorByIdSignatureFinder.LookupMode.MODULE_ONLY
+                DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
         )
 
         private fun IdSignature.isInteropSignature() = IdSignature.Flags.IS_NATIVE_INTEROP_LIBRARY.test()
@@ -623,7 +623,7 @@ internal class KonanIrLinker(
 
         private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
                 moduleDescriptor, KonanManglerDesc,
-                DescriptorByIdSignatureFinder.LookupMode.MODULE_ONLY
+                DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
         )
 
         override fun contains(idSig: IdSignature) =