diff --git a/compiler/daemon/daemon-client/daemon-client.iml b/compiler/daemon/daemon-client/daemon-client.iml
index 6b9384c6eb3..c0335b99f66 100644
--- a/compiler/daemon/daemon-client/daemon-client.iml
+++ b/compiler/daemon/daemon-client/daemon-client.iml
@@ -8,9 +8,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="native-platform-uberjar" level="project" />
     <orderEntry type="module" module-name="cli-common" />
+    <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/daemon/daemon-common/daemon-common.iml b/compiler/daemon/daemon-common/daemon-common.iml
index ca412f7c08b..9f464abc4b7 100644
--- a/compiler/daemon/daemon-common/daemon-common.iml
+++ b/compiler/daemon/daemon-common/daemon-common.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="descriptors" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/daemon/daemon.iml b/compiler/daemon/daemon.iml
index 8afb212e3bd..f66fb35d0c9 100644
--- a/compiler/daemon/daemon.iml
+++ b/compiler/daemon/daemon.iml
@@ -9,7 +9,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="frontend" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt b/compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
similarity index 96%
rename from compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
rename to compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
index 0f78ecd88c2..358e79af2e6 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt b/compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
similarity index 91%
rename from compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
rename to compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
index ac5292941cc..3fafb3802fa 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.load.kotlin.incremental.components
 
 import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.components.SourceRetentionAnnotationHandler
 import org.jetbrains.kotlin.modules.TargetId
 
 interface IncrementalCompilationComponents {
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
index 8c5ce90d31f..b45f2fc33fb 100644
--- a/compiler/util/util.iml
+++ b/compiler/util/util.iml
@@ -12,5 +12,6 @@
     <orderEntry type="library" exported="" name="kotlin-reflect" level="project" />
     <orderEntry type="module" module-name="Kotlin" exported="" />
     <orderEntry type="library" name="jps-model" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
   </component>
 </module>
\ No newline at end of file