diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
index 06223112cc7..3604d5d5d99 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
@@ -92,7 +92,7 @@ class KotlinDirtySourceFilesHolder(
     val allDirtyFiles: Set<File>
         get() = byTarget.flatMapTo(mutableSetOf()) { it.value.dirty }
 
-    val allRemovedFilesFiles
+    val allRemovedFilesFiles: Set<File>
         get() = byTarget.flatMapTo(mutableSetOf()) { it.value.removed }
 }
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt
index c6e8bb87887..545d1996354 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt
@@ -14,6 +14,7 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.java.JavaSourceRootProperties
 import org.jetbrains.jps.model.java.JavaSourceRootType
+import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.module.JpsModule
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 import org.jetbrains.kotlin.config.KotlinResourceRootType
@@ -85,6 +86,21 @@ class KotlinSourceRootProvider : AdditionalRootsProviderService<JavaSourceRootDe
                 )
             }
         }
+
+        // At the moment, incremental compilation is not supported by K2Metadata compiler.
+        // To avoid long running compilation of common modules, we do not run K2Metadata at all:
+        // instead all the common source roots are transitively added to the final platform modules.
+        JpsJavaExtensionService.dependencies(commonModule)
+            .also {
+                if (!target.isTests) it.productionOnly()
+            }
+            .processModules {
+                addCommonModuleSourceRoots(
+                    result,
+                    it,
+                    ModuleBuildTarget(it, target.targetType as JavaModuleBuildTargetType)
+                )
+            }
     }
 }