diff --git a/build.gradle.kts b/build.gradle.kts
index 75d0b1dfb06..2ea22748af5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -182,6 +182,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:psi",
     ":compiler:frontend",
     ":compiler:frontend.common",
+    ":compiler:frontend.common-psi",
     ":compiler:frontend.java",
     ":compiler:frontend:cfg",
     ":compiler:cli-common",
diff --git a/compiler/frontend.common-psi/build.gradle.kts b/compiler/frontend.common-psi/build.gradle.kts
new file mode 100644
index 00000000000..9f36da5d22a
--- /dev/null
+++ b/compiler/frontend.common-psi/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":compiler:frontend.common"))
+    api(project(":compiler:psi"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
similarity index 100%
rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
rename to compiler/frontend.common-psi/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index 53b465583cb..df050b2b238 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     compile(project(":compiler:resolution"))
     compile(project(":compiler:psi"))
     compile(project(":compiler:frontend.common"))
+    compile(project(":compiler:frontend.common-psi"))
     compile(project(":kotlin-script-runtime"))
     compile(commonDep("io.javaslang","javaslang"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/settings.gradle b/settings.gradle
index f2f304ec7d2..fb0bfec2589 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -97,6 +97,7 @@ include ":benchmarks",
         ":compiler:visualizer:render-psi",
         ":compiler:frontend",
         ":compiler:frontend.common",
+        ":compiler:frontend.common-psi",
         ":compiler:frontend.java",
         ":compiler:frontend:cfg",
         ":kotlin-compiler-runner",