diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java
index 048b9e614782..ce9d82410b2c 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoFileNode.java
@@ -23,6 +23,7 @@ import com.intellij.ide.projectView.impl.nodes.PsiFileNode;
 import com.intellij.ide.todo.*;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.injected.editor.DocumentWindow;
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.markup.TextAttributes;
@@ -31,7 +32,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.search.TodoItemImpl;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.search.PsiTodoSearchHelper;
 import com.intellij.psi.search.TodoItem;
 import com.intellij.ui.HighlightedRegion;
@@ -107,7 +107,7 @@ public final class TodoFileNode extends PsiFileNode implements HighlightedRegion
       @Override
       public void visitElement(PsiElement element) {
         if (element instanceof PsiLanguageInjectionHost) {
-          InjectedLanguageUtil.enumerate(element, (injectedPsi, places) -> {
+          InjectedLanguageManager.getInstance(psiFile.getProject()).enumerate(element, (injectedPsi, places) -> {
             if (places.size() == 1) {
               Document document = PsiDocumentManager.getInstance(injectedPsi.getProject()).getCachedDocument(injectedPsi);
               if (!(document instanceof DocumentWindow)) return;
diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java b/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java
index 15ee864bd663..26447f25c8f7 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
@@ -92,7 +91,7 @@ public class ViewerTreeStructure extends AbstractTreeStructure {
           }
           final PsiElement psi = root.getPsi();
           if (psi instanceof PsiLanguageInjectionHost) {
-            InjectedLanguageUtil.enumerate(psi, (injectedPsi, places) -> list.add(new Inject(psi, injectedPsi)));
+            InjectedLanguageManager.getInstance(myProject).enumerate(psi, (injectedPsi, places) -> list.add(new Inject(psi, injectedPsi)));
           }
         }
         result = ArrayUtil.toObjectArray(list);
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
index b63fb75550b2..05ce187fe02f 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
@@ -288,7 +288,7 @@ public class CodeFormatterFacade {
           }
         };
         for (PsiLanguageInjectionHost host : injectionHosts) {
-          InjectedLanguageUtil.enumerate(host, visitor);
+          InjectedLanguageManager.getInstance(file.getProject()).enumerate(host, visitor);
         }
       }
     }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
index 867dcad646e2..563b959d9254 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
@@ -16,13 +16,13 @@
 
 package com.intellij.refactoring.move;
 
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceOwner;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.PsiFileReference;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashMap;
 
@@ -41,7 +41,7 @@ public class FileReferenceContextUtil {
     element.accept(new PsiRecursiveElementWalkingVisitor(true) {
       @Override public void visitElement(PsiElement element) {
         if (element instanceof PsiLanguageInjectionHost) {
-          InjectedLanguageUtil.enumerate(element, (injectedPsi, places) -> encodeFileReferences(injectedPsi));
+          InjectedLanguageManager.getInstance(element.getProject()).enumerate(element, (injectedPsi, places) -> encodeFileReferences(injectedPsi));
         }
 
         final PsiReference[] refs = element.getReferences();
@@ -88,7 +88,7 @@ public class FileReferenceContextUtil {
         }
 
         if (element instanceof PsiLanguageInjectionHost) {
-          InjectedLanguageUtil.enumerate(element, (injectedPsi, places) -> decodeFileReferences(injectedPsi));
+          InjectedLanguageManager.getInstance(element.getProject()).enumerate(element, (injectedPsi, places) -> decodeFileReferences(injectedPsi));
         }
       }
     });
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java
index 676bd531aee3..4693e553c804 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java
@@ -4,6 +4,7 @@ package com.intellij.structuralsearch;
 import com.intellij.dupLocator.iterators.ArrayBackedNodeIterator;
 import com.intellij.dupLocator.iterators.NodeIterator;
 import com.intellij.lang.Language;
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.FileType;
@@ -17,7 +18,6 @@ import com.intellij.openapi.roots.ContentIterator;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
@@ -519,7 +519,7 @@ public class Matcher {
       match(el, language);
     }
     if (element instanceof PsiLanguageInjectionHost) {
-      InjectedLanguageUtil.enumerate(element, (injectedPsi, places) -> match(injectedPsi, language));
+      InjectedLanguageManager.getInstance(project).enumerate(element, (injectedPsi, places) -> match(injectedPsi, language));
     }
   }
 
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
index d159a8eb2768..5599a4851b67 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
@@ -15,6 +15,7 @@
  */
 package org.intellij.lang.xpath.xslt;
 
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -22,7 +23,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.PsiFileEx;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.*;
 import com.intellij.psi.xml.*;
 import com.intellij.ui.LayeredIcon;
@@ -94,7 +94,7 @@ public class XsltSupport {
     final XmlAttributeValue value = attribute.getValueElement();
     if (value != null) {
       final List<PsiFile> files = new SmartList<>();
-      InjectedLanguageUtil.enumerate(value, (injectedPsi, places) -> {
+      InjectedLanguageManager.getInstance(value.getProject()).enumerate(value, (injectedPsi, places) -> {
         if (injectedPsi instanceof XPathFile) {
           files.add(injectedPsi);
         }
diff --git a/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java
index a5b6bf4f68ee..de7f0d7cbd68 100644
--- a/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java
+++ b/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java
@@ -1,9 +1,9 @@
 package com.intellij.xml.util;
 
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.html.HtmlTag;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.*;
 import com.intellij.util.Processor;
@@ -70,7 +70,7 @@ public class HtmlLinkUtil {
       for (final XmlText text : texts) {
         for (PsiElement _element : text.getChildren()) {
           if (_element instanceof PsiLanguageInjectionHost) {
-            InjectedLanguageUtil.enumerate(_element, injectedPsiVisitor);
+            InjectedLanguageManager.getInstance(_element.getProject()).enumerate(_element, injectedPsiVisitor);
           }
         }
       }
@@ -80,7 +80,7 @@ public class HtmlLinkUtil {
     if (comments != null && comments.length > 0) {
       for (final XmlComment comment : comments) {
         if (comment instanceof PsiLanguageInjectionHost) {
-          InjectedLanguageUtil.enumerate(comment, injectedPsiVisitor);
+          InjectedLanguageManager.getInstance(comment.getProject()).enumerate(comment, injectedPsiVisitor);
         }
       }
     }