diff --git a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
index 2bb268c3347..75aba5d4052 100644
--- a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
+++ b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="library" exported="" name="android-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
diff --git a/idea/idea-android/idea-android.iml b/idea/idea-android/idea-android.iml
index 45650c979ad..07755e96533 100644
--- a/idea/idea-android/idea-android.iml
+++ b/idea/idea-android/idea-android.iml
@@ -8,8 +8,8 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="library" exported="" name="android-plugin" level="project" />
     <orderEntry type="module" module-name="idea" />
     <orderEntry type="module" module-name="ide-common" />
diff --git a/idea/idea-gradle/idea-gradle.iml b/idea/idea-gradle/idea-gradle.iml
index 0e961ca52c6..fec406832fc 100644
--- a/idea/idea-gradle/idea-gradle.iml
+++ b/idea/idea-gradle/idea-gradle.iml
@@ -8,13 +8,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" name="junit-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="module" module-name="frontend.script" />
diff --git a/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml b/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml
index 63c499150b1..a43b98b013e 100644
--- a/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml
+++ b/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml
@@ -19,7 +19,7 @@
     </content>
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/allopen/allopen-ide/allopen-ide.iml b/plugins/allopen/allopen-ide/allopen-ide.iml
index 7ad157ddde3..f16e03d64f3 100644
--- a/plugins/allopen/allopen-ide/allopen-ide.iml
+++ b/plugins/allopen/allopen-ide/allopen-ide.iml
@@ -12,10 +12,10 @@
     <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="allopen-cli" />
     <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="idea" />
     <orderEntry type="module" module-name="idea-maven" />
-    <orderEntry type="library" name="maven" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="util" />
diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
index 9ebcf15b029..244da119acc 100644
--- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
+++ b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
@@ -21,7 +21,7 @@
     <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" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="backend" />
diff --git a/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml b/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml
index fa84a7b253a..8f7c0749415 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml
+++ b/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml
@@ -12,8 +12,8 @@
     <orderEntry type="module" module-name="idea-maven" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="maven" level="project" />
-    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="idea-jps-common" />