diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml
index 117ec0eb530..1cf8d3edbb4 100644
--- a/compiler/cli/cli-common/cli-common.iml
+++ b/compiler/cli/cli-common/cli-common.iml
@@ -7,10 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" exported="" name="cli-parser" level="project" />
     <orderEntry type="library" name="jps" level="project" />
-    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/conditional-preprocessor/conditional-preprocessor.iml b/compiler/conditional-preprocessor/conditional-preprocessor.iml
index 7aeafd8efe3..3dfb88e4b48 100644
--- a/compiler/conditional-preprocessor/conditional-preprocessor.iml
+++ b/compiler/conditional-preprocessor/conditional-preprocessor.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="frontend" />
diff --git a/compiler/daemon/daemon-client/daemon-client.iml b/compiler/daemon/daemon-client/daemon-client.iml
index be3a6bd2e24..5b473410eba 100644
--- a/compiler/daemon/daemon-client/daemon-client.iml
+++ b/compiler/daemon/daemon-client/daemon-client.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
diff --git a/compiler/daemon/daemon-common/daemon-common.iml b/compiler/daemon/daemon-common/daemon-common.iml
index 3897dc90e82..ca412f7c08b 100644
--- a/compiler/daemon/daemon-common/daemon-common.iml
+++ b/compiler/daemon/daemon-common/daemon-common.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
diff --git a/compiler/daemon/daemon.iml b/compiler/daemon/daemon.iml
index 1fad4f719ab..fdfca10e112 100644
--- a/compiler/daemon/daemon.iml
+++ b/compiler/daemon/daemon.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/core/descriptors.runtime/descriptors.runtime.iml b/core/descriptors.runtime/descriptors.runtime.iml
index 2cfca739c92..eed083cae52 100644
--- a/core/descriptors.runtime/descriptors.runtime.iml
+++ b/core/descriptors.runtime/descriptors.runtime.iml
@@ -9,6 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="util.runtime" />
+    <orderEntry type="module" module-name="util.runtime" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/reflection.jvm/reflection.jvm.iml b/core/reflection.jvm/reflection.jvm.iml
index 401fe141a0d..896b733266b 100644
--- a/core/reflection.jvm/reflection.jvm.iml
+++ b/core/reflection.jvm/reflection.jvm.iml
@@ -10,6 +10,5 @@
     <orderEntry type="module" module-name="builtins" />
     <orderEntry type="module" module-name="runtime.jvm" />
     <orderEntry type="module" module-name="descriptors.runtime" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-live-templates/idea-live-templates.iml b/idea/idea-live-templates/idea-live-templates.iml
index 2849fe5e723..8a9f24e341f 100644
--- a/idea/idea-live-templates/idea-live-templates.iml
+++ b/idea/idea-live-templates/idea-live-templates.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="library" name="idea-full" level="project" />
diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml
index 22680fe41d8..c985da62526 100644
--- a/plugins/android-idea-plugin/android-idea-plugin.iml
+++ b/plugins/android-idea-plugin/android-idea-plugin.iml
@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="cli" scope="TEST" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="frontend.java" scope="TEST" />
     <orderEntry type="module" module-name="idea-live-templates" scope="TEST" />
diff --git a/plugins/annotation-collector/annotation-collector.iml b/plugins/annotation-collector/annotation-collector.iml
index 27a9e081763..712be50bc24 100644
--- a/plugins/annotation-collector/annotation-collector.iml
+++ b/plugins/annotation-collector/annotation-collector.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="module" module-name="cli" />