diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel
index 00ebdd359d91..bd0848ba51b1 100644
--- a/platform/execution-impl/BUILD.bazel
+++ b/platform/execution-impl/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
+    "//platform/remote-core",
     "//platform/statistics",
     "//platform/platform-impl:ide-impl",
     "//platform/macro",
diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
index e5f52ed6715d..51583bc4fb6b 100644
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -47,6 +47,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.macro" />
diff --git a/platform/platform-api/BUILD.bazel b/platform/platform-api/BUILD.bazel
index 06bf2526e5be..bda060444de3 100644
--- a/platform/platform-api/BUILD.bazel
+++ b/platform/platform-api/BUILD.bazel
@@ -59,7 +59,6 @@ jvm_library(
   exports = [
     "//platform/util",
     "//platform/forms_rt:java-guiForms-rt",
-    "//platform/remote-core",
     "//platform/ide-core",
     "//platform/progress/shared:ide-progress",
   ],
diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml
index 146c6eca049c..c7caf286f3cb 100644
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -30,7 +30,7 @@
     <orderEntry type="library" name="jcef" level="project" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
-    <orderEntry type="module" module-name="intellij.platform.remote.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
diff --git a/platform/platform-impl/remote/BUILD.bazel b/platform/platform-impl/remote/BUILD.bazel
index fb97bcd42610..5a5420468364 100644
--- a/platform/platform-impl/remote/BUILD.bazel
+++ b/platform/platform-impl/remote/BUILD.bazel
@@ -10,6 +10,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/projectModel-api:projectModel",
+    "//platform/remote-core",
     "//platform/util/jdom",
     "//platform/platform-util-io:ide-util-io",
     "//platform/lang-core",
diff --git a/platform/platform-impl/remote/intellij.platform.ide.remote.iml b/platform/platform-impl/remote/intellij.platform.ide.remote.iml
index 3ccca8c75ec3..672a436780da 100644
--- a/platform/platform-impl/remote/intellij.platform.ide.remote.iml
+++ b/platform/platform-impl/remote/intellij.platform.ide.remote.iml
@@ -10,6 +10,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel
index 871f959e6604..bd224fcc466c 100644
--- a/platform/platform-tests/BUILD.bazel
+++ b/platform/platform-tests/BUILD.bazel
@@ -38,6 +38,7 @@ jvm_library(
     "//platform/observable",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
+    "//platform/remote-core",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView-impl",
     "//platform/util/diff",
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index c6358fd20514..2dece4d83004 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -28,6 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" scope="TEST" />
diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel
index 91f887b252f3..cb8000b0cd31 100644
--- a/plugins/terminal/BUILD.bazel
+++ b/plugins/terminal/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "@lib//:pty4j",
     "@lib//:jna",
     "//platform/projectModel-api:projectModel",
+    "//platform/remote-core",
     "//platform/remote-servers/api:remoteServers",
     "//platform/remote-servers/impl",
     "@lib//:jediterm-core",
@@ -91,6 +92,7 @@ jvm_library(
     "@lib//:pty4j",
     "@lib//:jna",
     "//platform/projectModel-api:projectModel",
+    "//platform/remote-core",
     "//platform/remote-servers/api:remoteServers",
     "//platform/remote-servers/impl",
     "@lib//:junit4",
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 9ad57e8439e7..377b25f7bd9a 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -48,6 +48,7 @@
     <orderEntry type="library" name="pty4j" level="project" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.remoteServers" />
     <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index 72363eeb18f1..d6d20fc3f3c2 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -189,6 +189,7 @@ jvm_library(
     "//platform/macro",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
+    "//platform/remote-core",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView-impl",
     "//platform/workspace/storage",
@@ -374,6 +375,7 @@ jvm_library(
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
+    "//platform/remote-core",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/workspace/storage",
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index e1b8b7e8396d..eac029e4a1f0 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -45,6 +45,7 @@
     <orderEntry type="module" module-name="intellij.platform.macro" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml
index 9b56abb6c248..a41b836822e0 100644
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.psi" scope="TEST" />
diff --git a/python/testFramework/BUILD.bazel b/python/testFramework/BUILD.bazel
index 74f3e562a9fc..003a50d348f2 100644
--- a/python/testFramework/BUILD.bazel
+++ b/python/testFramework/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
+    "//platform/remote-core",
     "//platform/testFramework",
     "//python/python-sdk:sdk",
     "//platform/execution",
diff --git a/python/testFramework/intellij.python.community.testFramework.iml b/python/testFramework/intellij.python.community.testFramework.iml
index 29b824191cb3..a07c23c2ea67 100644
--- a/python/testFramework/intellij.python.community.testFramework.iml
+++ b/python/testFramework/intellij.python.community.testFramework.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.python.sdk" />
     <orderEntry type="module" module-name="intellij.platform.execution" />