diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 3e2ef190a28..35bb1bf02fb 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
+    api(project(":core:deserialization:deserialization.common"))
 }
 
 sourceSets {
diff --git a/core/deserialization/deserialization.common/build.gradle.kts b/core/deserialization/deserialization.common/build.gradle.kts
index e6c0e6dc127..7fcee07160b 100644
--- a/core/deserialization/deserialization.common/build.gradle.kts
+++ b/core/deserialization/deserialization.common/build.gradle.kts
@@ -8,8 +8,8 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:metadata"))
+    api(project(":core:descriptors.common"))
     compile(project(":core:util.runtime"))
-    compile(project(":core:descriptors"))
     compile(commonDep("javax.inject"))
 }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceElement.java b/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceElement.java
rename to core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceFile.java b/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceFile.java
rename to core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java