diff --git a/platform/tracing-ide/resources/META-INF/plugin.xml b/platform/tracing-ide/resources/META-INF/plugin.xml
index bbd119b46aef..3e112ac3adb2 100644
--- a/platform/tracing-ide/resources/META-INF/plugin.xml
+++ b/platform/tracing-ide/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   </description>
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <actions>
diff --git a/plugins/compilation-charts/resources/META-INF/plugin.xml b/plugins/compilation-charts/resources/META-INF/plugin.xml
index cf0dbd34176a..23ffb34895b8 100644
--- a/plugins/compilation-charts/resources/META-INF/plugin.xml
+++ b/plugins/compilation-charts/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
   <resource-bundle>messages.CompilationChartsBundle</resource-bundle>
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml b/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
index 8345cc1bf70b..125ecb138f5a 100644
--- a/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
+++ b/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
@@ -4,7 +4,7 @@
   <dependencies>
     <module name="intellij.dev.psiViewer"/>
     <module name="intellij.dev.codeInsight"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.platform.debugger"/>
     <module name="intellij.platform.debugger.impl"/>
   </dependencies>
diff --git a/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml b/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
index 1a08ba9291b1..ca4419db6375 100644
--- a/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
+++ b/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
@@ -1,7 +1,7 @@
 <idea-plugin package="com.intellij.devkit.apiDump.lang">
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.devkit.apiDump"/>
   </dependencies>
 
diff --git a/plugins/devkit/api-dump/resources/intellij.devkit.apiDump.xml b/plugins/devkit/api-dump/resources/intellij.devkit.apiDump.xml
index bb17620d4e21..5e68444c5e6c 100644
--- a/plugins/devkit/api-dump/resources/intellij.devkit.apiDump.xml
+++ b/plugins/devkit/api-dump/resources/intellij.devkit.apiDump.xml
@@ -1,7 +1,7 @@
 <idea-plugin visibility="internal" package="com.intellij.devkit.apiDump">
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <resource-bundle>messages.ApiDumpBundle</resource-bundle>
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index 64b7b517893c..025f19f90c94 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -1,7 +1,7 @@
 <idea-plugin visibility="public">
   <dependencies>
     <plugin id="com.intellij.properties"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.json.backend"/>
     <module name="intellij.properties.backend"/>
diff --git a/plugins/devkit/devkit-java-tests/BUILD.bazel b/plugins/devkit/devkit-java-tests/BUILD.bazel
index 3cadd4802883..850e167cdf8f 100644
--- a/plugins/devkit/devkit-java-tests/BUILD.bazel
+++ b/plugins/devkit/devkit-java-tests/BUILD.bazel
@@ -11,6 +11,7 @@ jvm_library(
   name = "java-tests",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
+  exports = ["//java/java-backend:backend"],
   runtime_deps = [
     "@lib//:jetbrains-annotations",
     "//platform/ide-core-impl",
@@ -54,6 +55,7 @@ jvm_library(
     "//platform/execution",
     "//java/idea-ui:ui",
     "//java/openapi:java",
+    "//java/java-backend:backend",
     "@lib//:assert_j",
     "//xml/dom-impl",
     "//jvm/jvm-analysis-api:analysis",
@@ -85,6 +87,7 @@ jvm_library(
     "//plugins/kotlin/base/plugin:plugin_test_lib",
     "//java/codeserver/highlighting",
   ],
+  exports = ["//java/java-backend:backend"],
   runtime_deps = [":java-tests"]
 )
 ### auto-generated section `build intellij.devkit.java.tests` end
diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
index 12f180768a08..e358177f9325 100644
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -29,6 +29,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.backend" exported="" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" />
     <orderEntry type="module" module-name="intellij.jvm.analysis" />
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin.xml b/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin.xml
index 64f54e52581a..2007f42d8f10 100644
--- a/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin.xml
+++ b/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin.xml
@@ -5,7 +5,7 @@
 
   <depends>dependency.module</depends>
 
-  <xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensionPoints>
     <extensionPoint name="myMainModuleClassEp" interface="MainModuleClass"/>
diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin_after.xml b/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin_after.xml
index d84fb13424be..bf98766144dd 100644
--- a/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin_after.xml
+++ b/plugins/devkit/devkit-java-tests/testData/inspections/pluginXmlRegistrationCheck/registrationCheck/module/MainModulePlugin_after.xml
@@ -5,7 +5,7 @@
 
   <depends>dependency.module</depends>
 
-  <xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensionPoints>
     <extensionPoint name="myMainModuleClassEp" interface="MainModuleClass"/>
diff --git a/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml b/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
index 2225e89f20e8..0a6d498ea8d4 100644
--- a/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
+++ b/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
@@ -5,7 +5,7 @@
     <module name="intellij.platform.jewel.samples.showcase"/>
     <module name="intellij.platform.compose.markdown"/>
     <module name="intellij.platform.jewel.markdown.extensions.images"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <plugin id="com.intellij.gradle"/>
     <plugin id="org.jetbrains.kotlin"/>
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
diff --git a/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml b/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml
index 35f30df16218..7859df0a3e8e 100644
--- a/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml
+++ b/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml
@@ -1,6 +1,6 @@
 <idea-plugin package="org.jetbrains.idea.devkit.debugger">
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.platform.debugger"/>
     <module name="intellij.platform.debugger.impl"/>
   </dependencies>
diff --git a/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml b/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
index 9bf5ec0d8e42..7e7f0f786759 100644
--- a/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
+++ b/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <plugin id="com.intellij.mcpServer"/>
     <module name="intellij.devkit.core"/>
   </dependencies>
diff --git a/plugins/devkit/intellij.devkit.scaffolding/resources/intellij.devkit.scaffolding.xml b/plugins/devkit/intellij.devkit.scaffolding/resources/intellij.devkit.scaffolding.xml
index e9683f26b0db..dd07e6bd009d 100644
--- a/plugins/devkit/intellij.devkit.scaffolding/resources/intellij.devkit.scaffolding.xml
+++ b/plugins/devkit/intellij.devkit.scaffolding/resources/intellij.devkit.scaffolding.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.devkit.core"/>
   </dependencies>
   <actions resource-bundle="messages.DevkitScaffoldingBundle">
diff --git a/plugins/devkit/intellij.devkit.stacktrace/resources/intellij.devkit.stacktrace.xml b/plugins/devkit/intellij.devkit.stacktrace/resources/intellij.devkit.stacktrace.xml
index 9f15fa485c93..db133b85007c 100644
--- a/plugins/devkit/intellij.devkit.stacktrace/resources/intellij.devkit.stacktrace.xml
+++ b/plugins/devkit/intellij.devkit.stacktrace/resources/intellij.devkit.stacktrace.xml
@@ -3,7 +3,7 @@
     <module name="intellij.devkit.core"/>
     <module name="intellij.java.unscramble"/>
     <module name="intellij.platform.diagnostic.freezeAnalyzer"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <fileEditorProvider id="java-stacktrace-editor"
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml b/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
index 395da6e2bfb1..a76ae79908a4 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
@@ -1,7 +1,7 @@
 <idea-plugin package="com.intellij.devkit.workspaceModel">
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <plugin id="org.jetbrains.kotlin"/>
     <plugin id="org.editorconfig.editorconfigjetbrains"/>
     <module name="intellij.devkit.core"/>
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index c14b65ba5d27..714228b509ae 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -23,7 +23,7 @@
   ]]></description>
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <content namespace="jetbrains">
diff --git a/plugins/env-files-support/java/resources/intellij.dotenv.java.xml b/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
index d21f96059be8..e7a25c1dfcd1 100644
--- a/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
+++ b/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
@@ -1,6 +1,6 @@
 <idea-plugin package="ru.adelf.idea.dotenv.java">
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="JAVA" implementationClass="ru.adelf.idea.dotenv.java.JavaEnvCompletionContributor"/>
diff --git a/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml b/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
index d529ca6f7f90..0d2560e12af6 100644
--- a/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
+++ b/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <plugin id="com.intellij.gradle"/>
     <plugin id="org.jetbrains.idea.maven"/>
   </dependencies>
diff --git a/plugins/findUsagesMl/resources/META-INF/plugin.xml b/plugins/findUsagesMl/resources/META-INF/plugin.xml
index cef05c1462bb..6a293b4d7057 100644
--- a/plugins/findUsagesMl/resources/META-INF/plugin.xml
+++ b/plugins/findUsagesMl/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.json"/>
     <plugin id="com.intellij.modules.lang"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.platform.ml.logs"/>
     <module name="intellij.libraries.commons.text"/>
   </dependencies>
diff --git a/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml b/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
index 7727f6332faf..8a12d0993ab3 100644
--- a/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
+++ b/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.grazie">
diff --git a/plugins/groovy/resources/META-INF/plugin.xml b/plugins/groovy/resources/META-INF/plugin.xml
index 52d1f507189f..b361dd69b529 100644
--- a/plugins/groovy/resources/META-INF/plugin.xml
+++ b/plugins/groovy/resources/META-INF/plugin.xml
@@ -23,7 +23,6 @@
   </content>
   <dependencies>
     <plugin id="com.intellij.properties"/>
-    <plugin id="com.intellij.java"/>
     <module name="intellij.java.backend"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.java.unscramble"/>
diff --git a/plugins/javaFX/community/resources/META-INF/plugin.xml b/plugins/javaFX/community/resources/META-INF/plugin.xml
index 7c37d3246551..fa8c0a37a073 100644
--- a/plugins/javaFX/community/resources/META-INF/plugin.xml
+++ b/plugins/javaFX/community/resources/META-INF/plugin.xml
@@ -27,5 +27,6 @@
 
   <dependencies>
     <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 </idea-plugin>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index 48544dbc9d7a..607b59c94cfc 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -2,7 +2,7 @@
   <dependencies>
     <module name="intellij.spellchecker"/>
     <module name="intellij.xml.impl"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/jshell/console/resources/intellij.java.jshell.console.xml b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
index 63876f8e8623..12c2b5849eda 100644
--- a/plugins/jshell/console/resources/intellij.java.jshell.console.xml
+++ b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
@@ -1,7 +1,7 @@
 <idea-plugin visibility="public">
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
 
diff --git a/plugins/kotlin/plugin/resources/META-INF/plugin.xml b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
index 24019057c08c..38abcefe692b 100644
--- a/plugins/kotlin/plugin/resources/META-INF/plugin.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
- <idea-plugin package="org.jetbrains.kotlin" xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
+<idea-plugin package="org.jetbrains.kotlin" xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
   <id>org.jetbrains.kotlin</id>
   <name>Kotlin</name>
   <category>Languages</category>
@@ -16,7 +16,8 @@
   <vendor url="https://www.jetbrains.com">JetBrains</vendor>
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <!-- IJ/AS-DEPENDENCY-PLACEHOLDER -->
+    <module name="intellij.java.backend"/>
     <module name="intellij.platform.ml.impl"/>
     <module name="intellij.platform.collaborationTools"/>
     <module name="intellij.platform.scriptDebugger.ui"/>
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 6723bf4be7fb..458bfbeba5db 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -64,7 +64,7 @@
 
   <dependencies>
     <module name="intellij.properties.backend"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.repository.search.common"/>
     <module name="intellij.java.aetherDependencyResolver"/>
   </dependencies>
diff --git a/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml b/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
index ec8ce7c01b2f..22f56df1684c 100644
--- a/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
+++ b/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.searchEverywhereMl.ranking.core"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.searcheverywhere.ml">
diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
index a959df6a0b45..85912ec106a0 100644
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.intellij.build.pycharm
 
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.plus
 import org.jetbrains.intellij.build.BuildContext
 import org.jetbrains.intellij.build.JetBrainsProductProperties
@@ -30,6 +31,9 @@ abstract class PyCharmPropertiesBase(enlargeWelcomeScreen: Boolean) : JetBrainsP
       "intellij.platform.testFramework.teamCity",
       "intellij.platform.testFramework",
     ))
+
+    productLayout.compatiblePluginsToIgnore = productLayout.compatiblePluginsToIgnore.addAll(
+      persistentListOf("intellij.java.plugin"))
   }
 
   override suspend fun copyAdditionalFiles(targetDir: Path, context: BuildContext) {
diff --git a/python/pluginJava/resources/intellij.python.community.plugin.java.xml b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
index 944f1a8d5b9d..54acacbca9b3 100644
--- a/python/pluginJava/resources/intellij.python.community.plugin.java.xml
+++ b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
@@ -2,7 +2,7 @@
   <!--For IU or IC-->
   <dependencies>
     <!-- Supports Java -->
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.python.community.core.impl"/>
     <module name="intellij.python.community.plugin.impl"/>
   </dependencies>