diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java
index c6b894fb6633..0346bc1088ce 100644
--- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java
+++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java
@@ -1,8 +1,9 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.structuralsearch;
 
 import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.structuralsearch.plugin.ui.Configuration;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.structuralsearch.PredefinedConfigurationUtil.createConfiguration;
@@ -11,7 +12,8 @@ import static com.intellij.structuralsearch.PredefinedConfigurationUtil.createLe
 /**
  * @author Bas Leijdekkers
  */
-final class JavaPredefinedConfigurations {
+@ApiStatus.Internal
+public final class JavaPredefinedConfigurations {
   public static @NotNull Configuration @NotNull [] createPredefinedTemplates() {
     return new Configuration[]{
       // Expression patterns
diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/APIWrappers.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/APIWrappers.java
index 1f47b9066bc5..e16501274cac 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/APIWrappers.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/APIWrappers.java
@@ -126,7 +126,8 @@ public final class APIWrappers {
     }
   }
 
-  interface WrapperDelegateAccessor<T> {
+  @ApiStatus.Internal
+  public interface WrapperDelegateAccessor<T> {
     T getWrapperDelegate();
   }
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/CloseableMaplet.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/CloseableMaplet.java
index 9fb383ee3e33..55cbe64c0295 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/CloseableMaplet.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/CloseableMaplet.java
@@ -1,9 +1,11 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.builders.java.dependencyView;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
 
-interface CloseableMaplet {
+@ApiStatus.Internal
+public interface CloseableMaplet {
   /**
    */
   void close() throws BuildDataCorruptedException;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ParamAnnotation.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ParamAnnotation.java
index 77c822aeeb1e..94454f875bf0 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ParamAnnotation.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ParamAnnotation.java
@@ -1,8 +1,9 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.builders.java.dependencyView;
 
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.DataInputOutputUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
 
@@ -10,7 +11,8 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-final class ParamAnnotation implements RW.Savable {
+@ApiStatus.Internal
+public final class ParamAnnotation implements RW.Savable {
   public static final ParamAnnotation[] EMPTY_ARRAY = new ParamAnnotation[0];
 
   public final int paramIndex;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/TypeRepr.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/TypeRepr.java
index 621c9ab0aaff..34cb7c95cacb 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/TypeRepr.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/TypeRepr.java
@@ -1,8 +1,9 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.builders.java.dependencyView;
 
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.DataInputOutputUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
 import org.jetbrains.org.objectweb.asm.Type;
@@ -13,7 +14,8 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Set;
 
-final class TypeRepr {
+@ApiStatus.Internal
+public final class TypeRepr {
   private static final byte PRIMITIVE_TYPE = 0x0;
   private static final byte CLASS_TYPE = 0x1;
   private static final byte ARRAY_TYPE = 0x2;
@@ -22,7 +24,8 @@ final class TypeRepr {
 
   }
 
-  interface AbstractType extends RW.Savable {
+  @ApiStatus.Internal
+  public interface AbstractType extends RW.Savable {
     AbstractType[] EMPTY_TYPE_ARRAY = new AbstractType[0];
 
     void updateClassUsages(DependencyContext context, int owner, Set<? super UsageRepr.Usage> s);
diff --git a/plugins/git4idea/src/git4idea/push/GitPushSource.java b/plugins/git4idea/src/git4idea/push/GitPushSource.java
index 5a8c95de72e8..312e2009a377 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushSource.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushSource.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package git4idea.push;
 
 import com.intellij.dvcs.DvcsUtil;
@@ -6,6 +6,7 @@ import com.intellij.dvcs.push.PushSource;
 import com.intellij.openapi.util.NlsSafe;
 import git4idea.GitLocalBranch;
 import git4idea.GitTag;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -128,7 +129,8 @@ public abstract class GitPushSource implements PushSource {
     }
   }
 
-  static class Tag extends GitPushSource {
+  @ApiStatus.Internal
+  public static final class Tag extends GitPushSource {
     private final @NotNull GitTag tag;
 
     Tag(@NotNull GitTag tag) {