diff --git a/platform/ide-core-impl/api-dump-unreviewed.txt b/platform/ide-core-impl/api-dump-unreviewed.txt
index 98ae59ddb89b..dbb84645ee5c 100644
--- a/platform/ide-core-impl/api-dump-unreviewed.txt
+++ b/platform/ide-core-impl/api-dump-unreviewed.txt
@@ -132,16 +132,6 @@ c:com.intellij.ide.impl.DataManagerImpl
 - loadFromDataContext(com.intellij.openapi.actionSystem.DataContext,com.intellij.openapi.util.Key):java.lang.Object
 - saveInDataContext(com.intellij.openapi.actionSystem.DataContext,com.intellij.openapi.util.Key,java.lang.Object):V
 - s:validateEditor(com.intellij.openapi.editor.Editor,java.awt.Component):com.intellij.openapi.editor.Editor
-a:com.intellij.ide.impl.DataValidators
-- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
-- <init>():V
-- s:arrayValidator(com.intellij.ide.impl.DataValidators$Validator):com.intellij.ide.impl.DataValidators$Validator
-- a:collectValidators(com.intellij.ide.impl.DataValidators$Registry):V
-- s:validOrNull(java.lang.Object,java.lang.String,java.lang.Object):java.lang.Object
-com.intellij.ide.impl.DataValidators$Registry
-- a:register(com.intellij.openapi.actionSystem.DataKey,com.intellij.ide.impl.DataValidators$Validator):V
-com.intellij.ide.impl.DataValidators$Validator
-- a:checkValid(java.lang.Object,java.lang.String,java.lang.Object):Z
 f:com.intellij.ide.impl.OpenProjectTask
 - sf:Companion:com.intellij.ide.impl.OpenProjectTask$Companion
 - f:asNewProject():com.intellij.ide.impl.OpenProjectTask
@@ -329,12 +319,6 @@ f:com.intellij.notification.impl.NotificationGroupEP
 - getDisplayName(com.intellij.openapi.extensions.PluginDescriptor):java.lang.String
 - getDisplayType():com.intellij.notification.NotificationDisplayType
 - setPluginDescriptor(com.intellij.openapi.extensions.PluginDescriptor):V
-f:com.intellij.notification.impl.NotificationParentGroupBean
-- id:java.lang.String
-- parentId:java.lang.String
-- title:java.lang.String
-- titlePrefix:java.lang.String
-- <init>():V
 *:com.intellij.openapi.actionSystem.DependentTransientComponent
 - a:getPermanentComponent():java.awt.Component
 f:com.intellij.openapi.actionSystem.impl.SimpleDataContext
@@ -355,99 +339,6 @@ f:com.intellij.openapi.application.impl.AWTExceptionHandler
 - <init>():V
 - handle(java.lang.Throwable):V
 - s:register():V
-f:com.intellij.openapi.editor.actions.CaretStop
-- sf:BOTH:com.intellij.openapi.editor.actions.CaretStop
-- sf:Companion:com.intellij.openapi.editor.actions.CaretStop$Companion
-- sf:END:com.intellij.openapi.editor.actions.CaretStop
-- sf:NONE:com.intellij.openapi.editor.actions.CaretStop
-- sf:START:com.intellij.openapi.editor.actions.CaretStop
-- <init>():V
-- <init>(Z):V
-- <init>(Z,Z):V
-- b:<init>(Z,Z,I,kotlin.jvm.internal.DefaultConstructorMarker):V
-- f:component1():Z
-- f:component2():Z
-- f:copy(Z,Z):com.intellij.openapi.editor.actions.CaretStop
-- bs:copy$default(com.intellij.openapi.editor.actions.CaretStop,Z,Z,I,java.lang.Object):com.intellij.openapi.editor.actions.CaretStop
-- equals(java.lang.Object):Z
-- hashCode():I
-- f:isAtEnd():Z
-- f:isAtStart():Z
-f:com.intellij.openapi.editor.actions.CaretStop$Companion
-f:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:BOTH:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:CURRENT:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:Companion:com.intellij.openapi.editor.actions.CaretStopBoundary$Companion
-- sf:END:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:NEIGHBOR:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:NONE:com.intellij.openapi.editor.actions.CaretStopBoundary
-- sf:START:com.intellij.openapi.editor.actions.CaretStopBoundary
-- <init>():V
-- <init>(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop):V
-- b:<init>(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop,I,kotlin.jvm.internal.DefaultConstructorMarker):V
-- f:component1():com.intellij.openapi.editor.actions.CaretStop
-- f:component2():com.intellij.openapi.editor.actions.CaretStop
-- f:copy(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop):com.intellij.openapi.editor.actions.CaretStopBoundary
-- bs:copy$default(com.intellij.openapi.editor.actions.CaretStopBoundary,com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop,I,java.lang.Object):com.intellij.openapi.editor.actions.CaretStopBoundary
-- equals(java.lang.Object):Z
-- f:getBackward():com.intellij.openapi.editor.actions.CaretStop
-- f:getForward():com.intellij.openapi.editor.actions.CaretStop
-- hashCode():I
-f:com.intellij.openapi.editor.actions.CaretStopBoundary$Companion
-f:com.intellij.openapi.editor.actions.CaretStopOptions
-- <init>():V
-- <init>(com.intellij.openapi.editor.actions.CaretStopPolicy,com.intellij.openapi.editor.actions.CaretStopPolicy):V
-- f:component1():com.intellij.openapi.editor.actions.CaretStopPolicy
-- f:component2():com.intellij.openapi.editor.actions.CaretStopPolicy
-- f:copy(com.intellij.openapi.editor.actions.CaretStopPolicy,com.intellij.openapi.editor.actions.CaretStopPolicy):com.intellij.openapi.editor.actions.CaretStopOptions
-- bs:copy$default(com.intellij.openapi.editor.actions.CaretStopOptions,com.intellij.openapi.editor.actions.CaretStopPolicy,com.intellij.openapi.editor.actions.CaretStopPolicy,I,java.lang.Object):com.intellij.openapi.editor.actions.CaretStopOptions
-- equals(java.lang.Object):Z
-- f:getBackwardPolicy():com.intellij.openapi.editor.actions.CaretStopPolicy
-- f:getForwardPolicy():com.intellij.openapi.editor.actions.CaretStopPolicy
-- hashCode():I
-f:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- sf:Companion:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed$Companion
-- sf:DEFAULT:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- sf:DEFAULT_UNIX:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- sf:DEFAULT_WINDOWS:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- <init>(com.intellij.openapi.editor.actions.CaretStopBoundary,com.intellij.openapi.editor.actions.CaretStopBoundary):V
-- f:component1():com.intellij.openapi.editor.actions.CaretStopBoundary
-- f:component2():com.intellij.openapi.editor.actions.CaretStopBoundary
-- f:copy(com.intellij.openapi.editor.actions.CaretStopBoundary,com.intellij.openapi.editor.actions.CaretStopBoundary):com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- bs:copy$default(com.intellij.openapi.editor.actions.CaretStopOptionsTransposed,com.intellij.openapi.editor.actions.CaretStopBoundary,com.intellij.openapi.editor.actions.CaretStopBoundary,I,java.lang.Object):com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- equals(java.lang.Object):Z
-- sf:fromCaretStopOptions(com.intellij.openapi.editor.actions.CaretStopOptions):com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-- f:getLineBoundary():com.intellij.openapi.editor.actions.CaretStopBoundary
-- f:getWordBoundary():com.intellij.openapi.editor.actions.CaretStopBoundary
-- hashCode():I
-- f:toCaretStopOptions():com.intellij.openapi.editor.actions.CaretStopOptions
-f:com.intellij.openapi.editor.actions.CaretStopOptionsTransposed$Companion
-- f:fromCaretStopOptions(com.intellij.openapi.editor.actions.CaretStopOptions):com.intellij.openapi.editor.actions.CaretStopOptionsTransposed
-f:com.intellij.openapi.editor.actions.CaretStopPolicy
-- sf:BOTH:com.intellij.openapi.editor.actions.CaretStopPolicy
-- sf:Companion:com.intellij.openapi.editor.actions.CaretStopPolicy$Companion
-- sf:NONE:com.intellij.openapi.editor.actions.CaretStopPolicy
-- sf:WORD_END:com.intellij.openapi.editor.actions.CaretStopPolicy
-- sf:WORD_START:com.intellij.openapi.editor.actions.CaretStopPolicy
-- <init>():V
-- <init>(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop):V
-- b:<init>(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop,I,kotlin.jvm.internal.DefaultConstructorMarker):V
-- f:component1():com.intellij.openapi.editor.actions.CaretStop
-- f:component2():com.intellij.openapi.editor.actions.CaretStop
-- f:copy(com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop):com.intellij.openapi.editor.actions.CaretStopPolicy
-- bs:copy$default(com.intellij.openapi.editor.actions.CaretStopPolicy,com.intellij.openapi.editor.actions.CaretStop,com.intellij.openapi.editor.actions.CaretStop,I,java.lang.Object):com.intellij.openapi.editor.actions.CaretStopPolicy
-- equals(java.lang.Object):Z
-- f:getLineStop():com.intellij.openapi.editor.actions.CaretStop
-- f:getWordStop():com.intellij.openapi.editor.actions.CaretStop
-- hashCode():I
-f:com.intellij.openapi.editor.actions.CaretStopPolicy$Companion
-e:com.intellij.openapi.editor.ex.BidiTextDirection
-- java.lang.Enum
-- sf:CONTENT_BASED:com.intellij.openapi.editor.ex.BidiTextDirection
-- sf:LTR:com.intellij.openapi.editor.ex.BidiTextDirection
-- sf:RTL:com.intellij.openapi.editor.ex.BidiTextDirection
-- s:valueOf(java.lang.String):com.intellij.openapi.editor.ex.BidiTextDirection
-- s:values():com.intellij.openapi.editor.ex.BidiTextDirection[]
 c:com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 - com.intellij.openapi.components.PersistentStateComponent
 - sf:BLINKING_RANGE:com.intellij.ide.ui.UINumericRange
@@ -459,17 +350,14 @@ c:com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 - sf:STRIP_TRAILING_SPACES_WHOLE:java.lang.String
 - sf:TOOLTIPS_DELAY_RANGE:com.intellij.ide.ui.UINumericRange
 - <init>():V
-- <init>(com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OsSpecificState):V
 - addCaretsOnDoubleCtrl():Z
 - addPropertyChangeListener(java.beans.PropertyChangeListener,com.intellij.openapi.Disposable):V
 - areGutterIconsShown():Z
 - areStickyLinesShown():Z
 - areStickyLinesShownFor(java.lang.String):Z
 - p:firePropertyChange(java.lang.String,Z,Z):V
-- getBidiTextDirection():com.intellij.openapi.editor.ex.BidiTextDirection
 - getBlinkPeriod():I
 - getBlockIndent():I
-- getCaretStopOptions():com.intellij.openapi.editor.actions.CaretStopOptions
 - getCustomSoftWrapIndent():I
 - getHorizontalScrollJump():I
 - getHorizontalScrollOffset():I
@@ -541,7 +429,6 @@ c:com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 - setAddCaretsOnDoubleCtrl(Z):V
 - setAdditionalPageAtBottom(Z):V
 - setAllSoftwrapsShown(Z):V
-- setBidiTextDirection(com.intellij.openapi.editor.ex.BidiTextDirection):V
 - setBlinkCaret(Z):V
 - setBlinkPeriod(I):V
 - setBlockCursor(Z):V
@@ -551,7 +438,6 @@ c:com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 - setBreadcrumbsShownFor(java.lang.String,Z):Z
 - setCamelWords(Z):V
 - setCaretInsideTabs(Z):V
-- setCaretStopOptions(com.intellij.openapi.editor.actions.CaretStopOptions):V
 - setCustomSoftWrapIndent(I):V
 - setDndEnabled(Z):V
 - setDocCommentRenderingEnabled(Z):V
@@ -608,7 +494,6 @@ f:com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OptionSet
 - ADD_CARETS_ON_DOUBLE_CTRL:Z
 - ARE_GUTTER_ICONS_SHOWN:Z
 - ARE_LINE_NUMBERS_SHOWN:Z
-- BIDI_TEXT_DIRECTION:com.intellij.openapi.editor.ex.BidiTextDirection
 - CARET_BLINKING_PERIOD:I
 - CUSTOM_SOFT_WRAP_INDENT:I
 - ENABLE_RENDERED_DOC:Z
@@ -671,12 +556,6 @@ f:com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OptionSet
 - getLanguageStickyLines():java.util.Map
 - setLanguageBreadcrumbsMap(java.util.Map):V
 - setLanguageStickyLines(java.util.Map):V
-f:com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OsSpecificState
-- com.intellij.openapi.components.PersistentStateComponent
-- CARET_STOP_OPTIONS:com.intellij.openapi.editor.actions.CaretStopOptions
-- <init>():V
-- getState():com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OsSpecificState
-- loadState(com.intellij.openapi.editor.ex.EditorSettingsExternalizable$OsSpecificState):V
 f:com.intellij.openapi.editor.ex.EditorSettingsExternalizable$PropNames
 - sf:PROP_ADDITIONAL_PAGE_AT_BOTTOM:java.lang.String
 - sf:PROP_ADD_CARETS_ON_DOUBLE_CTRL:java.lang.String
@@ -803,7 +682,6 @@ a:com.intellij.openapi.fileTypes.ex.FileTypeManagerEx
 - s:getInstanceEx():com.intellij.openapi.fileTypes.ex.FileTypeManagerEx
 - a:isIgnoredFilesListEqualToCurrent(java.lang.String):Z
 - a:makeFileTypesChange(java.lang.String,java.lang.Runnable):V
-com.intellij.openapi.fileTypes.impl.AbstractFileTypeBase
 f:com.intellij.openapi.progress.util.BackgroundTaskUtil
 - <init>():V
 - s:computeInBackgroundAndTryWait(com.intellij.openapi.util.Computable,com.intellij.util.Consumer,J):java.lang.Object
@@ -864,19 +742,6 @@ f:com.intellij.openapi.progress.util.ReadTask$Continuation
 - <init>(java.lang.Runnable,com.intellij.openapi.application.ModalityState):V
 - getAction():java.lang.Runnable
 - getModalityState():com.intellij.openapi.application.ModalityState
-*f:com.intellij.openapi.project.ex.P3PathsEx
-- *sf:Companion:com.intellij.openapi.project.ex.P3PathsEx$Companion
-- *sf:PER_PROJECT_FOLDER:java.lang.String
-- <init>(java.nio.file.Path):V
-- f:getConfigDir():java.nio.file.Path
-- f:getLogDir():java.nio.file.Path
-- f:getPluginsDir():java.nio.file.Path
-- f:getSystemDir():java.nio.file.Path
-*f:com.intellij.openapi.project.ex.P3PathsEx$Companion
-- f:getConfigDir(java.nio.file.Path,java.nio.file.Path):java.nio.file.Path
-- f:getLogDir(java.nio.file.Path,java.nio.file.Path):java.nio.file.Path
-- f:getPluginsDir():java.nio.file.Path
-- f:getSystemDir(java.nio.file.Path,java.nio.file.Path):java.nio.file.Path
 f:com.intellij.openapi.project.ex.PerProjectInstancePaths
 - sf:Companion:com.intellij.openapi.project.ex.PerProjectInstancePaths$Companion
 - <init>(java.nio.file.Path):V
@@ -973,27 +838,12 @@ f:com.intellij.openapi.vfs.newvfs.VfsImplUtil$PathFromRoot
 - f:hashCode():I
 - pathFromRoot():java.lang.String
 - root():com.intellij.openapi.vfs.newvfs.NewVirtualFile
-com.intellij.openapi.wm.impl.FloatingDecoratorMarker
 f:com.intellij.util.FlushingDaemon
 - sf:INSTANCE:com.intellij.util.FlushingDaemon
 - sf:NAME:java.lang.String
 - sf:runPeriodically(java.lang.Runnable):java.util.concurrent.ScheduledFuture
-f:com.intellij.util.IntSLRUCache
-- <init>(I,I):V
-- cacheEntry(I,java.lang.Object):com.intellij.util.containers.IntObjectLRUMap$MapEntry
-- getCachedEntry(I):com.intellij.util.containers.IntObjectLRUMap$MapEntry
-- getCachedEntry(I,Z):com.intellij.util.containers.IntObjectLRUMap$MapEntry
 f:com.intellij.util.UriUtil
 - s:splitScheme(java.lang.String):com.intellij.openapi.util.Couple
 - s:trimLeadingSlashes(java.lang.String):java.lang.String
 - s:trimParameters(java.lang.String):java.lang.String
 - s:trimTrailingSlashes(java.lang.String):java.lang.String
-a:com.intellij.util.download.impl.FileSetVersionsFetcherBase
-- com.intellij.util.download.DownloadableFileSetVersions
-- pf:myGroupId:java.lang.String
-- <init>(java.lang.String,java.net.URL[]):V
-- pa:createFileDescription(com.intellij.facet.frameworks.beans.ArtifactItem,java.lang.String,java.lang.String):com.intellij.util.download.DownloadableFileDescription
-- pa:createVersion(com.intellij.facet.frameworks.beans.Artifact,java.util.List):com.intellij.util.download.DownloadableFileSetDescription
-- fetchVersions():java.util.List
-- fetchVersions(com.intellij.util.download.DownloadableFileSetVersions$FileSetVersionsCallback):V
-- ps:prependPrefix(java.lang.String,java.lang.String):java.lang.String
diff --git a/platform/ide-core-impl/exposed-private-api.txt b/platform/ide-core-impl/exposed-private-api.txt
index 45f830ebad42..6a13b382e6d8 100644
--- a/platform/ide-core-impl/exposed-private-api.txt
+++ b/platform/ide-core-impl/exposed-private-api.txt
@@ -1,4 +1 @@
-com/intellij/facet/frameworks/beans/Artifact
-com/intellij/facet/frameworks/beans/ArtifactItem
 com/intellij/notification/impl/NotificationGroupEP$DisplayType
-com/intellij/util/containers/IntObjectLRUMap$MapEntry
diff --git a/platform/ide-core-impl/exposed-third-party-api.txt b/platform/ide-core-impl/exposed-third-party-api.txt
deleted file mode 100644
index 1ff3abdfef32..000000000000
--- a/platform/ide-core-impl/exposed-third-party-api.txt
+++ /dev/null
@@ -1 +0,0 @@
-kotlin/jvm/internal/DefaultConstructorMarker
diff --git a/platform/ide-core-impl/src/com/intellij/ide/impl/DataValidators.java b/platform/ide-core-impl/src/com/intellij/ide/impl/DataValidators.java
index 236ec1d31054..0c3c73a494d8 100644
--- a/platform/ide-core-impl/src/com/intellij/ide/impl/DataValidators.java
+++ b/platform/ide-core-impl/src/com/intellij/ide/impl/DataValidators.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+@ApiStatus.Internal
 public abstract class DataValidators {
   private static final Logger LOG = Logger.getInstance(DataValidators.class);
 
diff --git a/platform/ide-core-impl/src/com/intellij/notification/impl/NotificationParentGroupBean.java b/platform/ide-core-impl/src/com/intellij/notification/impl/NotificationParentGroupBean.java
index d727910d6775..a995ad678762 100644
--- a/platform/ide-core-impl/src/com/intellij/notification/impl/NotificationParentGroupBean.java
+++ b/platform/ide-core-impl/src/com/intellij/notification/impl/NotificationParentGroupBean.java
@@ -2,10 +2,12 @@
 package com.intellij.notification.impl;
 
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.ApiStatus;
 
 /**
  * @author Alexander Lobas
  */
+@ApiStatus.Internal
 public final class NotificationParentGroupBean {
   @Attribute("id")
   public String id;
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/editor/actions/CaretStopOptions.kt b/platform/ide-core-impl/src/com/intellij/openapi/editor/actions/CaretStopOptions.kt
index 13b0da5e1573..a4de1c2de1cc 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/editor/actions/CaretStopOptions.kt
+++ b/platform/ide-core-impl/src/com/intellij/openapi/editor/actions/CaretStopOptions.kt
@@ -3,8 +3,9 @@ package com.intellij.openapi.editor.actions
 
 import com.intellij.util.xmlb.annotations.Attribute
 import com.intellij.util.xmlb.annotations.OptionTag
+import org.jetbrains.annotations.ApiStatus
 
-
+@ApiStatus.Internal
 data class CaretStop
 @JvmOverloads constructor(@Attribute("start") val isAtStart: Boolean = false,
                           @Attribute("end") val isAtEnd: Boolean = false) {
@@ -16,6 +17,7 @@ data class CaretStop
   } // @formatter:on
 }
 
+@ApiStatus.Internal
 data class CaretStopPolicy(@OptionTag("WORD") val wordStop: CaretStop = CaretStop.NONE,
                            @OptionTag("LINE") val lineStop: CaretStop = CaretStop.NONE) {
   companion object { // @formatter:off
@@ -26,6 +28,7 @@ data class CaretStopPolicy(@OptionTag("WORD") val wordStop: CaretStop = CaretSto
   } // @formatter:on
 }
 
+@ApiStatus.Internal
 data class CaretStopOptions(@OptionTag("BACKWARD") val backwardPolicy: CaretStopPolicy,
                             @OptionTag("FORWARD") val forwardPolicy: CaretStopPolicy) {
   private constructor(other: CaretStopOptions) : this(backwardPolicy = other.backwardPolicy,
@@ -37,6 +40,7 @@ data class CaretStopOptions(@OptionTag("BACKWARD") val backwardPolicy: CaretStop
 
 // transposed human-friendly options view and constants
 
+@ApiStatus.Internal
 data class CaretStopBoundary(val backward: CaretStop = CaretStop.NONE,
                              val forward: CaretStop = CaretStop.NONE) {
   companion object { // @formatter:off
@@ -53,6 +57,7 @@ data class CaretStopBoundary(val backward: CaretStop = CaretStop.NONE,
  * While using CaretStopOptions is more convenient from the code point of view (chain: backward/forward -> word/line -> start/end),
  * it is more easy to reason about when the direction and boundary axes are switched (word/line -> backward/forward -> start/end).
  */
+@ApiStatus.Internal
 data class CaretStopOptionsTransposed(val wordBoundary: CaretStopBoundary,
                                       val lineBoundary: CaretStopBoundary) {
   fun toCaretStopOptions(): CaretStopOptions =
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/BidiTextDirection.java b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/BidiTextDirection.java
index 4a4173bae91c..33529c5c0008 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/BidiTextDirection.java
+++ b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/BidiTextDirection.java
@@ -15,6 +15,9 @@
  */
 package com.intellij.openapi.editor.ex;
 
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
 public enum BidiTextDirection {
   CONTENT_BASED, LTR, RTL
 }
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java
index 4ee9ff218562..8e95919ab3dd 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java
+++ b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java
@@ -123,6 +123,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
 
     public boolean ADD_CARETS_ON_DOUBLE_CTRL = true;
 
+    @ApiStatus.Internal
     public BidiTextDirection BIDI_TEXT_DIRECTION = BidiTextDirection.CONTENT_BASED;
 
     // todo: useful? schedule for removal?
@@ -176,6 +177,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
     storages = @Storage(value = "editor.os-specific.xml", roamingType = RoamingType.PER_OS),
     category = SettingsCategory.CODE
   )
+  @ApiStatus.Internal
   public static final class OsSpecificState implements PersistentStateComponent<OsSpecificState> {
     public CaretStopOptions CARET_STOP_OPTIONS = new CaretStopOptions();
 
@@ -212,6 +214,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
     this(ApplicationManager.getApplication().getService(OsSpecificState.class));
   }
 
+  @ApiStatus.Internal
   @NonInjectable
   public EditorSettingsExternalizable(@NotNull OsSpecificState state) {
     myOsSpecificState = state;
@@ -1033,10 +1036,12 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
     myPropertyChangeSupport.firePropertyChange(PropNames.PROP_ADD_CARETS_ON_DOUBLE_CTRL, old, val);
   }
 
+  @ApiStatus.Internal
   public BidiTextDirection getBidiTextDirection() {
     return myOptions.BIDI_TEXT_DIRECTION;
   }
 
+  @ApiStatus.Internal
   public void setBidiTextDirection(BidiTextDirection direction) {
     BidiTextDirection old = myOptions.BIDI_TEXT_DIRECTION;
     if (old == direction) return;
@@ -1081,10 +1086,12 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
     myPropertyChangeSupport.firePropertyChange(PropNames.PROP_SOFT_WRAP_FILE_MASKS, old, value);
   }
 
+  @ApiStatus.Internal
   public @NotNull CaretStopOptions getCaretStopOptions() {
     return myOsSpecificState.CARET_STOP_OPTIONS;
   }
 
+  @ApiStatus.Internal
   public void setCaretStopOptions(@NotNull CaretStopOptions options) {
     myOsSpecificState.CARET_STOP_OPTIONS = options;
   }
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileTypeBase.java b/platform/ide-core-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileTypeBase.java
index 9545f01773a6..6fbaf39b2eaf 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileTypeBase.java
+++ b/platform/ide-core-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileTypeBase.java
@@ -1,5 +1,8 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.fileTypes.impl;
 
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
 public interface AbstractFileTypeBase {
 }
\ No newline at end of file
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/P3PathsEx.kt b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/P3PathsEx.kt
index e277bef787f0..9e79a429be53 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/P3PathsEx.kt
+++ b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/P3PathsEx.kt
@@ -8,6 +8,7 @@ import kotlin.io.path.invariantSeparatorsPathString
 import kotlin.io.path.name
 
 @ApiStatus.Experimental
+@ApiStatus.Internal
 class P3PathsEx(private val projectStoreBaseDir: Path) {
   companion object {
     @ApiStatus.Experimental
diff --git a/platform/ide-core-impl/src/com/intellij/openapi/wm/impl/FloatingDecoratorMarker.java b/platform/ide-core-impl/src/com/intellij/openapi/wm/impl/FloatingDecoratorMarker.java
index a77e760f16dc..6577a0ec5e47 100644
--- a/platform/ide-core-impl/src/com/intellij/openapi/wm/impl/FloatingDecoratorMarker.java
+++ b/platform/ide-core-impl/src/com/intellij/openapi/wm/impl/FloatingDecoratorMarker.java
@@ -1,5 +1,8 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.wm.impl;
 
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
 public interface FloatingDecoratorMarker {
 }
diff --git a/platform/ide-core-impl/src/com/intellij/util/IntSLRUCache.java b/platform/ide-core-impl/src/com/intellij/util/IntSLRUCache.java
index 71073c429d0c..4ce7b705e8c8 100644
--- a/platform/ide-core-impl/src/com/intellij/util/IntSLRUCache.java
+++ b/platform/ide-core-impl/src/com/intellij/util/IntSLRUCache.java
@@ -2,9 +2,11 @@
 package com.intellij.util;
 
 import com.intellij.util.containers.IntObjectLRUMap;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class IntSLRUCache<T> {
   private static final boolean ourPrintDebugStatistics = false;
   private final IntObjectLRUMap<T> myProtectedQueue;
diff --git a/platform/ide-core-impl/src/com/intellij/util/download/impl/FileSetVersionsFetcherBase.java b/platform/ide-core-impl/src/com/intellij/util/download/impl/FileSetVersionsFetcherBase.java
index 96a1be194fb9..55bd62e8984a 100644
--- a/platform/ide-core-impl/src/com/intellij/util/download/impl/FileSetVersionsFetcherBase.java
+++ b/platform/ide-core-impl/src/com/intellij/util/download/impl/FileSetVersionsFetcherBase.java
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.download.DownloadableFileDescription;
 import com.intellij.util.download.DownloadableFileSetDescription;
 import com.intellij.util.download.DownloadableFileSetVersions;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
+@ApiStatus.Internal
 public abstract class FileSetVersionsFetcherBase<FS extends DownloadableFileSetDescription, F extends DownloadableFileDescription> implements DownloadableFileSetVersions<FS> {
   private static final Comparator<DownloadableFileSetDescription> VERSIONS_COMPARATOR =
     (o1, o2) -> -StringUtil.compareVersionNumbers(o1.getVersionString(), o2.getVersionString());
diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt
index 93f57e09c333..82c89e57c723 100644
--- a/platform/lang-impl/api-dump-unreviewed.txt
+++ b/platform/lang-impl/api-dump-unreviewed.txt
@@ -8434,8 +8434,8 @@ f:com.intellij.framework.library.impl.FrameworkLibraryVersionImpl
 - getPresentableName():java.lang.String
 - getVersionNumber():java.lang.String
 c:com.intellij.framework.library.impl.LibraryVersionsFetcher
-- com.intellij.util.download.impl.FileSetVersionsFetcherBase
 - com.intellij.framework.library.DownloadableLibraryDescription
+- com.intellij.util.download.DownloadableFileSetVersions
 - <init>(java.lang.String,java.net.URL[]):V
 - p:createAvailabilityCondition(com.intellij.facet.frameworks.beans.Artifact):com.intellij.framework.FrameworkAvailabilityCondition
 - p:createFileDescription(com.intellij.facet.frameworks.beans.ArtifactItem,java.lang.String,java.lang.String):com.intellij.framework.library.DownloadableLibraryFileDescription
diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt
index 5cd557a3761b..b778c9c39ac8 100644
--- a/platform/platform-impl/api-dump-unreviewed.txt
+++ b/platform/platform-impl/api-dump-unreviewed.txt
@@ -7255,12 +7255,6 @@ f:com.intellij.openapi.editor.actions.EditorActionUtil
 - s:findFirstNonSpaceColumnOnTheLine(com.intellij.openapi.editor.Editor,I):I
 - s:findFirstNonSpaceOffsetInRange(java.lang.CharSequence,I,I):I
 - s:findFirstNonSpaceOffsetOnTheLine(com.intellij.openapi.editor.Document,I):I
-- s:getNextCaretStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z):I
-- s:getNextCaretStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z,Z):I
-- s:getNextLineStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStop):I
-- s:getPreviousCaretStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z):I
-- s:getPreviousCaretStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z,Z):I
-- s:getPreviousLineStopOffset(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStop):I
 - s:getRangeToWordEnd(com.intellij.openapi.editor.Editor,Z,Z):com.intellij.openapi.util.TextRange
 - s:getRangeToWordStart(com.intellij.openapi.editor.Editor,Z,Z):com.intellij.openapi.util.TextRange
 - s:indentLine(com.intellij.openapi.project.Project,com.intellij.openapi.editor.Editor,I,I):V
@@ -7287,8 +7281,6 @@ f:com.intellij.openapi.editor.actions.EditorActionUtil
 - s:moveCaretToPreviousWord(com.intellij.openapi.editor.Editor,Z,Z):V
 - s:moveCaretToTextEnd(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project):V
 - s:moveCaretToTextStart(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project):V
-- s:moveToNextCaretStop(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z,Z):V
-- s:moveToPreviousCaretStop(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.actions.CaretStopPolicy,Z,Z):V
 - s:scrollRelatively(com.intellij.openapi.editor.Editor,I,I,Z):V
 - s:selectEntireLines(com.intellij.openapi.editor.Caret):V
 - s:selectEntireLines(com.intellij.openapi.editor.Caret,Z):V
@@ -9805,10 +9797,9 @@ f:com.intellij.openapi.fileTypes.ex.FileTypeChooser
 - getPreferredFocusedComponent():javax.swing.JComponent
 - getSelectedType():com.intellij.openapi.fileTypes.FileType
 c:com.intellij.openapi.fileTypes.impl.AbstractFileType
-- com.intellij.openapi.fileTypes.UserFileType
 - com.intellij.openapi.fileTypes.PlainTextLikeFileType
+- com.intellij.openapi.fileTypes.UserFileType
 - com.intellij.openapi.fileTypes.ex.ExternalizableFileType
-- com.intellij.openapi.fileTypes.impl.AbstractFileTypeBase
 - com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType
 - com.intellij.openapi.options.ExternalizableScheme
 - <init>(com.intellij.ide.highlighter.custom.SyntaxTable):V
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
index 9f00211d64f8..f2fc72b02562 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.DocumentUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -152,15 +153,18 @@ public final class EditorActionUtil {
     return TextRange.create(startOffset, endOffset);
   }
 
+  @ApiStatus.Internal
   public static int getNextCaretStopOffset(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy, boolean isCamel) {
     return getNextCaretStopOffset(editor, caretStopPolicy, isCamel, false);
   }
 
+  @ApiStatus.Internal
   public static int getPreviousCaretStopOffset(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy, boolean isCamel) {
     return getPreviousCaretStopOffset(editor, caretStopPolicy, isCamel, false);
   }
 
   @SuppressWarnings("Duplicates")
+  @ApiStatus.Internal
   public static int getNextCaretStopOffset(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy,
                                            boolean isCamel, boolean handleQuoted) {
     int maxOffset = getNextLineStopOffset(editor, caretStopPolicy.getLineStop());
@@ -190,6 +194,7 @@ public final class EditorActionUtil {
   }
 
   @SuppressWarnings("Duplicates")
+  @ApiStatus.Internal
   public static int getPreviousCaretStopOffset(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy,
                                                boolean isCamel, boolean handleQuoted) {
     int minOffset = getPreviousLineStopOffset(editor, caretStopPolicy.getLineStop());
@@ -321,6 +326,7 @@ public final class EditorActionUtil {
              .isWordBoundary(leftTokenType, rightTokenType);
   }
 
+  @ApiStatus.Internal
   public static int getNextLineStopOffset(@NotNull Editor editor, @NotNull CaretStop lineStop) {
     final Document document = editor.getDocument();
     final CaretModel caretModel = editor.getCaretModel();
@@ -348,6 +354,7 @@ public final class EditorActionUtil {
     }
   }
 
+  @ApiStatus.Internal
   public static int getPreviousLineStopOffset(@NotNull Editor editor, @NotNull CaretStop lineStop) {
     final Document document = editor.getDocument();
     final CaretModel caretModel = editor.getCaretModel();
@@ -642,6 +649,7 @@ public final class EditorActionUtil {
                         isWithSelection, camel);
   }
 
+  @ApiStatus.Internal
   public static void moveToNextCaretStop(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy,
                                          boolean isWithSelection, boolean isCamel) {
     Document document = editor.getDocument();
@@ -735,6 +743,7 @@ public final class EditorActionUtil {
                             isWithSelection, camel);
   }
 
+  @ApiStatus.Internal
   public static void moveToPreviousCaretStop(@NotNull Editor editor, @NotNull CaretStopPolicy caretStopPolicy,
                                              boolean isWithSelection, boolean isCamel) {
     SelectionModel selectionModel = editor.getSelectionModel();