diff --git a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java
deleted file mode 100644
index 8e365b538dde..000000000000
--- a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-package com.intellij.injected.editor;
-
-import com.intellij.openapi.util.UserDataHolderBase;
-
-/**
- * @deprecated use {@link DocumentWindow} instead
- */
-@Deprecated
-public abstract class DocumentWindowImpl extends UserDataHolderBase implements DocumentWindow {
-  public abstract int hostToInjectedUnescaped(int hostOffset);
-}
diff --git a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindowImpl.java
index a43a39308575..1bcd012bccbe 100644
--- a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindowImpl.java
+++ b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindowImpl.java
@@ -6,12 +6,14 @@ import com.intellij.openapi.util.UserDataHolderBase;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * @deprecated Use {@link EditorWindow} instead. to be removed in IDEA 2018.1
+ * @deprecated Use {@link EditorWindow} instead. To be removed in IDEA 2018.1
  */
+@Deprecated
 public abstract class EditorWindowImpl extends UserDataHolderBase implements EditorWindow {
   /**
-   * @deprecated Use {@link EditorWindow#getDelegate()} instead. to be removed in IDEA 2018.1
+   * @deprecated Use {@link EditorWindow#getDelegate()} instead. To be removed in IDEA 2018.1
    */
+  @Deprecated
   @NotNull
   @Override
   public Editor getDelegate() {
diff --git a/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java
index cf1b5af6bc00..95bb27d3190f 100644
--- a/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java
+++ b/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java
@@ -7,8 +7,9 @@ import com.intellij.testFramework.LightVirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * @deprecated Use {@link VirtualFileWindow} instead. to be removed in IDEA 2018.1
+ * @deprecated Use {@link VirtualFileWindow} instead. To be removed in IDEA 2018.1
  */
+@Deprecated
 public abstract class VirtualFileWindowImpl extends LightVirtualFile implements VirtualFileWindow {
   public VirtualFileWindowImpl(@NotNull String name,
                                Language language,
@@ -19,6 +20,7 @@ public abstract class VirtualFileWindowImpl extends LightVirtualFile implements
   /**
    * @deprecated Use {@link VirtualFileWindow#getDelegate()} instead. to be removed in IDEA 2018.1
    */
+  @Deprecated
   @NotNull
   @Override
   public VirtualFile getDelegate() {
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java
index a2cadd5f1aee..9567c76dcafc 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java
@@ -29,7 +29,7 @@ import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.List;
 
-class DocumentWindowImpl extends com.intellij.injected.editor.DocumentWindowImpl implements Disposable, DocumentWindow, DocumentEx {
+class DocumentWindowImpl extends UserDataHolderBase implements Disposable, DocumentWindow, DocumentEx {
   private static final Logger LOG = Logger.getInstance("#com.intellij.injected.editor.DocumentWindowImpl");
   private final DocumentEx myDelegate;
   private final boolean myOneLine;
@@ -775,7 +775,7 @@ class DocumentWindowImpl extends com.intellij.injected.editor.DocumentWindowImpl
   // result[i] == "" means delete
   // result[i] == string means replace
   @NotNull
-  public String[] calculateMinEditSequence(String newText) {
+  String[] calculateMinEditSequence(String newText) {
     synchronized (myLock) {
       String[] result = new String[myShreds.size()];
       String hostText = myDelegate.getText();
@@ -915,7 +915,7 @@ class DocumentWindowImpl extends com.intellij.injected.editor.DocumentWindowImpl
     }
   }
 
-  public void setShreds(@NotNull Place shreds) {
+  void setShreds(@NotNull Place shreds) {
     synchronized (myLock) {
       myShreds.dispose();
       myShreds = shreds;
@@ -923,7 +923,7 @@ class DocumentWindowImpl extends com.intellij.injected.editor.DocumentWindowImpl
   }
 
   @NotNull
-  public Place getShreds() {
+  Place getShreds() {
     synchronized (myLock) {
       return myShreds;
     }