diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
index 778963e5a101..fdf7757a4680 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
@@ -459,6 +459,8 @@ object CommunityModuleSets : ModuleSetProvider {
     embeddedModule("intellij.platform.builtInServer.impl")
     embeddedModule("intellij.platform.smRunner")
     embeddedModule("intellij.platform.externalSystem.dependencyUpdater")
+    embeddedModule("intellij.platform.externalSystem.impl")
+    embeddedModule("intellij.platform.externalProcessAuthHelper")
   }
 
   /**
diff --git a/platform/external-process-auth-helper/module-content.yaml b/platform/external-process-auth-helper/module-content.yaml
new file mode 100644
index 000000000000..2ef74c8e10b3
--- /dev/null
+++ b/platform/external-process-auth-helper/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/intellij.platform.externalProcessAuthHelper.jar
+  modules:
+  - name: intellij.platform.externalProcessAuthHelper
\ No newline at end of file
diff --git a/platform/external-process-auth-helper/resources/META-INF/ExternalProcessAuthHelper.xml b/platform/external-process-auth-helper/resources/intellij.platform.externalProcessAuthHelper.xml
similarity index 84%
rename from platform/external-process-auth-helper/resources/META-INF/ExternalProcessAuthHelper.xml
rename to platform/external-process-auth-helper/resources/intellij.platform.externalProcessAuthHelper.xml
index 6b5fae4fdbb0..bd8704d78bc1 100644
--- a/platform/external-process-auth-helper/resources/META-INF/ExternalProcessAuthHelper.xml
+++ b/platform/external-process-auth-helper/resources/intellij.platform.externalProcessAuthHelper.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="internal">
   <extensions defaultExtensionNs="com.intellij">
     <httpRequestHandler implementation="com.intellij.externalProcessAuthHelper.NativeSshExternalProcessRest"/>
   </extensions>
diff --git a/platform/external-system-impl/module-content.yaml b/platform/external-system-impl/module-content.yaml
new file mode 100644
index 000000000000..d13cff097e1a
--- /dev/null
+++ b/platform/external-system-impl/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/intellij.platform.externalSystem.impl.jar
+  modules:
+  - name: intellij.platform.externalSystem.impl
\ No newline at end of file
diff --git a/platform/external-system-impl/resources/META-INF/ExternalSystem.xml b/platform/external-system-impl/resources/META-INF/ExternalSystem.xml
deleted file mode 100644
index 3e37e7b59de2..000000000000
--- a/platform/external-system-impl/resources/META-INF/ExternalSystem.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="ExternalSystemExtensionPoints.xml"/>
-  <xi:include href="ExternalSystemExtensions.xml"/>
-  <xi:include href="ExternalSystemActions.xml"/>
-</idea-plugin>
\ No newline at end of file
diff --git a/platform/external-system-impl/resources/intellij.platform.externalSystem.impl.xml b/platform/external-system-impl/resources/intellij.platform.externalSystem.impl.xml
new file mode 100644
index 000000000000..00275f17134d
--- /dev/null
+++ b/platform/external-system-impl/resources/intellij.platform.externalSystem.impl.xml
@@ -0,0 +1,9 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
+  <dependencies>
+    <module name="intellij.platform.ide.impl"/>
+  </dependencies>
+
+  <xi:include href="/META-INF/ExternalSystemExtensionPoints.xml"/>
+  <xi:include href="/META-INF/ExternalSystemExtensions.xml"/>
+  <xi:include href="/META-INF/ExternalSystemActions.xml"/>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.platformLangBase.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platformLangBase.xml
index 4c134aa14d38..a2329ded595c 100644
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.platformLangBase.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.platformLangBase.xml
@@ -7,5 +7,7 @@
     <module name="intellij.platform.builtInServer.impl" loading="embedded"/>
     <module name="intellij.platform.smRunner" loading="embedded"/>
     <module name="intellij.platform.externalSystem.dependencyUpdater" loading="embedded"/>
+    <module name="intellij.platform.externalSystem.impl" loading="embedded"/>
+    <module name="intellij.platform.externalProcessAuthHelper" loading="embedded"/>
   </content>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index a00638490a08..4fd5e3e8412a 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -153,11 +153,4 @@
   <xi:include href="/META-INF/GraphPlugin.xml">
     <xi:fallback/>
   </xi:include>
-
-  <xi:include href="/META-INF/ExternalProcessAuthHelper.xml">
-    <xi:fallback/>
-  </xi:include>
-  <xi:include href="/META-INF/ExternalSystem.xml">
-    <xi:fallback/>
-  </xi:include>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index d87cbf3b4bb9..5d4b1542e020 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -16,10 +16,14 @@
       ]]>
   </description>
 
-  <depends>com.intellij.modules.lang</depends>
-  <depends>com.intellij.modules.externalSystem</depends>
   <depends optional="true" config-file="gradle-properties.xml">com.intellij.properties</depends>
 
+  <dependencies>
+    <plugin id="com.intellij.modules.lang"/>
+    <plugin id="com.intellij.modules.externalSystem"/>
+    <module name="intellij.platform.externalSystem.impl"/>
+  </dependencies>
+
   <resource-bundle>messages.GradleBundle</resource-bundle>
 
   <extensionPoints>