diff --git a/java/java-analysis-impl/java-analysis-impl.iml b/java/java-analysis-impl/java-analysis-impl.iml
index 745f84e2ed6b..c3f33d642544 100644
--- a/java/java-analysis-impl/java-analysis-impl.iml
+++ b/java/java-analysis-impl/java-analysis-impl.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="projectModel-impl" exported="" />
     <orderEntry type="module" module-name="java-analysis-api" exported="" />
     <orderEntry type="module" module-name="resources-en" />
-    <orderEntry type="module" module-name="xml-psi-api" />
+    <orderEntry type="module" module-name="xml-psi-impl" />
   </component>
 </module>
 
diff --git a/java/java-psi-impl/src/com/intellij/lexer/JavaHighlightingLexer.java b/java/java-analysis-impl/src/com/intellij/lexer/JavaHighlightingLexer.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/lexer/JavaHighlightingLexer.java
rename to java/java-analysis-impl/src/com/intellij/lexer/JavaHighlightingLexer.java
diff --git a/java/java-psi-impl/java-psi-impl.iml b/java/java-psi-impl/java-psi-impl.iml
index 53fd9a7cb31c..89e9dba328f0 100644
--- a/java/java-psi-impl/java-psi-impl.iml
+++ b/java/java-psi-impl/java-psi-impl.iml
@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="core-impl" exported="" />
     <orderEntry type="module" module-name="resources-en" />
     <orderEntry type="library" name="asm4" level="project" />
-    <orderEntry type="module" module-name="xml-psi-impl" />
   </component>
 </module>