diff --git a/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml b/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
index 120a217e8e2c..5c4d4115cc2d 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
+++ b/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
@@ -15,7 +15,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="refactoring-impl" />
-    <orderEntry type="module" module-name="codeInsight-impl" />
     <orderEntry type="module" module-name="testFramework-java" />
     <orderEntry type="module" module-name="java-impl" />
   </component>
diff --git a/plugins/IntelliLang/IntelliLangJava.iml b/plugins/IntelliLang/IntelliLangJava.iml
index 6f2eff7feaa1..b65985fa36ac 100644
--- a/plugins/IntelliLang/IntelliLangJava.iml
+++ b/plugins/IntelliLang/IntelliLangJava.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="jsp-spi" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="codeInsight-impl" />
     <orderEntry type="module" module-name="idea" />
     <orderEntry type="module" module-name="compiler-impl" />
     <orderEntry type="library" name="asm" level="project" />
diff --git a/plugins/eclipse/eclipse.iml b/plugins/eclipse/eclipse.iml
index b6790799fe37..47093465c9f4 100644
--- a/plugins/eclipse/eclipse.iml
+++ b/plugins/eclipse/eclipse.iml
@@ -11,7 +11,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="Annotations" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="bootstrap" />
     <orderEntry type="module" module-name="idea" />
@@ -20,6 +19,7 @@
     <orderEntry type="module" module-name="testFramework-java" />
     <orderEntry type="module" module-name="compiler-openapi" />
     <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="annotations" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/plugins/generate-tostring/generate-tostring.iml b/plugins/generate-tostring/generate-tostring.iml
index 470c8120e656..e4074fbc1af4 100644
--- a/plugins/generate-tostring/generate-tostring.iml
+++ b/plugins/generate-tostring/generate-tostring.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="codeInsight-impl" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="library" name="commons-collections" level="project" />
diff --git a/plugins/xpath/xpath.iml b/plugins/xpath/xpath.iml
index e1226459e4bc..fa22ce838730 100644
--- a/plugins/xpath/xpath.iml
+++ b/plugins/xpath/xpath.iml
@@ -9,7 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Annotations" />
     <orderEntry type="module" module-name="xml-openapi" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="platform-impl" />
@@ -28,13 +27,13 @@
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="library" name="commons-collections" level="project" />
-    <orderEntry type="module" module-name="codeInsight-impl" />
     <orderEntry type="module" module-name="xslt-rt" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="testFramework-java" />
     <orderEntry type="module" module-name="lvcs-impl" />
     <orderEntry type="module" module-name="jam-support-impl" />
     <orderEntry type="module" module-name="execution-openapi" />
+    <orderEntry type="module" module-name="annotations" />
   </component>
 </module>