diff --git a/.idea/artifacts/standalone_jps.xml b/.idea/artifacts/standalone_jps.xml
index 52ce42707df0..e520b18e085f 100644
--- a/.idea/artifacts/standalone_jps.xml
+++ b/.idea/artifacts/standalone_jps.xml
@@ -5,8 +5,6 @@
       <element id="archive" name="util.jar">
         <element id="module-output" name="intellij.platform.util" />
         <element id="module-output" name="intellij.platform.util.rt" />
-        <element id="module-output" name="intellij.platform.annotations.java5" />
-        <element id="module-output" name="intellij.platform.annotations.common" />
       </element>
       <element id="archive" name="jps-model.jar">
         <element id="module-output" name="intellij.platform.jps.model" />
@@ -46,6 +44,7 @@
       <element id="archive" name="testFramework.core.jar">
         <element id="module-output" name="intellij.platform.testFramework.core" />
       </element>
+      <element id="library" level="project" name="jetbrains-annotations-java5" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/jetbrains_annotations.xml b/.idea/libraries/jetbrains_annotations.xml
new file mode 100644
index 000000000000..7f5d687e6df8
--- /dev/null
+++ b/.idea/libraries/jetbrains_annotations.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="jetbrains-annotations" type="repository">
+    <properties maven-id="org.jetbrains:annotations:16.0.2" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/16.0.2/annotations-16.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/16.0.2/annotations-16.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jetbrains_annotations_java5.xml b/.idea/libraries/jetbrains_annotations_java5.xml
new file mode 100644
index 000000000000..952ea27dee56
--- /dev/null
+++ b/.idea/libraries/jetbrains_annotations_java5.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="jetbrains-annotations-java5" type="repository">
+    <properties maven-id="org.jetbrains:annotations-java5:16.0.2" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/16.0.2/annotations-java5-16.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/16.0.2/annotations-java5-16.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6c87522f1be1..9d28edd74416 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -537,9 +537,6 @@
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/annotations/java8/intellij.platform.annotations.iml" filepath="$PROJECT_DIR$/platform/annotations/java8/intellij.platform.annotations.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/annotations/common/intellij.platform.annotations.common.iml" filepath="$PROJECT_DIR$/platform/annotations/common/intellij.platform.annotations.common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/annotations/intellij.platform.annotations.java5.iml" filepath="$PROJECT_DIR$/platform/annotations/intellij.platform.annotations.java5.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" filepath="$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/build-scripts/intellij.platform.buildScripts.iml" filepath="$PROJECT_DIR$/platform/build-scripts/intellij.platform.buildScripts.iml" />
diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
index a5ff713d048b..ebc1bcff6714 100644
--- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" exported="" name="http-client" level="project" />
     <orderEntry type="library" exported="" name="commons-logging" level="project" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 0d6bfbbd2b2b..20c2b5f9414b 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -9,7 +9,7 @@
     <orderEntry type="module" module-name="intellij.ant" />
     <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="module" module-name="intellij.platform.bootstrap" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.java.compiler.impl" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" />
diff --git a/jetCheck/intellij.tools.jetCheck.iml b/jetCheck/intellij.tools.jetCheck.iml
index a0324d9fa107..d97c29bedf1e 100644
--- a/jetCheck/intellij.tools.jetCheck.iml
+++ b/jetCheck/intellij.tools.jetCheck.iml
@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
index 1d9a0fff1372..34bfdb73388e 100644
--- a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
+++ b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" name="protobuf" level="project" />
diff --git a/jps/model-api/intellij.platform.jps.model.iml b/jps/model-api/intellij.platform.jps.model.iml
index c43f23e20d7e..f0a4d636e03e 100644
--- a/jps/model-api/intellij.platform.jps.model.iml
+++ b/jps/model-api/intellij.platform.jps.model.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml b/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
index 8b737586f445..e6a3a3115ffd 100644
--- a/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
+++ b/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />
     <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
diff --git a/platform/editor-ui-api/intellij.platform.editor.iml b/platform/editor-ui-api/intellij.platform.editor.iml
index c2e42fedc2f1..79e8768a4089 100644
--- a/platform/editor-ui-api/intellij.platform.editor.iml
+++ b/platform/editor-ui-api/intellij.platform.editor.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
diff --git a/platform/editor-ui-ex/intellij.platform.editor.ex.iml b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
index 0b8734ebe0a1..989d24dd80b0 100644
--- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml
+++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/platform/external-system-api/intellij.platform.externalSystem.iml b/platform/external-system-api/intellij.platform.externalSystem.iml
index f2ffa24c096a..c19571918400 100644
--- a/platform/external-system-api/intellij.platform.externalSystem.iml
+++ b/platform/external-system-api/intellij.platform.externalSystem.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
diff --git a/platform/external-system-rt/intellij.platform.externalSystem.rt.iml b/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
index 66bb6eb64126..d530bef4b953 100644
--- a/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
+++ b/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index 45a2e5416b92..c5ae7979d003 100644
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" exported="" name="tcServiceMessages" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/platform/util-rt/intellij.platform.util.rt.iml b/platform/util-rt/intellij.platform.util.rt.iml
index fffb338d98b2..dd0220749e07 100644
--- a/platform/util-rt/intellij.platform.util.rt.iml
+++ b/platform/util-rt/intellij.platform.util.rt.iml
@@ -10,6 +10,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/util/intellij.platform.util.iml b/platform/util/intellij.platform.util.iml
index 9aa64a3f67f6..3a006aa38888 100644
--- a/platform/util/intellij.platform.util.iml
+++ b/platform/util/intellij.platform.util.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="intellij.platform.resources.en" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" exported="" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
diff --git a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
index 8f592ed517b9..e95533ae58d8 100644
--- a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
+++ b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
diff --git a/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml b/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
index 78b7f83930c3..67bc5ec48a9b 100644
--- a/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
+++ b/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
@@ -8,6 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml
index 1c09f8f4c313..ee940fba55b4 100644
--- a/plugins/coverage-common/intellij.platform.coverage.iml
+++ b/plugins/coverage-common/intellij.platform.coverage.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.extensions" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" exported="" name="ASM" level="project" />
     <orderEntry type="library" exported="" name="intellij-coverage" level="project" />
     <orderEntry type="library" exported="" name="intellij-test-discovery" level="project" />
diff --git a/plugins/eclipse/intellij.eclipse.iml b/plugins/eclipse/intellij.eclipse.iml
index cbd0b9e89be0..865feda8a3ee 100644
--- a/plugins/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.java.ui" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.eclipse.jps" />
     <orderEntry type="module" module-name="intellij.eclipse.common" />
diff --git a/plugins/git4idea/rt/intellij.vcs.git.rt.iml b/plugins/git4idea/rt/intellij.vcs.git.rt.iml
index cfc29339a4b8..419689838023 100644
--- a/plugins/git4idea/rt/intellij.vcs.git.rt.iml
+++ b/plugins/git4idea/rt/intellij.vcs.git.rt.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />
     <orderEntry type="library" name="trilead-ssh2" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
diff --git a/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml b/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
index bb894f80c4cb..65f6de9206f3 100644
--- a/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
+++ b/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
     <orderEntry type="library" name="Gradle" level="project" />
diff --git a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
index 99c6a681bda4..7c90d89226b4 100644
--- a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
+++ b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
@@ -8,7 +8,7 @@
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Groovy" level="project" />
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
index 85a2dea7165f..02a7f4a3bddb 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="library" name="Gradle" level="project" />
diff --git a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
index e2fe96446ff4..f0cc973bccf4 100644
--- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
+++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.extensions" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />
diff --git a/plugins/properties/intellij.properties.iml b/plugins/properties/intellij.properties.iml
index c004874e5075..0dec248b0b90 100644
--- a/plugins/properties/intellij.properties.iml
+++ b/plugins/properties/intellij.properties.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.java.resources" scope="TEST" />
diff --git a/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml b/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml
index 2676e6c95ab1..06eca05bc29e 100644
--- a/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml
+++ b/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.annotations" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml
index 786933fe20b5..6f30a86fd65f 100644
--- a/plugins/xpath/intellij.xpath.iml
+++ b/plugins/xpath/intellij.xpath.iml
@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.xslt.debugger.rt" />
     <orderEntry type="module" module-name="intellij.platform.lvcs.impl" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" name="Jaxen" level="project" />
     <orderEntry type="module" module-name="intellij.java.resources.en" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/xml/xml-analysis-api/intellij.xml.analysis.iml b/xml/xml-analysis-api/intellij.xml.analysis.iml
index 7f4363f47dbd..7de6b7c0a5b1 100644
--- a/xml/xml-analysis-api/intellij.xml.analysis.iml
+++ b/xml/xml-analysis-api/intellij.xml.analysis.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.xml.psi" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="library" exported="" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" exported="" />
     <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />