diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
index bedf425fce1..084dae54d65 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
@@ -150,8 +150,11 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
             val outputDir = target.outputDir
             val friendDirs = target.friendOutputDirs
 
-            val moduleSources = collectSourcesToCompile(target, dirtyFilesHolder)
-            val commonSources = emptyList<File>() // TODO: pass common sources here
+            val moduleSources = collectSourcesToCompile(target, dirtyFilesHolder).toSet()
+            val commonSources = sources
+                .filter { it.value.isIncludedSourceRoot && it.key in moduleSources }
+                .map { it.key }
+
             val hasDirtyOrRemovedSources = checkShouldCompileAndLog(target, dirtyFilesHolder, moduleSources)
             if (hasDirtyOrRemovedSources) hasDirtySources = true
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
index 1002fa556ef..27fa5917ce1 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
@@ -180,7 +180,7 @@ abstract class KotlinModuleBuildTarget<BuildMetaInfoType : BuildMetaInfo> intern
     }
 
     /**
-     * @property isIncludedSourceRoot for reporting errors during cross-compilation common module sources
+     * @property isIncludedSourceRoot sources that are cross-compiled to multiple targets
      */
     class Source(
         val file: File,