diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index ab9a29f38e4f..93009054e42c 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -29,7 +29,6 @@
     <orderEntry type="module" module-name="resources_eng" exported="" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
     <orderEntry type="library" exported="" name="microba" level="project" />
-    <orderEntry type="module" module-name="jsp-openapi" exported="" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
     <orderEntry type="module" module-name="xml-openapi" exported="" />
     <orderEntry type="module" module-name="platform-api" exported="" />
diff --git a/java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java b/java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java
new file mode 100644
index 000000000000..0c76eece3a7a
--- /dev/null
+++ b/java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java
@@ -0,0 +1,7 @@
+package com.intellij.psi;
+
+/**
+ * @author yole
+ */
+public interface PsiClassLevelDeclarationStatement extends PsiStatement {
+}
diff --git a/java/openapi/src/com/intellij/psi/util/PsiUtil.java b/java/openapi/src/com/intellij/psi/util/PsiUtil.java
index 5b4686603bad..6c56f4ab139a 100644
--- a/java/openapi/src/com/intellij/psi/util/PsiUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/PsiUtil.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.jsp.jspJava.JspClassLevelDeclarationStatement;
 import com.intellij.psi.infos.MethodCandidateInfo.ApplicabilityLevel;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.meta.PsiMetaData;
@@ -197,13 +196,13 @@ public final class PsiUtil extends PsiUtilBase {
       if (parent instanceof PsiField && ((PsiField) parent).getInitializer() == element) {
         blockSoFar = element;
       }
-      if (parent instanceof JspClassLevelDeclarationStatement) {
+      if (parent instanceof PsiClassLevelDeclarationStatement) {
         parent = parent.getParent();
       }
       if (element instanceof PsiClass && !isLocalOrAnonymousClass((PsiClass)element)) {
         break;
       }
-      if (JspPsiUtil.isInJspFile(element) && element instanceof PsiFile) {
+      if (PsiUtilBase.getTemplateLanguageFile(element) != null && element instanceof PsiFile) {
         return element;
       }
       if (element == scope) break;
@@ -246,7 +245,7 @@ public final class PsiUtil extends PsiUtilBase {
       final PsiClass aClass = ((PsiField) variable).getContainingClass();
       while (context != null && context.getParent() != aClass) {
         context = context.getParent();
-        if (context instanceof JspClassLevelDeclarationStatement) return null;
+        if (context instanceof PsiClassLevelDeclarationStatement) return null;
       }
       return context instanceof PsiMethod ?
              ((PsiMethod) context).getBody() :
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java b/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
index f7a344f09255..18d3ad570bef 100644
--- a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
+++ b/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
@@ -15,10 +15,10 @@
  */
 package com.intellij.psi.impl.source.jsp.jspJava;
 
-import com.intellij.psi.PsiStatement;
+import com.intellij.psi.PsiClassLevelDeclarationStatement;
 
 /**
  * @author peter
  */
-public interface JspClassLevelDeclarationStatement extends PsiStatement {
+public interface JspClassLevelDeclarationStatement extends PsiClassLevelDeclarationStatement {
 }