diff --git a/platform/core-impl/api-dump-unreviewed.txt b/platform/core-impl/api-dump-unreviewed.txt
index 71202f0f26f0..74e8394feef4 100644
--- a/platform/core-impl/api-dump-unreviewed.txt
+++ b/platform/core-impl/api-dump-unreviewed.txt
@@ -1697,7 +1697,6 @@ f:com.intellij.openapi.fileEditor.impl.LoadTextUtil
 - s:getTextByBinaryPresentation(B[],com.intellij.openapi.vfs.VirtualFile):java.lang.CharSequence
 - s:getTextByBinaryPresentation(B[],com.intellij.openapi.vfs.VirtualFile,Z,Z):java.lang.CharSequence
 - s:getTextByBinaryPresentation(B[],java.nio.charset.Charset):java.lang.CharSequence
-- s:guessFromContent(com.intellij.openapi.vfs.VirtualFile,B[]):com.intellij.openapi.fileEditor.impl.LoadTextUtil$DetectResult
 - s:loadText(com.intellij.openapi.vfs.VirtualFile):java.lang.CharSequence
 - s:loadText(com.intellij.openapi.vfs.VirtualFile,I):java.lang.CharSequence
 - s:processTextFromBinaryPresentationOrNull(com.intellij.openapi.util.io.ByteSequence,com.intellij.openapi.vfs.VirtualFile,Z,Z,com.intellij.openapi.fileTypes.FileType,com.intellij.util.NotNullFunction):com.intellij.openapi.fileTypes.FileType
@@ -1708,10 +1707,6 @@ e:com.intellij.openapi.fileEditor.impl.LoadTextUtil$AutoDetectionReason
 - sf:FROM_BYTES:com.intellij.openapi.fileEditor.impl.LoadTextUtil$AutoDetectionReason
 - s:valueOf(java.lang.String):com.intellij.openapi.fileEditor.impl.LoadTextUtil$AutoDetectionReason
 - s:values():com.intellij.openapi.fileEditor.impl.LoadTextUtil$AutoDetectionReason[]
-c:com.intellij.openapi.fileEditor.impl.LoadTextUtil$DetectResult
-- f:BOM:B[]
-- f:guessed:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- f:hardCodedCharset:java.nio.charset.Charset
 f:com.intellij.openapi.fileTypes.PlainTextFileType
 - com.intellij.openapi.fileTypes.LanguageFileType
 - com.intellij.openapi.fileTypes.OSFileIdeAssociation
diff --git a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
index a052c9696de4..72cc9d078c8a 100644
--- a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
+++ b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
@@ -23,6 +23,7 @@ import com.intellij.util.*;
 import com.intellij.util.text.ByteArrayCharSequence;
 import com.intellij.util.text.CharArrayUtil;
 import org.intellij.lang.annotations.MagicConstant;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -238,6 +239,7 @@ public final class LoadTextUtil {
     }
   }
 
+  @ApiStatus.Internal
   public static class DetectResult {
     public final Charset hardCodedCharset;
     public final CharsetToolkit.GuessedEncoding guessed;
@@ -323,6 +325,7 @@ public final class LoadTextUtil {
   }
 
 
+  @ApiStatus.Internal
   public static @NotNull DetectResult guessFromContent(@NotNull VirtualFile virtualFile, byte @NotNull [] content) {
     return guessFromContent(virtualFile, content, content.length);
   }
@@ -568,11 +571,11 @@ public final class LoadTextUtil {
 
   // written in push way to make sure no-one stores the CharSequence because it came from thread-local byte buffers which will be overwritten soon
   public static @NotNull FileType processTextFromBinaryPresentationOrNull(@NotNull ByteSequence bytes,
-                                                                 @NotNull VirtualFile virtualFile,
-                                                                 boolean saveDetectedSeparators,
-                                                                 boolean saveBOM,
-                                                                 @NotNull FileType fileType,
-                                                                 @NotNull NotNullFunction<? super CharSequence, ? extends FileType> fileTextProcessor) {
+                                                                          @NotNull VirtualFile virtualFile,
+                                                                          boolean saveDetectedSeparators,
+                                                                          boolean saveBOM,
+                                                                          @NotNull FileType fileType,
+                                                                          @NotNull NotNullFunction<? super CharSequence, ? extends FileType> fileTextProcessor) {
     byte[] buffer = ((ByteArraySequence)bytes).getInternalBuffer();
     DetectResult detectResult = detectInternalCharsetAndSetBOM(virtualFile, buffer, bytes.length(), saveBOM, fileType);
     Charset internalCharset = detectResult.hardCodedCharset;
diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt
index 9c711be02efd..9a0c956fe330 100644
--- a/platform/platform-impl/api-dump-unreviewed.txt
+++ b/platform/platform-impl/api-dump-unreviewed.txt
@@ -10524,7 +10524,7 @@ f:com.intellij.idea.IdeStarter$Companion
 - f:openFilesOnLoading(java.util.List):V
 - f:openUriOnLoading(java.lang.String):V
 f:com.intellij.idea.IdeaLogger
-- com.intellij.openapi.diagnostic.JulLogger
+- com.intellij.openapi.diagnostic.Logger
 - s:ourErrorsOccurred:java.lang.Exception
 - s:ourLastActionId:java.lang.String
 - s:dropFrequentExceptionsCaches():V
diff --git a/platform/util/api-dump-unreviewed.txt b/platform/util/api-dump-unreviewed.txt
index e79bdf28c530..b4696b138508 100644
--- a/platform/util/api-dump-unreviewed.txt
+++ b/platform/util/api-dump-unreviewed.txt
@@ -54,13 +54,6 @@ f:com.intellij.UtilBundle
 - sf:installThreadContext(kotlin.coroutines.CoroutineContext,Z):com.intellij.openapi.application.AccessToken
 - bs:installThreadContext$default(kotlin.coroutines.CoroutineContext,Z,I,java.lang.Object):com.intellij.openapi.application.AccessToken
 - sf:resetThreadContext():com.intellij.openapi.application.AccessToken
-f:com.intellij.concurrency.client.ClientIdPropagation
-- sf:captureClientId(kotlin.jvm.functions.Function0):kotlin.jvm.functions.Function0
-- sf:captureClientIdInBiConsumer(java.util.function.BiConsumer):java.util.function.BiConsumer
-- sf:captureClientIdInCallable(java.util.concurrent.Callable):java.util.concurrent.Callable
-- sf:captureClientIdInFunction(java.util.function.Function):java.util.function.Function
-- sf:captureClientIdInProcessor(com.intellij.util.Processor):com.intellij.util.Processor
-- sf:captureClientIdInRunnable(java.lang.Runnable):java.lang.Runnable
 c:com.intellij.diagnostic.tracing.MethodTracer
 - s:clearAll():V
 - s:getAllData():java.util.List
@@ -319,9 +312,6 @@ a:com.intellij.openapi.application.AccessToken
 - <init>():V
 - f:close():V
 - a:finish():V
-f:com.intellij.openapi.application.JetBrainsProtocolHandler
-- sf:REQUIRED_PLUGINS_KEY:java.lang.String
-- <init>():V
 f:com.intellij.openapi.application.PathManager
 - sf:DEFAULT_EXT:java.lang.String
 - sf:OPTIONS_DIRECTORY:java.lang.String
@@ -422,19 +412,6 @@ a:com.intellij.openapi.diagnostic.DelegatingLogger
 - warn(java.lang.String,java.lang.Throwable):V
 com.intellij.openapi.diagnostic.ExceptionWithAttachments
 - a:getAttachments():com.intellij.openapi.diagnostic.Attachment[]
-f:com.intellij.openapi.diagnostic.FrequentEventDetector
-- <init>(I,I):V
-- <init>(I,I,com.intellij.openapi.diagnostic.FrequentEventDetector$Level):V
-- s:disableUntil(com.intellij.openapi.Disposable):V
-- eventHappened(java.lang.Object):V
-- logMessage(java.lang.String):V
-e:com.intellij.openapi.diagnostic.FrequentEventDetector$Level
-- java.lang.Enum
-- sf:ERROR:com.intellij.openapi.diagnostic.FrequentEventDetector$Level
-- sf:INFO:com.intellij.openapi.diagnostic.FrequentEventDetector$Level
-- sf:WARN:com.intellij.openapi.diagnostic.FrequentEventDetector$Level
-- s:valueOf(java.lang.String):com.intellij.openapi.diagnostic.FrequentEventDetector$Level
-- s:values():com.intellij.openapi.diagnostic.FrequentEventDetector$Level[]
 c:com.intellij.openapi.diagnostic.IdeaLogRecordFormatter
 - java.util.logging.Formatter
 - <init>():V
@@ -443,22 +420,6 @@ c:com.intellij.openapi.diagnostic.IdeaLogRecordFormatter
 - format(java.util.logging.LogRecord):java.lang.String
 - s:formatThrowable(java.lang.Throwable):java.lang.String
 - p:getStartedMillis():J
-c:com.intellij.openapi.diagnostic.JulLogger
-- com.intellij.openapi.diagnostic.Logger
-- pf:myLogger:java.util.logging.Logger
-- <init>(java.util.logging.Logger):V
-- s:clearHandlers():V
-- s:clearHandlers(java.util.logging.Logger):V
-- debug(java.lang.String,java.lang.Throwable):V
-- error(java.lang.String,java.lang.Throwable,java.lang.String[]):V
-- info(java.lang.String,java.lang.Throwable):V
-- isDebugEnabled():Z
-- s:isJulLoggerCleanerDelayed():Z
-- isTraceEnabled():Z
-- setLevel(com.intellij.openapi.diagnostic.LogLevel):V
-- trace(java.lang.String):V
-- trace(java.lang.Throwable):V
-- warn(java.lang.String,java.lang.Throwable):V
 e:com.intellij.openapi.diagnostic.LogLevel
 - java.lang.Enum
 - sf:ALL:com.intellij.openapi.diagnostic.LogLevel
@@ -529,16 +490,6 @@ f:com.intellij.openapi.diagnostic.LoggerKt
 *:com.intellij.openapi.diagnostic.ReportingClassSubstitutor
 - s:getClassToReport(java.lang.Object):java.lang.Class
 - a:getSubstitutedClass():java.lang.Class
-f:com.intellij.openapi.diagnostic.RollingFileHandler
-- java.util.logging.StreamHandler
-- <init>(java.nio.file.Path,J,I,Z):V
-- <init>(java.nio.file.Path,J,I,Z,java.lang.Runnable):V
-- b:<init>(java.nio.file.Path,J,I,Z,java.lang.Runnable,I,kotlin.jvm.internal.DefaultConstructorMarker):V
-- f:getAppend():Z
-- f:getCount():I
-- f:getLimit():J
-- f:getLogPath():java.nio.file.Path
-- publish(java.util.logging.LogRecord):V
 c:com.intellij.openapi.diagnostic.RuntimeExceptionWithAttachments
 - java.lang.RuntimeException
 - com.intellij.openapi.diagnostic.ExceptionWithAttachments
@@ -548,21 +499,6 @@ c:com.intellij.openapi.diagnostic.RuntimeExceptionWithAttachments
 - <init>(java.lang.Throwable,com.intellij.openapi.diagnostic.Attachment[]):V
 - getAttachments():com.intellij.openapi.diagnostic.Attachment[]
 - getUserMessage():java.lang.String
-f:com.intellij.openapi.diagnostic.ThrottledLogger
-- <init>(com.intellij.openapi.diagnostic.Logger,J):V
-- debug(java.lang.String):V
-- debug(java.lang.String,java.lang.Throwable):V
-- debug(java.util.function.Supplier):V
-- error(java.lang.String):V
-- error(java.lang.String,java.lang.Throwable):V
-- error(java.util.function.Supplier):V
-- info(java.lang.String):V
-- info(java.lang.String,java.lang.Throwable):V
-- info(java.util.function.Supplier):V
-- warn(java.lang.String):V
-- warn(java.lang.String,java.lang.Throwable):V
-- warn(java.util.function.Supplier):V
-- wrappedLogger():com.intellij.openapi.diagnostic.Logger
 com.intellij.openapi.diagnostic.UntraceableException
 a:com.intellij.openapi.util.AtomicClearableLazyValue
 - com.intellij.openapi.util.ClearableLazyValue
@@ -694,14 +630,6 @@ com.intellij.openapi.util.Factory
 - java.util.function.Supplier
 - a:create():java.lang.Object
 - get():java.lang.Object
-a:com.intellij.openapi.util.FieldCache
-- p:<init>():V
-- clear(java.lang.Object,java.lang.Object):V
-- pa:compute(java.lang.Object,java.lang.Object):java.lang.Object
-- get(java.lang.Object,java.lang.Object,java.lang.Object):java.lang.Object
-- f:getCached(java.lang.Object,java.lang.Object):java.lang.Object
-- pa:getValue(java.lang.Object,java.lang.Object):java.lang.Object
-- pa:putValue(java.lang.Object,java.lang.Object,java.lang.Object):V
 com.intellij.openapi.util.Getter
 - java.util.function.Supplier
 f:com.intellij.openapi.util.GlobUtilKt
@@ -1010,7 +938,6 @@ Fa:com.intellij.openapi.util.NotNullLazyValue
 - s:softLazy(java.util.function.Supplier):java.util.function.Supplier
 - s:volatileLazy(java.util.function.Supplier):com.intellij.openapi.util.NotNullLazyValue
 f:com.intellij.openapi.util.NullUtils
-- s:hasNotNull(java.lang.Object[]):Z
 - s:hasNull(java.lang.Object[]):Z
 - s:notNull(java.lang.Object[]):Z
 com.intellij.openapi.util.NullableComputable
@@ -1064,7 +991,6 @@ f:com.intellij.openapi.util.PropertiesUtil
 - <init>():V
 - s:loadProperties(java.io.Reader):java.util.Map
 a:com.intellij.openapi.util.RecursionGuard
-- <init>():V
 - a:computePreventingRecursion(java.lang.Object,Z,com.intellij.openapi.util.ThrowableComputable):java.lang.Object
 - a:currentStack():java.util.List
 - doPreventingRecursion(java.lang.Object,Z,com.intellij.openapi.util.Computable):java.lang.Object
@@ -1088,7 +1014,6 @@ com.intellij.openapi.util.ScalableIcon
 - a:getScale():F
 - a:scale(F):javax.swing.Icon
 a:com.intellij.openapi.util.SimpleFieldCache
-- com.intellij.openapi.util.FieldCache
 - <init>():V
 - pa:compute(java.lang.Object):java.lang.Object
 - pf:compute(java.lang.Object,java.lang.Object):java.lang.Object
@@ -1160,30 +1085,9 @@ f:com.intellij.openapi.util.SystemInfo
 - s:isJavaVersionAtLeast(I,I,I):Z
 - s:isJavaVersionAtLeast(java.lang.String):Z
 - s:isOsVersionAtLeast(java.lang.String):Z
-f:com.intellij.openapi.util.TextRangeScalarUtil
-- <init>():V
-- s:contains(J,J):Z
-- s:containsOffset(J,I):Z
-- s:containsRange(J,I,I):Z
-- s:create(J):com.intellij.openapi.util.TextRange
-- s:endOffset(J):I
-- s:intersects(com.intellij.openapi.util.TextRange,J):Z
-- s:shift(J,I,I):J
-- s:startOffset(J):I
-- s:toScalarRange(I,I):J
-- s:toScalarRange(com.intellij.openapi.util.Segment):J
-- s:union(J,J):J
-f:com.intellij.openapi.util.ThreadLocalCachedByteArray
-- <init>():V
-- getBuffer(I):B[]
 f:com.intellij.openapi.util.ThreadLocalCachedIntArray
 - <init>():V
 - getBuffer(I):I[]
-a:com.intellij.openapi.util.ThreadLocalCachedValue
-- <init>():V
-- pa:create():java.lang.Object
-- getValue():java.lang.Object
-- p:init(java.lang.Object):V
 com.intellij.openapi.util.Throwable2Computable
 - a:compute():java.lang.Object
 com.intellij.openapi.util.ThrowableNotNullFunction
@@ -1238,7 +1142,6 @@ f:com.intellij.openapi.util.UpdatedReference
 - updateT(java.lang.Object):V
 - updateTs():V
 a:com.intellij.openapi.util.UserDataCache
-- com.intellij.openapi.util.FieldCache
 - p:<init>():V
 - <init>(java.lang.String):V
 - clear(com.intellij.openapi.util.Key,com.intellij.openapi.util.UserDataHolder):V
@@ -1619,8 +1522,6 @@ f:com.intellij.openapi.util.io.OSAgnosticPathUtil
 - s:isUncPath(java.lang.String):Z
 - s:startsWith(java.lang.String,java.lang.String):Z
 - s:startsWithWindowsDrive(java.lang.String):Z
-f:com.intellij.openapi.util.io.PathExecLazyValue
-- s:create(java.lang.String):java.util.function.Supplier
 f:com.intellij.openapi.util.io.StreamUtil
 - sf:BUFFER_SIZE:I
 - s:closeStream(java.io.Closeable):V
@@ -1796,18 +1697,12 @@ f:com.intellij.openapi.util.text.HtmlChunkUtilKt
 - *sf:buildHtml(kotlin.jvm.functions.Function1):java.lang.String
 - *sf:buildHtmlChunk(kotlin.jvm.functions.Function1):com.intellij.openapi.util.text.HtmlChunk
 - *sf:plus(com.intellij.openapi.util.text.HtmlChunk,com.intellij.openapi.util.text.HtmlChunk):com.intellij.openapi.util.text.HtmlChunk
-f:com.intellij.openapi.util.text.InjectorMatchingEndFinder
-- <init>():V
-- s:findMatchingEnd(java.lang.String,java.lang.String,java.lang.String,I):I
 f:com.intellij.openapi.util.text.LineColumn
 - f:column:I
 - f:line:I
 - equals(java.lang.Object):Z
 - hashCode():I
 - s:of(I,I):com.intellij.openapi.util.text.LineColumn
-f:com.intellij.openapi.util.text.PastParticiple
-- <init>():V
-- s:pastParticiple(java.lang.String):java.lang.String
 Fc:com.intellij.openapi.util.text.StringUtil
 - sf:ELLIPSIS:java.lang.String
 - sf:NON_BREAK_SPACE:java.lang.String
@@ -2130,51 +2025,6 @@ a:com.intellij.openapi.util.text.TrigramBuilder$TrigramProcessor
 - java.util.function.IntPredicate
 - <init>():V
 - consumeTrigramsCount(I):Z
-f:com.intellij.openapi.vfs.CharsetToolkit
-- sf:FILE_ENCODING_PROPERTY:java.lang.String
-- sf:UTF16BE_BOM:B[]
-- sf:UTF16LE_BOM:B[]
-- sf:UTF8:java.lang.String
-- sf:UTF8_BOM:B[]
-- sf:UTF8_CHARSET:java.nio.charset.Charset
-- sf:UTF_32BE_CHARSET:java.nio.charset.Charset
-- sf:UTF_32LE_CHARSET:java.nio.charset.Charset
-- sf:WIN_1251_CHARSET:java.nio.charset.Charset
-- <init>(B[],java.nio.charset.Charset,Z):V
-- s:bytesToString(B[],java.nio.charset.Charset):java.lang.String
-- s:canHaveBom(java.nio.charset.Charset,B[]):Z
-- s:decodeString(B[],java.nio.charset.Charset):java.lang.String
-- s:detectBOMFromStream(java.io.InputStream):B[]
-- s:forName(java.lang.String):java.nio.charset.Charset
-- s:getAvailableCharsets():java.nio.charset.Charset[]
-- s:getBOMLength(B[],java.nio.charset.Charset):I
-- getDefaultCharset():java.nio.charset.Charset
-- s:getDefaultSystemCharset():java.nio.charset.Charset
-- s:getMandatoryBom(java.nio.charset.Charset):B[]
-- s:getPlatformCharset():java.nio.charset.Charset
-- s:getPossibleBom(java.nio.charset.Charset):B[]
-- guessEncoding(I):java.nio.charset.Charset
-- guessEncoding(I,I,java.nio.charset.Charset):java.nio.charset.Charset
-- s:guessEncoding(java.io.File,I,java.nio.charset.Charset):java.nio.charset.Charset
-- guessFromBOM():java.nio.charset.Charset
-- s:guessFromBOM(B[]):java.nio.charset.Charset
-- guessFromContent(I):com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- guessFromContent(I,I):com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- s:hasUTF16BEBom(B[]):Z
-- s:hasUTF16LEBom(B[]):Z
-- s:hasUTF32BEBom(B[]):Z
-- s:hasUTF32LEBom(B[]):Z
-- s:hasUTF8Bom(B[]):Z
-- s:inputStreamSkippingBOM(java.io.InputStream):java.io.InputStream
-- s:tryDecodeString(B[],java.nio.charset.Charset):java.lang.String
-e:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- java.lang.Enum
-- sf:BINARY:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- sf:INVALID_UTF8:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- sf:SEVEN_BIT:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- sf:VALID_UTF8:com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- s:valueOf(java.lang.String):com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding
-- s:values():com.intellij.openapi.vfs.CharsetToolkit$GuessedEncoding[]
 f:com.intellij.platform.util.ArgsParser
 - <init>(java.util.List):V
 - f:arg(java.lang.String,java.lang.String):com.intellij.platform.util.ArgsParser$ArgInfo
@@ -4628,41 +4478,6 @@ com.intellij.util.indexing.ValueContainer$ValueIterator
 - java.util.Iterator
 - a:getInputIdsIterator():com.intellij.util.indexing.ValueContainer$IntIterator
 - a:getValueAssociationPredicate():java.util.function.IntPredicate
-f:com.intellij.util.indexing.containers.BitSetAsRAIntContainer
-- com.intellij.util.indexing.containers.RandomAccessIntContainer
-- <init>():V
-- <init>(I):V
-- add(I):Z
-- clone():java.lang.Object
-- compact():V
-- contains(I):Z
-- ensureContainerCapacity(I):com.intellij.util.indexing.containers.RandomAccessIntContainer
-- intIterator():com.intellij.util.indexing.containers.IntIdsIterator
-- remove(I):Z
-- size():I
-f:com.intellij.util.indexing.containers.ChangeBufferingList
-- java.lang.Cloneable
-- <init>():V
-- <init>(I):V
-- add(I):V
-- clone():java.lang.Object
-- ensureCapacity(I):V
-- intIterator():com.intellij.util.indexing.containers.IntIdsIterator
-- intPredicate():java.util.function.IntPredicate
-- isEmpty():Z
-- remove(I):V
-- sortedIntIterator():com.intellij.util.indexing.containers.IntIdsIterator
-f:com.intellij.util.indexing.containers.IntHashSetAsRAIntContainer
-- com.intellij.util.indexing.containers.RandomAccessIntContainer
-- <init>(I,F):V
-- add(I):Z
-- clone():java.lang.Object
-- compact():V
-- contains(I):Z
-- ensureContainerCapacity(I):com.intellij.util.indexing.containers.RandomAccessIntContainer
-- intIterator():com.intellij.util.indexing.containers.IntIdsIterator
-- remove(I):Z
-- size():I
 com.intellij.util.indexing.containers.IntIdsIterator
 - com.intellij.util.indexing.ValueContainer$IntIterator
 - a:createCopyInInitialState():com.intellij.util.indexing.containers.IntIdsIterator
@@ -4676,45 +4491,6 @@ com.intellij.util.indexing.containers.RandomAccessIntContainer
 - a:intIterator():com.intellij.util.indexing.containers.IntIdsIterator
 - a:remove(I):Z
 - a:size():I
-f:com.intellij.util.indexing.containers.SortedFileIdSetIterator
-- com.intellij.util.indexing.containers.IntIdsIterator
-- createCopyInInitialState():com.intellij.util.indexing.containers.IntIdsIterator
-- s:getTransientIterator(com.intellij.util.indexing.containers.IntIdsIterator):com.intellij.util.indexing.containers.IntIdsIterator
-- hasAscendingOrder():Z
-- hasNext():Z
-- next():I
-- size():I
-f:com.intellij.util.indexing.containers.SortedIdSet
-- com.intellij.util.indexing.containers.RandomAccessIntContainer
-- java.lang.Cloneable
-- <init>(I):V
-- <init>(I[],I):V
-- add(I):Z
-- clone():java.lang.Object
-- compact():V
-- contains(I):Z
-- ensureContainerCapacity(I):com.intellij.util.indexing.containers.RandomAccessIntContainer
-- findNext(I):I
-- forEach(java.util.function.IntPredicate):V
-- get(I):I
-- intIterator():com.intellij.util.indexing.containers.IntIdsIterator
-- isEmpty():Z
-- remove(I):Z
-- size():I
-f:com.intellij.util.indexing.containers.UpgradableRandomAccessIntContainer
-- com.intellij.util.indexing.containers.RandomAccessIntContainer
-- <init>(I,java.util.function.Supplier,com.intellij.util.indexing.containers.UpgradableRandomAccessIntContainer$InstanceUpgrader):V
-- add(I):Z
-- clone():java.lang.Object
-- compact():V
-- contains(I):Z
-- ensureContainerCapacity(I):com.intellij.util.indexing.containers.RandomAccessIntContainer
-- intIterator():com.intellij.util.indexing.containers.IntIdsIterator
-- remove(I):Z
-- size():I
-- upgrade():V
-com.intellij.util.indexing.containers.UpgradableRandomAccessIntContainer$InstanceUpgrader
-- a:createFrom(com.intellij.util.indexing.containers.RandomAccessIntContainer):com.intellij.util.indexing.containers.RandomAccessIntContainer
 a:com.intellij.util.indexing.impl.AbstractUpdateData
 - p:<init>(I):V
 - getInputId():I
@@ -5962,23 +5738,6 @@ f:com.intellij.util.lang.JavaVersion
 - toFeatureMinorUpdateString():java.lang.String
 - toFeatureString():java.lang.String
 - s:tryParse(java.lang.String):com.intellij.util.lang.JavaVersion
-f:com.intellij.util.ref.GCUtil
-- <init>():V
-- s:clearBeanInfoCache():V
-- s:tryGcSoftlyReachableObjects():V
-- s:tryGcSoftlyReachableObjects(java.util.function.BooleanSupplier):V
-f:com.intellij.util.ref.GCWatcher
-- ensureCollected():V
-- ensureCollected(java.lang.Runnable):V
-- s:fromClearedRef(com.intellij.openapi.util.Ref):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object,java.lang.Object):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object,java.lang.Object,java.lang.Object):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):com.intellij.util.ref.GCWatcher
-- s:tracking(java.util.Collection):com.intellij.util.ref.GCWatcher
-- s:tracking(java.lang.Object[]):com.intellij.util.ref.GCWatcher
-- tryCollect(I):Z
 e:com.intellij.util.system.CpuArch
 - java.lang.Enum
 - sf:ARM32:com.intellij.util.system.CpuArch
diff --git a/platform/util/src/com/intellij/concurrency/client/ClientIdPropagation.kt b/platform/util/src/com/intellij/concurrency/client/ClientIdPropagation.kt
index 37bb19ba5ff9..681ffc22d479 100644
--- a/platform/util/src/com/intellij/concurrency/client/ClientIdPropagation.kt
+++ b/platform/util/src/com/intellij/concurrency/client/ClientIdPropagation.kt
@@ -35,6 +35,7 @@ private inline fun <T> withClientId(clientId: String?, action: () -> T): T {
 internal fun withClientId(clientId: String?, action: Runnable) = withClientId(clientId, action::run)
 internal fun <T> withClientId(clientId: String?, callable: Callable<T>) = withClientId(clientId, callable::call)
 
+@ApiStatus.Internal
 fun captureClientIdInRunnable(runnable: Runnable): Runnable {
   if (!propagateClientIdAcrossThreads) return runnable
   val currentId = currentClientIdString
@@ -45,6 +46,7 @@ fun captureClientIdInRunnable(runnable: Runnable): Runnable {
   }
 }
 
+@ApiStatus.Internal
 fun <T> captureClientIdInCallable(callable: Callable<T>): Callable<T> {
   if (!propagateClientIdAcrossThreads) return callable
   val currentId = currentClientIdString
@@ -55,6 +57,7 @@ fun <T> captureClientIdInCallable(callable: Callable<T>): Callable<T> {
   }
 }
 
+@ApiStatus.Internal
 fun <T> captureClientIdInProcessor(processor: Processor<T>): Processor<T> {
   if (!propagateClientIdAcrossThreads) return processor
   val currentId = currentClientIdString
@@ -65,6 +68,7 @@ fun <T> captureClientIdInProcessor(processor: Processor<T>): Processor<T> {
   }
 }
 
+@ApiStatus.Internal
 fun <T> captureClientId(action: () -> T): () -> T {
   if (propagateClientIdAcrossThreads) return action
   val currentId = currentClientIdString
@@ -75,6 +79,7 @@ fun <T> captureClientId(action: () -> T): () -> T {
   }
 }
 
+@ApiStatus.Internal
 fun <T, R> captureClientIdInFunction(function: Function<T, R>): Function<T, R> {
   if (!propagateClientIdAcrossThreads) return function
   val currentId = currentClientIdString
@@ -85,6 +90,7 @@ fun <T, R> captureClientIdInFunction(function: Function<T, R>): Function<T, R> {
   }
 }
 
+@ApiStatus.Internal
 fun <T, U> captureClientIdInBiConsumer(biConsumer: BiConsumer<T, U>): BiConsumer<T, U> {
   if (!propagateClientIdAcrossThreads) return biConsumer
   val currentId = currentClientIdString
diff --git a/platform/util/src/com/intellij/concurrency/threadContext.kt b/platform/util/src/com/intellij/concurrency/threadContext.kt
index 323567981dd8..6df6d1b2f3fd 100644
--- a/platform/util/src/com/intellij/concurrency/threadContext.kt
+++ b/platform/util/src/com/intellij/concurrency/threadContext.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.internal.intellij.IntellijCoroutines
 import org.jetbrains.annotations.ApiStatus.Experimental
 import org.jetbrains.annotations.ApiStatus.Internal
+import org.jetbrains.annotations.TestOnly
 import org.jetbrains.annotations.VisibleForTesting
 import java.util.concurrent.Callable
 import java.util.function.Consumer
@@ -101,6 +102,7 @@ private inline fun currentThreadContextOrFallback(getter: (CoroutineContext?) ->
 }
 
 @VisibleForTesting
+@TestOnly
 fun currentThreadContextOrNull(): CoroutineContext? {
   return currentThreadContextOrFallback { null }
 }
diff --git a/platform/util/src/com/intellij/openapi/application/JetBrainsProtocolHandler.java b/platform/util/src/com/intellij/openapi/application/JetBrainsProtocolHandler.java
index d3b10e2e317a..0224ba0e3ec4 100644
--- a/platform/util/src/com/intellij/openapi/application/JetBrainsProtocolHandler.java
+++ b/platform/util/src/com/intellij/openapi/application/JetBrainsProtocolHandler.java
@@ -1,6 +1,9 @@
 // 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.application;
 
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
 public final class JetBrainsProtocolHandler {
   public static final String REQUIRED_PLUGINS_KEY = "idea.required.plugins.id";
 }
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java b/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
index a66960e6ac90..d53ebf627ae9 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
@@ -5,14 +5,12 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.util.ExceptionUtil;
 import com.intellij.util.containers.FixedHashMap;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
+import org.jetbrains.annotations.*;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+@ApiStatus.Internal
 public final class FrequentEventDetector {
   private static final Logger LOG = Logger.getInstance(FrequentEventDetector.class);
 
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/JulLogger.java b/platform/util/src/com/intellij/openapi/diagnostic/JulLogger.java
index 69701b9254ec..e0e67ca4e75c 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/JulLogger.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/JulLogger.java
@@ -15,6 +15,7 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
+@ApiStatus.Internal
 public class JulLogger extends Logger {
   @SuppressWarnings("NonConstantLogger") protected final java.util.logging.Logger myLogger;
   private static final boolean CLEANER_DELAYED;
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/RollingFileHandler.kt b/platform/util/src/com/intellij/openapi/diagnostic/RollingFileHandler.kt
index a01264e3b99f..5e28d7514cb3 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/RollingFileHandler.kt
+++ b/platform/util/src/com/intellij/openapi/diagnostic/RollingFileHandler.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.diagnostic
 
+import org.jetbrains.annotations.ApiStatus
 import java.io.BufferedOutputStream
 import java.io.IOException
 import java.io.OutputStream
@@ -10,6 +11,7 @@ import java.util.logging.Level
 import java.util.logging.LogRecord
 import java.util.logging.StreamHandler
 
+@ApiStatus.Internal
 class RollingFileHandler @JvmOverloads constructor(
   val logPath: Path,
   val limit: Long,
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/ThrottledLogger.java b/platform/util/src/com/intellij/openapi/diagnostic/ThrottledLogger.java
index dd16896bc737..9d774786dedb 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/ThrottledLogger.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/ThrottledLogger.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.diagnostic;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -13,6 +14,7 @@ import static java.util.Objects.requireNonNull;
  * Logger wrapper that ignores repeating logging attempts if they are done inside specified throttling interval
  * (see ignoreRepeatedMessagesInMs ctor arg)
  */
+@ApiStatus.Internal
 public final class ThrottledLogger {
   private final @NotNull Logger logger;
   /**
diff --git a/platform/util/src/com/intellij/openapi/util/FieldCache.java b/platform/util/src/com/intellij/openapi/util/FieldCache.java
index 4802f210191c..6b06620aa3d3 100644
--- a/platform/util/src/com/intellij/openapi/util/FieldCache.java
+++ b/platform/util/src/com/intellij/openapi/util/FieldCache.java
@@ -16,8 +16,11 @@
 
 package com.intellij.openapi.util;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+@ApiStatus.Internal
 public abstract class FieldCache<T, Owner,AccessorParameter,Parameter> {
   private final ReentrantReadWriteLock.ReadLock r;
   private final ReentrantReadWriteLock.WriteLock w;
diff --git a/platform/util/src/com/intellij/openapi/util/NullUtils.java b/platform/util/src/com/intellij/openapi/util/NullUtils.java
index 986df00943b6..f6cdb5531528 100644
--- a/platform/util/src/com/intellij/openapi/util/NullUtils.java
+++ b/platform/util/src/com/intellij/openapi/util/NullUtils.java
@@ -44,19 +44,5 @@ public final class NullUtils {
     return ArrayUtil.contains(null, objects);
   }
 
-  /**
-   * Returns <tt>true</tt> if and only if at least one object is not <tt>null</tt>
-   *
-   * @param objects objects to check
-   * @return <tt>false</tt> if all objects are <tt>null</tt>,
-   *         otherwise <tt>true</tt>
-   */
-  public static boolean hasNotNull(Object @NotNull ... objects) {
-    for (Object object : objects) {
-      if (object != null) return true;
-    }
-    return false;
-  }
-
   private NullUtils() {}
 }
diff --git a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
index 60e19969d2cb..1fddbc656c03 100644
--- a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
+++ b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
@@ -11,6 +11,8 @@ import java.util.List;
  * A helper object for {@link RecursionManager}. It's obtained from {@link RecursionManager#createGuard(String)}.
  */
 public abstract class RecursionGuard<Key> {
+  RecursionGuard() {
+  }
 
   /**
    * Run the given computation, unless it's already running in this thread.
diff --git a/platform/util/src/com/intellij/openapi/util/SafeStAXStreamBuilder.kt b/platform/util/src/com/intellij/openapi/util/SafeStAXStreamBuilder.kt
index 2d35a21506cb..db2c58a8c55f 100644
--- a/platform/util/src/com/intellij/openapi/util/SafeStAXStreamBuilder.kt
+++ b/platform/util/src/com/intellij/openapi/util/SafeStAXStreamBuilder.kt
@@ -15,6 +15,7 @@ import javax.xml.stream.XMLStreamException
 // DTD, COMMENT and PROCESSING_INSTRUCTION are ignored
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildJdomDocument(stream: XMLStreamReader2): Document {
   var state = stream.eventType
 
@@ -57,6 +58,7 @@ fun buildJdomDocument(stream: XMLStreamReader2): Document {
 }
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildNsUnawareJdom(reader: Reader): Element {
   val xmlStreamReader = createXmlStreamReader(reader)
   try {
@@ -68,6 +70,7 @@ fun buildNsUnawareJdom(reader: Reader): Element {
 }
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildNsUnawareJdom(data: ByteArray): Element {
   val xmlStreamReader = createXmlStreamReader(data)
   try {
@@ -79,6 +82,7 @@ fun buildNsUnawareJdom(data: ByteArray): Element {
 }
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildNsUnawareJdom(file: Path): Element {
   val xmlStreamReader = createXmlStreamReader(Files.newInputStream(file))
   try {
@@ -90,11 +94,13 @@ fun buildNsUnawareJdom(file: Path): Element {
 }
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildNsUnawareJdomAndClose(stream: XMLStreamReader2): Element {
   return buildJdom(stream = stream, isNsSupported = false)
 }
 
 @Throws(XMLStreamException::class)
+@ApiStatus.Internal
 fun buildJdom(
   stream: XMLStreamReader2,
   isNsSupported: Boolean,
diff --git a/platform/util/src/com/intellij/openapi/util/TextRangeScalarUtil.java b/platform/util/src/com/intellij/openapi/util/TextRangeScalarUtil.java
index e2af7e7c05ee..6a4bbe7d8e36 100644
--- a/platform/util/src/com/intellij/openapi/util/TextRangeScalarUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/TextRangeScalarUtil.java
@@ -2,6 +2,7 @@
 package com.intellij.openapi.util;
 
 import com.intellij.util.MathUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -9,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
  * which logically consists of two {@code int} parts: for {@link TextRange#myStartOffset} and {@link TextRange#myEndOffset}.
  * It might be useful to address atomicity or memory concerns.
  */
+@ApiStatus.Internal
 public final class TextRangeScalarUtil {
   public static long toScalarRange(@NotNull Segment range) {
     return toScalarRange(range.getStartOffset(), range.getEndOffset());
diff --git a/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedByteArray.java b/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedByteArray.java
index b9911fd0617b..4c28a728f363 100644
--- a/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedByteArray.java
+++ b/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedByteArray.java
@@ -16,9 +16,11 @@
 package com.intellij.openapi.util;
 
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.lang.ref.SoftReference;
 
+@ApiStatus.Internal
 public final class ThreadLocalCachedByteArray {
   private final ThreadLocal<SoftReference<byte[]>> myThreadLocal = new ThreadLocal<>();
 
diff --git a/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedValue.java b/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedValue.java
index 8de91c6cc5f6..b07e77ee2412 100644
--- a/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedValue.java
+++ b/platform/util/src/com/intellij/openapi/util/ThreadLocalCachedValue.java
@@ -1,10 +1,12 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.util;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.SoftReference;
 
+@ApiStatus.Internal
 public abstract class ThreadLocalCachedValue<T> {
   private final ThreadLocal<SoftReference<T>> myThreadLocal = new ThreadLocal<>();
 
diff --git a/platform/util/src/com/intellij/openapi/util/io/PathExecLazyValue.java b/platform/util/src/com/intellij/openapi/util/io/PathExecLazyValue.java
index 6c7da016dcc4..5d41a24d41f0 100644
--- a/platform/util/src/com/intellij/openapi/util/io/PathExecLazyValue.java
+++ b/platform/util/src/com/intellij/openapi/util/io/PathExecLazyValue.java
@@ -6,11 +6,13 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.util.text.Strings;
 import com.intellij.util.EnvironmentUtil;
 import com.intellij.util.concurrency.SynchronizedClearableLazy;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.function.Supplier;
 
+@ApiStatus.Internal
 public final class PathExecLazyValue {
   private PathExecLazyValue() { }
 
diff --git a/platform/util/src/com/intellij/openapi/util/text/InjectorMatchingEndFinder.java b/platform/util/src/com/intellij/openapi/util/text/InjectorMatchingEndFinder.java
index 136848876cf8..f3705370122b 100644
--- a/platform/util/src/com/intellij/openapi/util/text/InjectorMatchingEndFinder.java
+++ b/platform/util/src/com/intellij/openapi/util/text/InjectorMatchingEndFinder.java
@@ -1,11 +1,13 @@
 // Copyright 2000-2020 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.openapi.util.text;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import static java.lang.Math.min;
 
+@ApiStatus.Internal
 public final class InjectorMatchingEndFinder {
   public static int findMatchingEnd(@NotNull String startSymbol, @NotNull String endSymbol, @NotNull String text, int afterStartIdx) {
     if (afterStartIdx < 0) return -1;
diff --git a/platform/util/src/com/intellij/openapi/util/text/PastParticiple.java b/platform/util/src/com/intellij/openapi/util/text/PastParticiple.java
index e2546b9f58c0..22ffbb50a846 100644
--- a/platform/util/src/com/intellij/openapi/util/text/PastParticiple.java
+++ b/platform/util/src/com/intellij/openapi/util/text/PastParticiple.java
@@ -2,6 +2,7 @@
 package com.intellij.openapi.util.text;
 
 import com.intellij.util.containers.CollectionFactory;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
@@ -12,6 +13,7 @@ import static com.intellij.openapi.util.text.StringUtil.isVowel;
 /**
  * @author Bas Leijdekkers
  */
+@ApiStatus.Internal
 public final class PastParticiple {
 
   private static final int IRREGULAR_SIZE = 175;
diff --git a/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java b/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
index c06d68870c8d..74b09f2cf822 100644
--- a/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
+++ b/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
@@ -2,6 +2,7 @@
 package com.intellij.openapi.vfs;
 
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,6 +45,7 @@ import java.util.Map;
  *
  * @author Guillaume LAFORGE
  */
+@ApiStatus.Internal
 public final class CharsetToolkit {
   public static final String UTF8 = "UTF-8";
   /** @deprecated use {@link StandardCharsets#UTF_8} instead */
@@ -278,6 +280,7 @@ public final class CharsetToolkit {
     }
   }
 
+  @ApiStatus.Internal
   public enum GuessedEncoding {
     SEVEN_BIT,     // ASCII characters only
     VALID_UTF8,    // UTF-8
diff --git a/platform/util/src/com/intellij/util/indexing/containers/BitSetAsRAIntContainer.java b/platform/util/src/com/intellij/util/indexing/containers/BitSetAsRAIntContainer.java
index 4c69b37fbc25..4e120045e434 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/BitSetAsRAIntContainer.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/BitSetAsRAIntContainer.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.indexing.containers;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.BitSet;
@@ -11,6 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @implNote not thread-safe. {@code size()} might give wrong results if collection is modified concurrently
  */
+@ApiStatus.Internal
 public final class BitSetAsRAIntContainer implements RandomAccessIntContainer {
   private final BitSet myBitSet;
   private final AtomicInteger myElementsCount;
diff --git a/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java b/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java
index 0bf4d469e833..e5e0c9e4d43d 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java
@@ -2,6 +2,7 @@
 package com.intellij.util.indexing.containers;
 
 import com.intellij.util.indexing.ValueContainer;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Arrays;
 import java.util.function.IntPredicate;
@@ -19,6 +20,7 @@ import java.util.function.IntPredicate;
  * synchronization is performed upon transforming changes array into randomAccessContainer because it can be done
  * during read only operations in several threads
  */
+@ApiStatus.Internal
 public final class ChangeBufferingList implements Cloneable {
   static final int MAX_FILES = 20000; // less than Short.MAX_VALUE
 
diff --git a/platform/util/src/com/intellij/util/indexing/containers/IntHashSetAsRAIntContainer.java b/platform/util/src/com/intellij/util/indexing/containers/IntHashSetAsRAIntContainer.java
index e24083efb97c..e7525a6b6ab8 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/IntHashSetAsRAIntContainer.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/IntHashSetAsRAIntContainer.java
@@ -2,10 +2,12 @@
 package com.intellij.util.indexing.containers;
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;
 
+@ApiStatus.Internal
 public final class IntHashSetAsRAIntContainer implements RandomAccessIntContainer {
   private final IntOpenHashSet myHashSet;
 
diff --git a/platform/util/src/com/intellij/util/indexing/containers/SortedFileIdSetIterator.java b/platform/util/src/com/intellij/util/indexing/containers/SortedFileIdSetIterator.java
index 6221b46810f3..bf8e3a4f6a5d 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/SortedFileIdSetIterator.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/SortedFileIdSetIterator.java
@@ -2,7 +2,9 @@
 package com.intellij.util.indexing.containers;
 
 import com.intellij.openapi.util.ThreadLocalCachedIntArray;
+import org.jetbrains.annotations.ApiStatus;
 
+@ApiStatus.Internal
 public final class SortedFileIdSetIterator implements IntIdsIterator {
   private final int[] myBits;
   private final int myBitsLength;
diff --git a/platform/util/src/com/intellij/util/indexing/containers/SortedIdSet.java b/platform/util/src/com/intellij/util/indexing/containers/SortedIdSet.java
index 2932a7510fb2..2c15554aa891 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/SortedIdSet.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/SortedIdSet.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Arrays;
 import java.util.function.IntPredicate;
 
-public final class SortedIdSet implements Cloneable, RandomAccessIntContainer {
+final class SortedIdSet implements Cloneable, RandomAccessIntContainer {
   private int[] mySet;
   private int mySetLength;
   private int mySize;
diff --git a/platform/util/src/com/intellij/util/indexing/containers/UpgradableRandomAccessIntContainer.java b/platform/util/src/com/intellij/util/indexing/containers/UpgradableRandomAccessIntContainer.java
index f2e685e36eb7..f6c911b60f1e 100644
--- a/platform/util/src/com/intellij/util/indexing/containers/UpgradableRandomAccessIntContainer.java
+++ b/platform/util/src/com/intellij/util/indexing/containers/UpgradableRandomAccessIntContainer.java
@@ -2,6 +2,7 @@
 package com.intellij.util.indexing.containers;
 
 import com.intellij.openapi.diagnostic.Logger;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Supplier;
@@ -11,6 +12,7 @@ import java.util.function.Supplier;
  * @param <T> implementation that is used while size < threshold
  * @param <F> implementation that is used once threshold is reached
  */
+@ApiStatus.Internal
 public final class UpgradableRandomAccessIntContainer<
   T extends RandomAccessIntContainer,
   F extends RandomAccessIntContainer> implements RandomAccessIntContainer {
diff --git a/platform/util/src/com/intellij/util/ref/GCUtil.java b/platform/util/src/com/intellij/util/ref/GCUtil.java
index b0d3aa67e8c2..622352703d3b 100644
--- a/platform/util/src/com/intellij/util/ref/GCUtil.java
+++ b/platform/util/src/com/intellij/util/ref/GCUtil.java
@@ -3,6 +3,7 @@ package com.intellij.util.ref;
 
 import com.intellij.diagnostic.ThreadDumper;
 import com.intellij.openapi.util.EmptyRunnable;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.function.BooleanSupplier;
 
 @SuppressWarnings("CallToSystemGC")
+@ApiStatus.Internal
 public final class GCUtil {
   /**
    * Try to force VM to collect soft references if possible.
diff --git a/platform/util/src/com/intellij/util/ref/GCWatcher.java b/platform/util/src/com/intellij/util/ref/GCWatcher.java
index 6881da9af538..028c5a8960f8 100644
--- a/platform/util/src/com/intellij/util/ref/GCWatcher.java
+++ b/platform/util/src/com/intellij/util/ref/GCWatcher.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.reference.SoftReference;
 import com.intellij.util.MemoryDumpHelper;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
@@ -27,6 +28,7 @@ import java.util.Set;
  * so, if you pass fields or local variables there, nullify them before calling {@link #ensureCollected()}.
  *
  */
+@ApiStatus.Internal
 public final class GCWatcher {
   private final ReferenceQueue<Object> myQueue = new ReferenceQueue<>();
   private final Set<Reference<?>> myReferences = ContainerUtil.newConcurrentSet();