diff --git a/compiler/plugin-api/plugin-api.iml b/compiler/plugin-api/plugin-api.iml
index 8fade408030..d6427e84c96 100644
--- a/compiler/plugin-api/plugin-api.iml
+++ b/compiler/plugin-api/plugin-api.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index c559bc274df..fb072c4387d 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -22,9 +22,9 @@
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.translator" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml
index a11f7b2988c..822cfd27280 100644
--- a/idea/idea-completion/idea-completion.iml
+++ b/idea/idea-completion/idea-completion.iml
@@ -8,19 +8,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
     <orderEntry type="module" module-name="idea" scope="RUNTIME" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-core/idea-core.iml b/idea/idea-core/idea-core.iml
index d49787a8c32..124d424140c 100644
--- a/idea/idea-core/idea-core.iml
+++ b/idea/idea-core/idea-core.iml
@@ -7,13 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml
index f56c8e27e35..f6f45360e40 100644
--- a/idea/idea-test-framework/idea-test-framework.iml
+++ b/idea/idea-test-framework/idea-test-framework.iml
@@ -7,12 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.inliner/js.inliner.iml b/js/js.inliner/js.inliner.iml
index 6872754b48b..4ff4bb0b001 100644
--- a/js/js.inliner/js.inliner.iml
+++ b/js/js.inliner/js.inliner.iml
@@ -11,8 +11,8 @@
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="js.dart-ast" />
     <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.parser" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.serializer/js.serializer.iml b/js/js.serializer/js.serializer.iml
index 1fa76050f80..e388cce830b 100644
--- a/js/js.serializer/js.serializer.iml
+++ b/js/js.serializer/js.serializer.iml
@@ -9,8 +9,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/android-compiler-plugin.iml b/plugins/android-compiler-plugin/android-compiler-plugin.iml
index c2670d51145..931e16a64d9 100644
--- a/plugins/android-compiler-plugin/android-compiler-plugin.iml
+++ b/plugins/android-compiler-plugin/android-compiler-plugin.iml
@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="frontend" exported="" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend" scope="PROVIDED" />
diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml
index 5a19248bec7..4e66ab33e63 100644
--- a/plugins/android-idea-plugin/android-idea-plugin.iml
+++ b/plugins/android-idea-plugin/android-idea-plugin.iml
@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" exported="" />
     <orderEntry type="library" exported="" scope="PROVIDED" name="android-plugin" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
@@ -17,5 +16,6 @@
     <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" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-jps-plugin/android-jps-plugin.iml b/plugins/android-jps-plugin/android-jps-plugin.iml
index 843a24a598f..8ba83aeb32c 100644
--- a/plugins/android-jps-plugin/android-jps-plugin.iml
+++ b/plugins/android-jps-plugin/android-jps-plugin.iml
@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="jps-plugin" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="jps" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="android-plugin" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" />
     <orderEntry type="module" module-name="util" scope="PROVIDED" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />