diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
index 77f2ede6b623..8a30ca5153e4 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
@@ -190,7 +190,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
     return null;
   }
 
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public static ReferenceType getSuperClass(final @NotNull String baseQualifiedName, @NotNull ReferenceType checkedType) {
     if (baseQualifiedName.equals(checkedType.name())) {
       return checkedType;
@@ -266,7 +266,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
   /**
    * @deprecated Use {@link DebuggerSettingsUtils#readFilters} directly
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public static ClassFilter[] readFilters(List<? extends Element> children) {
     return DebuggerSettingsUtils.readFilters(children);
   }
@@ -274,7 +274,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
   /**
    * @deprecated Use {@link DebuggerSettingsUtils#writeFilters} directly
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public static void writeFilters(@NotNull Element parentNode,
                                   @NonNls String tagName,
                                   ClassFilter[] filters) throws WriteExternalException {
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DexDebugFacility.kt b/java/debugger/impl/src/com/intellij/debugger/impl/DexDebugFacility.kt
index 331f8c60a4de..142351c0cd56 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DexDebugFacility.kt
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DexDebugFacility.kt
@@ -4,6 +4,7 @@ package com.intellij.debugger.impl
 import com.intellij.debugger.engine.DebugProcess
 import com.intellij.debugger.jdi.VirtualMachineProxyImpl
 import com.sun.jdi.VirtualMachine
+import org.jetbrains.annotations.ApiStatus
 
 object DexDebugFacility {
     fun isDex(virtualMachine: VirtualMachine): Boolean {
@@ -11,6 +12,7 @@ object DexDebugFacility {
     }
 
     @Suppress("unused")
+    @ApiStatus.ScheduledForRemoval
     @Deprecated("Use isDex(virtualMachine)")
     fun isDex(debugProcess: DebugProcess): Boolean {
         val virtualMachineProxy = VirtualMachineProxyImpl.getCurrent()
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
index c0b0f2e68598..b7d2149b6978 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.PropertyKey;
 /**
  * @deprecated use {@link ExtendsListModCommandFix}
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public class ExtendsListFix extends LocalQuickFixAndIntentionActionOnPsiElement {
   // we don't modify this class
   @SafeFieldForPreview protected final @Nullable SmartPsiElementPointer<PsiClass> myClassToExtendFromPointer;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java
index 8a005c1072bf..9459bd16835a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java
@@ -75,7 +75,7 @@ public class AddAnnotationPsiFix extends LocalQuickFixOnPsiElement implements Lo
   /**
    * @deprecated use {@link AddAnnotationModCommandAction} instead
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public AddAnnotationPsiFix(@NotNull String fqn,
                              @NotNull PsiModifierListOwner modifierListOwner,
                              String @NotNull ... annotationsToRemove) {
@@ -96,7 +96,7 @@ public class AddAnnotationPsiFix extends LocalQuickFixOnPsiElement implements Lo
   /**
    * @deprecated use {@link AddAnnotationModCommandAction} instead
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public AddAnnotationPsiFix(@NotNull String fqn,
                              @NotNull PsiModifierListOwner modifierListOwner,
                              PsiNameValuePair @NotNull [] values,
diff --git a/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java b/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
index 41000e272fd5..470d2ce1b07c 100644
--- a/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
+++ b/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
@@ -41,7 +41,7 @@ public final class JavaProjectData extends AbstractExternalEntityData {
   /**
    * @deprecated use {@link #JavaProjectData(ProjectSystemId, String, LanguageLevel, String, List)} instead
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public JavaProjectData(
     @NotNull ProjectSystemId owner,
     @NotNull String compileOutputPath,
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java
index 371f01939220..6fd0901f7dd0 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java
@@ -4,6 +4,7 @@ package com.intellij.lang.java.lexer;
 import com.intellij.platform.syntax.psi.lexer.LexerAdapter;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.util.PsiUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.lang.java.syntax.JavaElementTypeConverterKt.getJavaElementTypeConverter;
@@ -32,6 +33,7 @@ public final class JavaLexer extends LexerAdapter {
    * @return true if a given id is a keyword at a given language level
    * @deprecated use {@link PsiUtil#isSoftKeyword(CharSequence, LanguageLevel)}
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isSoftKeyword(@NotNull CharSequence id, @NotNull LanguageLevel level) {
     return PsiUtil.isSoftKeyword(id, level);
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
index 8dc6a2a5125b..dfe1bddc38b2 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
@@ -49,6 +49,7 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.indexing.IndexingDataKeys;
 import kotlin.Unit;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
@@ -120,6 +121,7 @@ public final class JavaParserUtil {
    * @deprecated Use the new Java syntax library instead.
    * See {@link com.intellij.java.syntax.parser.JavaParser}
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static @NotNull PsiBuilder createBuilder(final LighterLazyParseableNode chameleon) {
     return createBuilder(chameleon,