diff --git a/java/java-terminal/BUILD.bazel b/java/java-terminal/BUILD.bazel
index bd478ef0d87d..38d437604a89 100644
--- a/java/java-terminal/BUILD.bazel
+++ b/java/java-terminal/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//plugins/terminal",
     "//platform/core-api:core",
     "//java/execution/impl",
+    "//plugins/terminal/completion",
     "//platform/lang-impl",
   ],
   runtime_deps = [":terminal_resources"]
@@ -44,6 +45,8 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//java/execution/impl",
+    "//plugins/terminal/completion",
+    "//plugins/terminal/completion:completion_test_lib",
     "//plugins/terminal",
     "//plugins/terminal:terminal_test_lib",
   ]
diff --git a/java/java-terminal/intellij.java.terminal.iml b/java/java-terminal/intellij.java.terminal.iml
index dbafbb7d2592..52bc197d09b3 100644
--- a/java/java-terminal/intellij.java.terminal.iml
+++ b/java/java-terminal/intellij.java.terminal.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.terminal" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.terminal.completion" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-terminal/intellij.java.terminal.tests.iml b/java/java-terminal/intellij.java.terminal.tests.iml
index ef2b18a33e20..c5c1d6e656e2 100644
--- a/java/java-terminal/intellij.java.terminal.tests.iml
+++ b/java/java-terminal/intellij.java.terminal.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.terminal.completion" scope="TEST" />
     <orderEntry type="module" module-name="intellij.terminal" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandContext.kt b/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandContext.kt
index 46d110e4ce86..d8b9270d705a 100644
--- a/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandContext.kt
+++ b/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandContext.kt
@@ -15,7 +15,7 @@ class JavaShellCommandContext private constructor(private val propertyMap: Map<S
 
   companion object {
     private const val PROPERTY_SEPARATOR = " = "
-    const val JAVA_SHOW_SETTINGS_PROPERTIES_VERSION_COMMAND = "java -XshowSettings:properties -version"
+    const val JAVA_SHOW_SETTINGS_PROPERTIES_VERSION_COMMAND: String = "java -XshowSettings:properties -version"
 
     suspend fun create(context: ShellRuntimeContext): JavaShellCommandContext? {
       val result = context.runShellCommand(JAVA_SHOW_SETTINGS_PROPERTIES_VERSION_COMMAND)
diff --git a/java/openapi/BUILD.bazel b/java/openapi/BUILD.bazel
index dc80cccf1d69..6b476d01139d 100644
--- a/java/openapi/BUILD.bazel
+++ b/java/openapi/BUILD.bazel
@@ -50,7 +50,6 @@ jvm_library(
   ],
   exports = [
     "//platform/util",
-    "//platform/extensions",
     "//xml/openapi:xml",
     "//platform/lang-api:lang",
     "//java/java-psi-api:psi",
diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml
index fbe18606b3e2..88ebb0e9d28a 100644
--- a/java/openapi/intellij.java.iml
+++ b/java/openapi/intellij.java.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" scope="PROVIDED" />
-    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
     <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.xml" exported="" />
diff --git a/platform/platform-resources/BUILD.bazel b/platform/platform-resources/BUILD.bazel
index 7accd7695558..fc04cdfa0476 100644
--- a/platform/platform-resources/BUILD.bazel
+++ b/platform/platform-resources/BUILD.bazel
@@ -11,9 +11,6 @@ jvm_resources(
 java_library(
   name = "resources",
   visibility = ["//visibility:public"],
-  runtime_deps = [
-    ":resources_resources",
-    "//platform/util",
-  ]
+  runtime_deps = [":resources_resources"]
 )
 ### auto-generated section `build intellij.platform.resources` end
\ No newline at end of file
diff --git a/platform/platform-resources/intellij.platform.resources.iml b/platform/platform-resources/intellij.platform.resources.iml
index 3742bbd618ab..7067f6a01440 100644
--- a/platform/platform-resources/intellij.platform.resources.iml
+++ b/platform/platform-resources/intellij.platform.resources.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.util" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.monolith.main" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/structure-view-impl/BUILD.bazel b/platform/structure-view-impl/BUILD.bazel
index 00f34f699003..19ddf3a19760 100644
--- a/platform/structure-view-impl/BUILD.bazel
+++ b/platform/structure-view-impl/BUILD.bazel
@@ -28,10 +28,7 @@ jvm_library(
     "//platform/core-ui",
     "//platform/statistics",
   ],
-  exports = [
-    "//platform/util",
-    "//platform/extensions",
-  ],
+  exports = ["//platform/util"],
   runtime_deps = [":structureView-impl_resources"]
 )
 ### auto-generated section `build intellij.platform.structureView.impl` end
\ No newline at end of file
diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
index 50b45d2e3d26..6941833024a7 100644
--- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml
+++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="library" name="automaton" level="project" />
diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel
index 7c6f644f088c..faa12df4439b 100644
--- a/plugins/terminal/BUILD.bazel
+++ b/plugins/terminal/BUILD.bazel
@@ -62,7 +62,6 @@ jvm_library(
     "//platform/eel-provider",
     "//platform/util/jdom",
   ],
-  exports = ["//plugins/terminal/completion"],
   runtime_deps = [":terminal_resources"]
 )
 
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index d4b9e0469511..18a5cbc9e9bb 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -59,7 +59,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
-    <orderEntry type="module" module-name="intellij.terminal.completion" exported="" />
+    <orderEntry type="module" module-name="intellij.terminal.completion" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
     <orderEntry type="library" name="caffeine" level="project" />