diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
index 9e07dbffe3f6..b53d95c93f9d 100644
--- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
@@ -100,6 +100,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
       putAll("javac2.jar", ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"])
 
     productLayout.additionalPlatformJars.put("resources.jar", "intellij.java.ide.resources")
+    productLayout.additionalPlatformJars.put("external-system-rt.jar", "intellij.platform.externalSystem.rt")
 
     productLayout.platformLayoutCustomizer = { PlatformLayout layout ->
       layout.customize {
diff --git a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
index 3fc4bb82c3aa..5730f7afd2f5 100644
--- a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
+++ b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
@@ -45,16 +45,6 @@
   </xi:include>
   <xi:include href="/META-INF/coverage-common-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <module value="com.intellij.modules.externalSystem"/>
-  <xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <extensionPoints>
-    <xi:include href="/META-INF/ExternalSystemExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
-  </extensionPoints>
-  <extensions defaultExtensionNs="com.intellij">
-    <xi:include href="/META-INF/ExternalSystemExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
-  </extensions>
-  <xi:include href="/idea/ExternalSystemActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
   <extensions defaultExtensionNs="com.intellij">
     <applicationInitializedListener implementation="com.intellij.internal.statistic.updater.StatisticsJobsScheduler"/>
 
diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml
index 9861832e711c..743bbb9129ea 100644
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -1,6 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" use-idea-classloader="true">
-  <!-- we need to use the platform classloader to make the plugin compatible with CLion until IDEA-187832 is fixed,
-       see cidr-external-system/resources/META-INF/plugin.xml for details -->
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij.java</id>
   <name>Java</name>
   <description>Java language support.</description>
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index e91a9fbeb4fb..c2dae30245a4 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -60,6 +60,7 @@ class CommunityRepositoryModules {
     "intellij.platform.lvcs.impl",
     "intellij.platform.ide.impl",
     "intellij.platform.projectModel.impl",
+    "intellij.platform.externalSystem.impl",
     "intellij.platform.scriptDebugger.protocolReaderRuntime",
     "intellij.regexp",
     "intellij.platform.remoteServers.impl",
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy
index 4d463a266622..631978ecdc5e 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy
@@ -61,11 +61,6 @@ class JavaPluginLayout {
         withModule(it, "java-impl.jar", "java_resources_en.jar")
       }
 
-      // externalSystem API is coupled with `java` modules and therefore must be included into the same plugin
-      // TODO[Vlad, IDEA-187832] remove this from Java plugin distribution as soon as the externalSystem API become java subsystem independent platform API
-      withModule("intellij.platform.externalSystem.impl")
-      withModule("intellij.platform.externalSystem.rt")
-
       withArtifact("debugger-agent", "rt")
       withArtifact("debugger-agent-storage", "rt")
       withProjectLibrary("Eclipse")
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 132533adbc44..f4dbd54d6389 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -6,6 +6,7 @@
   <module value="com.intellij.modules.lang"/>
   <module value="com.intellij.modules.vcs"/>
   <module value="com.intellij.modules.xdebugger"/>
+  <module value="com.intellij.modules.externalSystem"/>
 
   <xi:include href="/componentSets/PlatformLangComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/idea/PlatformLangActionManager.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -14,11 +15,13 @@
     <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
     <xi:include href="/META-INF/VcsExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
     <xi:include href="/META-INF/LangExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
+    <xi:include href="/META-INF/ExternalSystemExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
     <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
+    <xi:include href="/META-INF/ExternalSystemExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
 
     <applicationService serviceInterface="com.intellij.ide.RecentProjectsManager"
                         serviceImplementation="com.intellij.ide.AttachedModuleAwareRecentProjectsManager"/>
@@ -87,4 +90,6 @@
     <xi:fallback/>
   </xi:include>
   <xi:include href="built-in-server.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/idea/ExternalSystemActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>