diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 68019af0a4ec..54421bc47be8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -28,7 +28,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.QuickFixFactory;
 import com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider;
 import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider;
-import com.intellij.lang.StdLanguages;
 import com.intellij.lang.findUsages.LanguageFindUsages;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.diagnostic.Logger;
diff --git a/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
index cdffdd65f297..851813c92ec4 100644
--- a/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
+++ b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
@@ -15,9 +15,7 @@
  */
 package com.intellij.psi.impl.source.jsp.jspJava;
 
-import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiSyntheticClass;
-import com.intellij.psi.SyntheticElement;
 import com.intellij.psi.jsp.JspFile;
 
 /**
diff --git a/platform/lang-api/src/com/intellij/psi/ContributedReferenceHost.java b/platform/core-api/src/com/intellij/psi/ContributedReferenceHost.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ContributedReferenceHost.java
rename to platform/core-api/src/com/intellij/psi/ContributedReferenceHost.java
diff --git a/platform/lang-api/src/com/intellij/psi/ExternallyDefinedPsiElement.java b/platform/core-api/src/com/intellij/psi/ExternallyDefinedPsiElement.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ExternallyDefinedPsiElement.java
rename to platform/core-api/src/com/intellij/psi/ExternallyDefinedPsiElement.java
diff --git a/platform/lang-api/src/com/intellij/psi/FileResolveScopeProvider.java b/platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/FileResolveScopeProvider.java
rename to platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java
diff --git a/platform/lang-api/src/com/intellij/psi/PsiDocCommentBase.java b/platform/core-api/src/com/intellij/psi/PsiDocCommentBase.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/PsiDocCommentBase.java
rename to platform/core-api/src/com/intellij/psi/PsiDocCommentBase.java
diff --git a/platform/lang-api/src/com/intellij/psi/SyntheticElement.java b/platform/core-api/src/com/intellij/psi/SyntheticElement.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/SyntheticElement.java
rename to platform/core-api/src/com/intellij/psi/SyntheticElement.java
diff --git a/platform/lang-api/src/com/intellij/psi/filters/position/PatternFilter.java b/platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/filters/position/PatternFilter.java
rename to platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java
diff --git a/platform/lang-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java b/platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java
rename to platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/IndexingDataKeys.java b/platform/core-impl/src/com/intellij/util/indexing/IndexingDataKeys.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/util/indexing/IndexingDataKeys.java
rename to platform/core-impl/src/com/intellij/util/indexing/IndexingDataKeys.java