diff --git a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugPanel.kt b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugPanel.kt
index f99ab415bb61..d13654f1a180 100644
--- a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugPanel.kt
+++ b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugPanel.kt
@@ -60,7 +60,7 @@ import javax.swing.tree.DefaultMutableTreeNode
 
 private val LOG = Logger.getInstance(PsiViewerDebugAction::class.java)
 
-class PsiViewerDebugPanel(
+internal class PsiViewerDebugPanel(
   private val project: Project,
   private val editor: EditorEx,
   private val language: Language,
@@ -341,7 +341,7 @@ class PsiViewerDebugPanel(
     debugSession.removeSessionListener(watchListener)
   }
 
-  internal companion object {
+  companion object {
     fun getTitle(name: @Nls String, inWatchMode: Boolean): @Nls String {
       return if (inWatchMode) name else "$name ${DateFormatUtil.formatTimeWithSeconds(System.currentTimeMillis())}"
     }
diff --git a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSelectUIAction.kt b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSelectUIAction.kt
index e43bf0ee813c..e054b62fab5a 100644
--- a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSelectUIAction.kt
+++ b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSelectUIAction.kt
@@ -1,11 +1,11 @@
-// 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 com.intellij.java.dev.psiViewer.debug
 
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.ToggleAction
 
-class PsiViewerDebugSelectUIAction : ToggleAction() {
+internal class PsiViewerDebugSelectUIAction : ToggleAction() {
   override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
 
   override fun isSelected(e: AnActionEvent): Boolean = PsiViewerDebugSettings.getInstance().showDialogFromDebugAction
diff --git a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSettings.kt b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSettings.kt
index eda8c27d8738..2cb51459bd08 100644
--- a/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSettings.kt
+++ b/plugins/dev/intellij.java.dev/src/psiViewer/debug/PsiViewerDebugSettings.kt
@@ -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 com.intellij.java.dev.psiViewer.debug
 
 import com.intellij.openapi.components.*
@@ -6,7 +6,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil
 
 @Service
 @State(name = "PsiViewerDebugSettings", storages = [Storage(StoragePathMacros.NON_ROAMABLE_FILE)])
-class PsiViewerDebugSettings : PersistentStateComponent<PsiViewerDebugSettings> {
+internal class PsiViewerDebugSettings : PersistentStateComponent<PsiViewerDebugSettings> {
   var showDialogFromDebugAction: Boolean = false
 
   var watchMode: Boolean = false