From 438c4e4b5b634b13951286c865f9634e8f8ebad7 Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Mon, 12 Jan 2026 10:08:50 +0100
Subject: [PATCH] [java-frontend] IDEA-366600 Get rid of additional "Java for
 JetBrains Client" plugin

- java dependencies

Space-RevId: 7d4700ee0761048bb85d3b0a9471b74511f62fc0

GitOrigin-RevId: 9f080945a3c7b361b89c6743ec07ef9163f3e017
---
 .../resources/META-INF/JavaCodeServerCore.xml |  7 +-
 .../intellij.java.codeserver.core.xml         |  9 +-
 .../intellij.java.codeserver.highlighting.xml | 13 ++-
 .../resources/intellij.java.compiler.impl.xml | 32 +++----
 .../resources/intellij.java.compiler.xml      |  4 +-
 .../intellij.java.debugger.impl.backend.xml   | 13 ++-
 .../resources/intellij.java.debugger.impl.xml | 38 ++++----
 .../intellij.java.debugger.memory.agent.xml   |  2 -
 .../resources/intellij.java.debugger.xml      |  9 +-
 .../intellij.java.execution.impl.xml          | 21 ++---
 .../resources/intellij.java.execution.xml     |  8 +-
 .../resources/META-INF/plugin.xml             |  2 +-
 java/idea-ui/resources/intellij.java.ui.xml   | 46 +++++----
 .../resources/intellij.java.analysis.xml      | 11 +--
 .../resources/intellij.java.analysis.impl.xml | 20 ++--
 .../resources/intellij.java.backend.xml       |  8 --
 .../intellij.java.impl.inspections.xml        | 30 +++---
 .../intellij.java.impl.refactorings.xml       | 26 +++---
 .../resources/intellij.java.impl.xml          | 49 +++++-----
 .../resources/intellij.java.indexing.xml      |  8 +-
 .../resources/intellij.java.indexing.impl.xml | 18 ++--
 .../resources/intellij.java.promo.xml         |  2 +-
 .../resources/intellij.java.structureView.xml | 10 +-
 java/jsp-openapi/resources/intellij.jsp.xml   |  4 +-
 java/jsp-spi/resources/intellij.jsp.spi.xml   |  6 +-
 java/langInjection/jps/BUILD.bazel            |  3 +-
 .../jps/intellij.java.langInjection.jps.iml   |  1 +
 .../intellij.java.langInjection.jps.xml       |  3 +-
 .../resources/intellij.java.langInjection.xml |  1 -
 .../resources/intellij.java.manifest.xml      |  6 +-
 java/openapi/resources/intellij.java.xml      |  7 +-
 java/plugin/BUILD.bazel                       | 32 ++-----
 java/plugin/intellij.java.plugin.iml          | 36 ++-----
 java/plugin/resources/META-INF/plugin.xml     | 93 +++++++++----------
 .../intellij.java.remoteServers.impl.xml      |  1 -
 .../intellij.java.testFramework.shared.xml    |  1 +
 .../resources/intellij.java.typeMigration.xml | 19 ++--
 .../resources/intellij.jvm.analysis.xml       | 10 +-
 .../resources/intellij.jvm.analysis.impl.xml  |  2 -
 .../intellij.jvm.analysis.quickFix.xml        | 16 ++--
 .../intellij.jvm.analysis.refactoring.xml     | 10 +-
 .../resources/intellij.platform.uast.ide.xml  | 14 ++-
 uast/uast-common/BUILD.bazel                  |  3 +-
 uast/uast-common/intellij.platform.uast.iml   |  1 +
 .../resources/intellij.platform.uast.xml      | 12 +--
 .../resources/intellij.java.uast.ide.xml      | 12 +--
 uast/uast-java/BUILD.bazel                    |  3 +-
 uast/uast-java/intellij.java.uast.iml         |  1 +
 .../resources/intellij.java.uast.xml          | 18 ++--
 49 files changed, 296 insertions(+), 405 deletions(-)

diff --git a/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml b/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml
index 956799595b2c..f063dfb685c9 100644
--- a/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml
+++ b/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml
@@ -1,9 +1,8 @@
 <idea-plugin visibility="public">
   <extensions defaultExtensionNs="com.intellij">
     <javaModuleSystem implementation="com.intellij.java.codeserver.core.JavaPlatformModuleSystem"/>
-    <!--todo temporary disabled see backend, should be enabled after moving to backend part-->
-    <!--<applicationService serviceInterface="com.intellij.psi.JavaModuleGraphHelper"-->
-    <!--                    serviceImplementation="com.intellij.java.codeserver.core.JavaPsiModuleUtil$Helper"-->
-    <!--                    overrides="true"/>-->
+    <applicationService serviceInterface="com.intellij.psi.JavaModuleGraphHelper"
+                        serviceImplementation="com.intellij.java.codeserver.core.JavaPsiModuleUtil$Helper"
+                        overrides="true"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/java/codeserver/core/resources/intellij.java.codeserver.core.xml b/java/codeserver/core/resources/intellij.java.codeserver.core.xml
index bde230c7150d..bcbc18f60cf8 100644
--- a/java/codeserver/core/resources/intellij.java.codeserver.core.xml
+++ b/java/codeserver/core/resources/intellij.java.codeserver.core.xml
@@ -1,10 +1,9 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.indexing"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.projectModel.impl"/>
diff --git a/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
index 18d7dcd27f04..e9dd34280e7b 100644
--- a/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
+++ b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
@@ -2,13 +2,12 @@
   <dependencies>
     <module name="intellij.platform.core"/>
 
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
-    <!--<module name="intellij.java.codeserver.core"/>-->
-    <!--<module name="intellij.java.frontback.impl"/>-->
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.frontback.impl"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/compiler/impl/resources/intellij.java.compiler.impl.xml b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
index 9f9bbfd17bf4..9b1c1ec0a009 100644
--- a/java/compiler/impl/resources/intellij.java.compiler.impl.xml
+++ b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin  visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--  &lt;!&ndash;<module name="intellij.java.compiler"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.indexing"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.analysis"/>-->
-  <!--  <module name="intellij.platform.core"/>-->
-  <!--  <module name="intellij.platform.lang.core"/>-->
-  <!--  <module name="intellij.platform.projectModel"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.ide.impl"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java.rt"/>&ndash;&gt;-->
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.java"/>
+    <module name="intellij.platform.ide.impl"/>
+    <!--todo check-->
+    <!--<module name="intellij.java.rt"/>-->
     <module name="intellij.platform.vcs"/>
-  <!--  <module name="intellij.platform.ide"/>-->
-  <!--  <module name="intellij.platform.lang.impl"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.jsp"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.analysis.impl"/>&ndash;&gt;-->
+    <module name="intellij.platform.ide"/>
+    <module name="intellij.platform.lang.impl"/>
+    <module name="intellij.jsp"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.analysis.impl"/>
     <module name="intellij.platform.builtInServer.impl"/>
     <module name="intellij.platform.vcs.impl"/>
     <module name="intellij.platform.externalSystem"/>
     <module name="intellij.platform.core.ui"/>
     <module name="intellij.xml.psi"/>
-  <!--  &lt;!&ndash;<plugin id="com.intellij.java"/>&ndash;&gt;-->
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
-
   </dependencies>
 
   <extensionPoints>
diff --git a/java/compiler/openapi/resources/intellij.java.compiler.xml b/java/compiler/openapi/resources/intellij.java.compiler.xml
index 8843c3080112..5b06be433209 100644
--- a/java/compiler/openapi/resources/intellij.java.compiler.xml
+++ b/java/compiler/openapi/resources/intellij.java.compiler.xml
@@ -1,8 +1,6 @@
 <idea-plugin  visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
+    <module name="intellij.java"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.lang.core"/>
diff --git a/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml b/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml
index 38c357dcebfa..a458b37a24e9 100644
--- a/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml
+++ b/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml
@@ -2,13 +2,12 @@
   <dependencies>
     <module name="intellij.platform.kernel.backend"/>
     <module name="intellij.platform.backend"/>
-    <!--todo temporary disabled until it will be a backend module-->
 
-    <!--  <module name="intellij.java.debugger.impl.shared"/>-->
-  <!--  <module name="intellij.java.debugger.impl"/>-->
-  <!--  <module name="intellij.java.debugger"/>-->
-  <!--  <module name="intellij.java.impl"/>-->
-  <!--  <module name="intellij.java.execution"/>-->
+    <module name="intellij.java.debugger.impl.shared"/>
+    <module name="intellij.java.debugger.impl"/>
+    <module name="intellij.java.debugger"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.execution"/>
     <module name="intellij.platform.core" />
     <module name="intellij.platform.kernel" />
     <module name="intellij.platform.debugger" />
@@ -18,7 +17,7 @@
     <module name="intellij.libraries.kotlinx.serialization.json" />
     <module name="intellij.platform.rpc.backend" />
     <module name="intellij.platform.core.ui" />
-  <!--  <module name="intellij.platform.debugger.impl.shared" />-->
+    <module name="intellij.platform.debugger.impl.shared" />
     <module name="intellij.platform.projectModel" />
 
   </dependencies>
diff --git a/java/debugger/impl/resources/intellij.java.debugger.impl.xml b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
index b249559ef232..3200d3cff3e1 100644
--- a/java/debugger/impl/resources/intellij.java.debugger.impl.xml
+++ b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
@@ -1,39 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--  <module name="intellij.java.debugger"/>-->
-  <!--  <module name="intellij.java"/>-->
-  <!--  <module name="intellij.java.execution"/>-->
-  <!--  <module name="intellij.java.indexing"/>-->
-  <!--  <module name="intellij.java.resources"/>-->
+    <module name="intellij.java.debugger"/>
+    <module name="intellij.java"/>
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.resources"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.debugger.impl"/>
     <module name="intellij.platform.lang"/>
-  <!--  <module name="intellij.java.compiler"/>-->
-  <!--  <module name="intellij.java.compiler.impl"/>-->
-  <!--  &lt;!&ndash;todo&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.rt"/>&ndash;&gt;-->
-  <!--  <module name="intellij.jsp"/>-->
-  <!--  <module name="intellij.java.impl"/>-->
-  <!--  <module name="intellij.java.impl.refactorings"/>-->
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.compiler.impl"/>
+    <!--todo-->
+    <!--<module name="intellij.java.rt"/>-->
+    <module name="intellij.jsp"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.platform.ide.impl"/>
     <module name="intellij.platform.lang.core"/>
     <module name="intellij.platform.projectModel"/>
-    <!--<module name="intellij.java.debugger.memory.agent"/>-->
+    <module name="intellij.java.debugger.memory.agent"/>
     <module name="intellij.platform.core.ui"/>
-  <!--  &lt;!&ndash;todo&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.platform.feedback"/>&ndash;&gt;-->
-  <!--  <module name="intellij.java.debugger.impl.shared"/>-->
-  <!--  <module name="intellij.java.codeserver.highlighting"/>-->
-  <!--  <module name="intellij.xml.psi"/>-->
+    <!--todo-->
+    <module name="intellij.java.debugger.impl.shared"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.xml.psi"/>
     <module name="intellij.platform.debugger.impl.shared"/>
     <module name="fleet.rpc"/>
     <module name="intellij.platform.rpc"/>
 
-  <!--  &lt;!&ndash;<plugin id="com.intellij.java"/>&ndash;&gt;-->
-
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.backend"/>
 
diff --git a/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml b/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml
index 555ecf39ccd5..c97d0fb15dd9 100644
--- a/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml
+++ b/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--  <plugin id="com.intellij.java"/>-->
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
diff --git a/java/debugger/openapi/resources/intellij.java.debugger.xml b/java/debugger/openapi/resources/intellij.java.debugger.xml
index e656d21882b5..95dc0b69f739 100644
--- a/java/debugger/openapi/resources/intellij.java.debugger.xml
+++ b/java/debugger/openapi/resources/intellij.java.debugger.xml
@@ -1,10 +1,9 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--<module name="intellij.java.execution"/>-->
-    <!--<module name="intellij.jsp"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.resources.en"/>-->
+    <module name="intellij.java.execution"/>
+    <module name="intellij.jsp"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.resources.en"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.ide"/>
diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml
index b6fc5f56586d..f3a6ed86a749 100644
--- a/java/execution/impl/resources/intellij.java.execution.impl.xml
+++ b/java/execution/impl/resources/intellij.java.execution.impl.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java"/>-->
+    <module name="intellij.java"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.ide.impl"/>
-    <!--<module name="intellij.java.execution"/>-->
+    <module name="intellij.java.execution"/>
+    <!--todo check if it is needed-->
     <!--<module name="intellij.java.rt"/>-->
-    <!--<module name="intellij.java.debugger.impl"/>-->
+    <module name="intellij.java.debugger.impl"/>
     <module name="intellij.platform.lang.core"/>
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.vcs"/>
-    <!--<module name="intellij.java.compiler"/>-->
-    <!--<module name="intellij.java.debugger"/>-->
-    <!--<module name="intellij.java.impl"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.debugger"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.indexing"/>
     <module name="intellij.platform.smRunner"/>
     <module name="intellij.platform.externalSystem"/>
     <module name="intellij.platform.externalSystem.impl"/>
@@ -25,8 +24,8 @@
     <module name="intellij.platform.debugger.impl"/>
     <module name="intellij.platform.diff"/>
     <module name="intellij.platform.core.ui"/>
-    <!--<module name="intellij.java.debugger.impl.shared"/>-->
-    <!--<module name="intellij.java.codeserver.core"/>-->
+    <module name="intellij.java.debugger.impl.shared"/>
+    <module name="intellij.java.codeserver.core"/>
 
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.backend"/>
diff --git a/java/execution/openapi/resources/intellij.java.execution.xml b/java/execution/openapi/resources/intellij.java.execution.xml
index 9279497c11bf..c6693fcaf111 100644
--- a/java/execution/openapi/resources/intellij.java.execution.xml
+++ b/java/execution/openapi/resources/intellij.java.execution.xml
@@ -1,10 +1,8 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
-    <!--<module name="intellij.java.resources"/>-->
+    <module name="intellij.java"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.resources"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.lang.core"/>
diff --git a/java/ide-customization/resources/META-INF/plugin.xml b/java/ide-customization/resources/META-INF/plugin.xml
index 662fd1dd4275..e69f3a0c2694 100644
--- a/java/ide-customization/resources/META-INF/plugin.xml
+++ b/java/ide-customization/resources/META-INF/plugin.xml
@@ -10,7 +10,7 @@
   <incompatible-with>com.intellij.modules.appcode.ide</incompatible-with>
 
   <dependencies>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
   </dependencies>
 
   <content namespace="jetbrains">
diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml
index 887f5e4d62c3..74d84ec5b3aa 100644
--- a/java/idea-ui/resources/intellij.java.ui.xml
+++ b/java/idea-ui/resources/intellij.java.ui.xml
@@ -1,37 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java"/>-->
-    <!--<module name="intellij.java.compiler"/>-->
-    <!--<module name="intellij.java.compiler.impl"/>-->
-    <!--<module name="intellij.platform.analysis"/>-->
-    <!--<module name="intellij.platform.core"/>-->
-    <!--<module name="intellij.platform.ide.impl"/>-->
-    <!--<module name="intellij.java.impl"/>-->
-    <!--<module name="intellij.java.impl.refactorings"/>-->
-    <!--<module name="intellij.platform.lang.core"/>-->
-    <!--<module name="intellij.platform.projectModel"/>-->
-    <!--<module name="intellij.platform.vcs.impl"/>-->
-    <!--<module name="intellij.platform.diff"/>-->
-    <!--<module name="intellij.platform.externalSystem"/>-->
-    <!--<module name="intellij.platform.externalSystem.impl"/>-->
-    <!--<module name="intellij.platform.core.ui"/>-->
-    <!--<module name="intellij.platform.lang.impl"/>-->
-    <!--todo-->
-    <!--<module name="intellij.platform.feedback"/>-->
-    <!--<module name="intellij.xml.dom"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
-    <!--<module name="intellij.xml.psi"/>-->
+    <module name="intellij.java"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.compiler.impl"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.vcs.impl"/>
+    <module name="intellij.platform.diff"/>
+    <module name="intellij.platform.externalSystem"/>
+    <module name="intellij.platform.externalSystem.impl"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.lang.impl"/>
+    <module name="intellij.xml.dom"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.xml.psi"/>
 
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java.aetherDependencyResolver"/>
     <module name="intellij.libraries.maven.resolver.provider"/>
     <!-- endregion -->
 
-    <!--<plugin id="com.intellij.modules.java-capable"/>-->
-    <!--<module name="intellij.platform.backend"/>-->
+    <plugin id="com.intellij.modules.java-capable"/>
+    <module name="intellij.platform.backend"/>
 
   </dependencies>
 
diff --git a/java/java-analysis-api/resources/intellij.java.analysis.xml b/java/java-analysis-api/resources/intellij.java.analysis.xml
index 567238de4b1b..7f1b2f9223c1 100644
--- a/java/java-analysis-api/resources/intellij.java.analysis.xml
+++ b/java/java-analysis-api/resources/intellij.java.analysis.xml
@@ -1,14 +1,13 @@
 <idea-plugin  visibility="public">
   <dependencies>
     <module name="intellij.platform.analysis"/>
-    <!--todo temporary disabled until it will be a backend module-->
-    <!--<module name="intellij.java.psi"/>-->
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.projectModel"/>
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.platform.uast.ide"/>-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.platform.uast.ide"/>
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.syntax"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
index 9585fc0a6b1d..adb8bfc4a897 100644
--- a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
+++ b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
@@ -1,26 +1,24 @@
 <idea-plugin  visibility="public">
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.indexing"/>-->
+    <module name="intellij.java.indexing"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.analysis.impl"/>
-    <!--<module name="intellij.java.indexing.impl"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
+    <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.psi.impl"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.projectModel.impl"/>
-    <!--<module name="intellij.java.analysis"/>-->
-    <!--<module name="intellij.java.resources.en"/>-->
+    <module name="intellij.java.analysis"/>
+    <module name="intellij.java.resources.en"/>
     <module name="intellij.xml.psi"/>
     <module name="intellij.xml.psi.impl"/>
     <module name="intellij.platform.ide"/>
-    <!--<module name="intellij.java"/>-->
+    <module name="intellij.java"/>
     <module name="intellij.platform.util.ui"/>
-    <!--<module name="intellij.java.frontback.impl"/>-->
-    <!--<module name="intellij.java.codeserver.highlighting"/>-->
-    <!--<module name="intellij.java.codeserver.core"/>-->
+    <module name="intellij.java.frontback.impl"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.codeserver.core"/>
     <module name="intellij.xml.analysis"/>
 
     <module name="intellij.platform.backend"/>
diff --git a/java/java-backend/resources/intellij.java.backend.xml b/java/java-backend/resources/intellij.java.backend.xml
index b65fc2f4cee9..4c18e813b66e 100644
--- a/java/java-backend/resources/intellij.java.backend.xml
+++ b/java/java-backend/resources/intellij.java.backend.xml
@@ -34,7 +34,6 @@
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.jsp"/>
 
-    <!--todo necessary?-->
     <module name="intellij.java.resources.en"/>
     <module name="intellij.java.debugger"/>
     <module name="intellij.java.codeserver.core"/>
@@ -74,13 +73,6 @@
     <moduleType id="JAVA_MODULE" classpathProvider="true" implementationClass="com.intellij.openapi.module.JavaModuleType"/>
     <moduleType id="GENERAL_MODULE" implementationClass="com.intellij.ide.projectWizard.GeneralModuleTypeForIdea"/>
     <newProjectWizard.generator implementation="com.intellij.ide.wizard.language.EmptyProjectGeneratorNewProjectWizard"/>
-
-
-    <!--todo temporary, should be inside JavaCodeServerCore.xml-->
-    <applicationService serviceInterface="com.intellij.psi.JavaModuleGraphHelper"
-                        serviceImplementation="com.intellij.java.codeserver.core.JavaPsiModuleUtil$Helper"
-                        overrides="true"/>
-
   </extensions>
 </idea-plugin>
 
diff --git a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
index 28bb607a31b1..b336e80befae 100644
--- a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
+++ b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.analysis.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.indexing"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.analysis"/>-->
-  <!--  <module name="intellij.platform.core"/>-->
-  <!--  <module name="intellij.platform.ide.impl"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java.compiler"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl.refactorings"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.projectModel"/>-->
-  <!--  <module name="intellij.platform.core.ui"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.highlighting"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.core"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.syntax"/>&ndash;&gt;-->
+    <module name="intellij.java"/>
+    <module name="intellij.java.analysis.impl"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.syntax"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
index b649191fa2dd..d8496b1cbbdd 100644
--- a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
+++ b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--  &lt;!&ndash;<module name="intellij.java.indexing"/>&ndash;&gt;-->
+    <module name="intellij.java.indexing"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.diff"/>
     <module name="intellij.platform.lang"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.psi"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.core.impl"/>-->
-  <!--  <module name="intellij.platform.lang.core"/>-->
-  <!--  <module name="intellij.platform.lang.impl"/>-->
-  <!--  <module name="intellij.platform.ide.impl"/>-->
-  <!--  <module name="intellij.platform.projectModel"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.psi.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.jsp"/>&ndash;&gt;-->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.core.impl"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.lang.impl"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.java"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.jsp"/>
     <module name="intellij.platform.core.ui"/>
     <module name="intellij.xml.psi"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.core"/>&ndash;&gt;-->
+    <module name="intellij.java.codeserver.core"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/java-impl/resources/intellij.java.impl.xml b/java/java-impl/resources/intellij.java.impl.xml
index 8e8c9641699b..052eb144f29b 100644
--- a/java/java-impl/resources/intellij.java.impl.xml
+++ b/java/java-impl/resources/intellij.java.impl.xml
@@ -2,45 +2,42 @@
   <dependencies>
 
     <plugin id="com.intellij.modules.xml"/>
-
-    <!--todo temporary disabled until it will be a backend module-->
-
-  <!--  <module name="intellij.platform.analysis"/>-->
-  <!--  <module name="intellij.platform.core"/>-->
-  <!--  <module name="intellij.platform.lang.core"/>-->
-  <!--  <module name="intellij.platform.projectModel"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.java"/>
     <module name="intellij.xml.impl"/>
-  <!--  &lt;!&ndash;todo check, looks suspicious&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.rt"/>&ndash;&gt;-->
+    <!--todo check, looks suspicious-->
+    <!--<module name="intellij.java.rt"/>-->
     <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.vcs"/>
-  <!--  &lt;!&ndash;<module name="intellij.jsp"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.jsp.spi"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.execution"/>&ndash;&gt;-->
+    <module name="intellij.jsp"/>
+    <module name="intellij.jsp.spi"/>
+    <module name="intellij.java.execution"/>
     <module name="intellij.xml.dom.impl"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.psi.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.frontback.impl"/>&ndash;&gt;-->
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.frontback.impl"/>
     <module name="intellij.regexp"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.indexing.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.indexing"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.analysis.impl"/>&ndash;&gt;-->
+    <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.analysis.impl"/>
     <module name="intellij.platform.externalSystem"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.structureView"/>&ndash;&gt;-->
+    <module name="intellij.java.structureView"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.platform.builtInServer.impl"/>
     <module name="intellij.libraries.gson"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.compiler"/>&ndash;&gt;-->
+    <module name="intellij.java.compiler"/>
     <module name="intellij.platform.externalSystem.impl"/>
-  <!--  <module name="intellij.platform.core.ui"/>-->
-  <!--  <module name="intellij.platform.ide.impl"/>-->
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.ide.impl"/>
     <module name="intellij.platform.bookmarks.backend"/>
     <module name="intellij.platform.todo.backend"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.highlighting"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.core"/>&ndash;&gt;-->
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.codeserver.core"/>
     <module name="intellij.xml.psi"/>
-  <!--  &lt;!&ndash;<module name="intellij.java.syntax"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.psi"/>&ndash;&gt;-->
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.psi"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/java-indexing-api/resources/intellij.java.indexing.xml b/java/java-indexing-api/resources/intellij.java.indexing.xml
index 11e886f61805..f45fbae3b1fc 100644
--- a/java/java-indexing-api/resources/intellij.java.indexing.xml
+++ b/java/java-indexing-api/resources/intellij.java.indexing.xml
@@ -1,10 +1,8 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
-    <!--<module name="intellij.java.psi"/>-->
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.psi"/>
 
     <module name="intellij.platform.kernel.backend"/>
     <module name="intellij.platform.backend"/>
diff --git a/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml b/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml
index ffc43c3b8dd4..0cd90b6261be 100644
--- a/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml
+++ b/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml
@@ -1,15 +1,13 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
-    <!--<module name="intellij.platform.core"/>-->
-    <!--<module name="intellij.platform.projectModel"/>-->
-    <!--<module name="intellij.platform.projectModel.impl"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
-    <!--<module name="intellij.java.codeserver.core"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.projectModel.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.syntax"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/java-promo/resources/intellij.java.promo.xml b/java/java-promo/resources/intellij.java.promo.xml
index 4934f71b87cb..675a350b7835 100644
--- a/java/java-promo/resources/intellij.java.promo.xml
+++ b/java/java-promo/resources/intellij.java.promo.xml
@@ -1,7 +1,7 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <dependencies>
     <module name="intellij.platform.lang.core"/>
-    <plugin id="com.intellij.java"/>
+    <module name="intellij.java"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.ide.impl"/>
     <module name="intellij.platform.core"/>
diff --git a/java/java-structure-view/resources/intellij.java.structureView.xml b/java/java-structure-view/resources/intellij.java.structureView.xml
index 8ade981b057d..ac7a1ff77fa8 100644
--- a/java/java-structure-view/resources/intellij.java.structureView.xml
+++ b/java/java-structure-view/resources/intellij.java.structureView.xml
@@ -1,11 +1,9 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.platform.core"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
-    <!--<module name="intellij.platform.util.ui"/>-->
-    <!--<module name="intellij.java.analysis.impl"/>-->
+    <module name="intellij.platform.core"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.platform.util.ui"/>
+    <module name="intellij.java.analysis.impl"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/java/jsp-openapi/resources/intellij.jsp.xml b/java/jsp-openapi/resources/intellij.jsp.xml
index e4585f6b0c99..4cbead2fd641 100644
--- a/java/jsp-openapi/resources/intellij.jsp.xml
+++ b/java/jsp-openapi/resources/intellij.jsp.xml
@@ -2,9 +2,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
 
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.psi"/>-->
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.xml.psi"/>
 
diff --git a/java/jsp-spi/resources/intellij.jsp.spi.xml b/java/jsp-spi/resources/intellij.jsp.spi.xml
index 53bb8890ebe3..9034ca9f66d7 100644
--- a/java/jsp-spi/resources/intellij.jsp.spi.xml
+++ b/java/jsp-spi/resources/intellij.jsp.spi.xml
@@ -2,10 +2,8 @@
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
 
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.jsp"/>-->
-    <!--<module name="intellij.java"/>-->
+    <module name="intellij.jsp"/>
+    <module name="intellij.java"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.projectModel"/>
diff --git a/java/langInjection/jps/BUILD.bazel b/java/langInjection/jps/BUILD.bazel
index a82c73e6853c..c36d95afa408 100644
--- a/java/langInjection/jps/BUILD.bazel
+++ b/java/langInjection/jps/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
     "//libraries/asm",
     "//platform/util/jdom",
     "@lib//:jetbrains-annotations",
-  ]
+  ],
+  runtime_deps = ["//platform/backend"]
 )
 ### auto-generated section `build intellij.java.langInjection.jps` end
\ No newline at end of file
diff --git a/java/langInjection/jps/intellij.java.langInjection.jps.iml b/java/langInjection/jps/intellij.java.langInjection.jps.iml
index e2710da34d41..2d41a8cb7166 100644
--- a/java/langInjection/jps/intellij.java.langInjection.jps.iml
+++ b/java/langInjection/jps/intellij.java.langInjection.jps.iml
@@ -33,5 +33,6 @@
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml
index 44c990c90903..e547a22cd81d 100644
--- a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml
+++ b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml
@@ -1,8 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.langInjection"/>
-    <!--todo temporary disabled-->
-    <!--<module name="intellij.platform.backend"/>-->
+    <module name="intellij.platform.backend"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <jps.plugin/>
diff --git a/java/langInjection/resources/intellij.java.langInjection.xml b/java/langInjection/resources/intellij.java.langInjection.xml
index 758c643ee120..4503d56f0907 100644
--- a/java/langInjection/resources/intellij.java.langInjection.xml
+++ b/java/langInjection/resources/intellij.java.langInjection.xml
@@ -10,7 +10,6 @@
     <module name="intellij.java.compiler.impl"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.langInjection.jps"/>
-
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <localInspection language="JAVA" shortName="UnknownLanguage" groupKey="inspections.language.injection.group.name" enabledByDefault="true"
diff --git a/java/manifest/resources/intellij.java.manifest.xml b/java/manifest/resources/intellij.java.manifest.xml
index 99b4495f8b17..2a380a2df8ad 100644
--- a/java/manifest/resources/intellij.java.manifest.xml
+++ b/java/manifest/resources/intellij.java.manifest.xml
@@ -8,16 +8,14 @@
     <module name="intellij.platform.ide"/>
     <module name="intellij.platform.lang"/>
     <module name="intellij.platform.core.impl"/>
-    <!--todo temporary disabled until it will be a backend module-->
 
-    <!--  &lt;!&ndash;<module name="intellij.java.psi"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl"/>&ndash;&gt;-->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.impl"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.platform.core.ui"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
-
   </dependencies>
 
   <xi:include href="/META-INF/ManifestSupport.xml"/>
diff --git a/java/openapi/resources/intellij.java.xml b/java/openapi/resources/intellij.java.xml
index abcf3ae34629..8ede51860c56 100644
--- a/java/openapi/resources/intellij.java.xml
+++ b/java/openapi/resources/intellij.java.xml
@@ -8,11 +8,10 @@
     <module name="intellij.platform.lang"/>
     <module name="intellij.platform.vcs"/>
     <module name="intellij.xml.dom"/>
-    <!--todo temporary disabled until it will be a backend module-->
 
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.indexing"/>-->
-    <!--<module name="intellij.java.analysis"/>-->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.analysis"/>
     <module name="intellij.platform.util.ui"/>
     <module name="intellij.platform.core.ui"/>
     <module name="intellij.platform.externalSystem"/>
diff --git a/java/plugin/BUILD.bazel b/java/plugin/BUILD.bazel
index f233bfce3164..7e8174802795 100644
--- a/java/plugin/BUILD.bazel
+++ b/java/plugin/BUILD.bazel
@@ -13,32 +13,14 @@ jvm_library(
   srcs = glob([], allow_empty = True),
   resources = [":plugin_resources"],
   runtime_deps = [
-    "//java/compiler/impl",
-    "//java/debugger/impl",
-    "//java/debugger/shared",
-    "//java/debugger/frontend",
-    "//java/debugger/backend",
-    "//xml/dom-impl",
-    "//java/debugger/memory-agent:java-debugger-memory-agent",
-    "//java/execution/impl",
-    "//java/execution/shared",
-    "//java/execution/backend",
-    "//java/execution/frontend",
-    "//platform/external-system-impl:externalSystem-impl",
-    "//java/idea-ui:ui",
-    "//java/manifest",
-    "//java/java-impl-inspections:impl-inspections",
-    "//java/java-analysis-impl:analysis-impl",
-    "//java/java-indexing-impl:indexing-impl",
-    "//java/jsp-spi",
-    "//uast/uast-java-ide:java-uast-ide",
-    "//java/structuralsearch-java:structuralSearch",
-    "//java/typeMigration",
-    "//resources:java-resources",
-    "//resources-en:java-resources-en",
-    "//java/performancePlugin",
-    "//java/vcs",
     "//java/java-syntax:syntax",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-impl:frontback-psi-impl",
+    "//java/java-psi-api:psi",
+    "//java/java-psi-impl:psi-impl",
+    "//java/java-frontback-impl:frontback-impl",
+    "//java/debugger/shared",
+    "//java/execution/shared",
   ]
 )
 ### auto-generated section `build intellij.java.plugin` end
\ No newline at end of file
diff --git a/java/plugin/intellij.java.plugin.iml b/java/plugin/intellij.java.plugin.iml
index a643ccdbf7b7..27800b22d104 100644
--- a/java/plugin/intellij.java.plugin.iml
+++ b/java/plugin/intellij.java.plugin.iml
@@ -7,35 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.debugger.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.debugger.impl.frontend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.debugger.impl.backend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.debugger.memory.agent" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.execution.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.execution.impl.shared" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.execution.impl.backend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.execution.impl.frontend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.ui" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.manifest" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.remoteServers.impl" scope="PROVIDED" />
-    <orderEntry type="module" module-name="intellij.uiDesigner" scope="PROVIDED" />
-    <orderEntry type="module" module-name="intellij.java.impl.inspections" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.analysis.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.indexing.impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.jsp.spi" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.uast.ide" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.structuralSearch" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.typeMigration" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.resources" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.ui.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.performancePlugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.vcs" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.syntax" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.psi" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.frontback.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl.shared" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml
index 553d903144e2..45204f558e74 100644
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -9,17 +9,13 @@
   <category>Languages</category>
   <resource-bundle>messages.ActionsBundle</resource-bundle>
 
+  <!--other dependencies inside java.backend plugin-->
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
-    <plugin id="com.intellij.modules.vcs"/>
-    <plugin id="com.intellij.modules.xdebugger"/>
-    <plugin id="com.intellij.modules.xml"/>
-    <plugin id="com.intellij.modules.java-capable"/>
-    <module name="intellij.platform.structuralSearch"/>
-    <module name="intellij.platform.vcs.impl.lang"/>
-    <module name="intellij.spellchecker"/>
-    <module name="intellij.xml.dom.impl"/>
-    <module name="intellij.regexp"/>
+
+    <!--because of intellij.platform.jps modules-->
+    <module name="intellij.java.aetherDependencyResolver"/>
+    <module name="intellij.libraries.maven.resolver.provider"/>
   </dependencies>
 
   <module value="com.intellij.modules.java"/>
@@ -32,44 +28,45 @@
     <module name="intellij.java.psi.impl" loading="embedded"/>
     <module name="intellij.java.frontback.impl" loading="embedded"/>
 
-    <module name="intellij.java.indexing" loading="embedded"/>
-    <module name="intellij.platform.uast" loading="embedded"/>
-    <module name="intellij.platform.uast.ide" loading="embedded"/>
-    <module name="intellij.java.uast" loading="embedded"/>
-    <module name="intellij.java.compiler" loading="embedded"/>
-    <module name="intellij.java.analysis" loading="embedded"/>
-    <module name="intellij.java" loading="embedded"/>
-    <module name="intellij.java.resources" loading="embedded"/>
-    <module name="intellij.java.execution" loading="embedded"/>
-    <module name="intellij.java.remoteServers" loading="optional"/>
-    <module name="intellij.jvm.analysis" loading="embedded"/>
-    <module name="intellij.jsp" loading="embedded"/>
-    <module name="intellij.java.resources.en" loading="embedded"/>
-    <module name="intellij.java.debugger" loading="embedded"/>
-    <module name="intellij.java.codeserver.core" loading="embedded"/>
-    <module name="intellij.java.codeserver.highlighting" loading="embedded"/>
+    <module name="intellij.java.indexing" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.platform.uast" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.platform.uast.ide" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.uast" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.compiler" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.analysis" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.resources" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.execution" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.remoteServers"  loading="optional"/>
+    <module name="intellij.jvm.analysis" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.jsp" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.resources.en" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.debugger" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.codeserver.core" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.codeserver.highlighting" required-if-available="intellij.platform.backend"/>
 
-    <module name="intellij.jsp.spi" loading="embedded"/>
-    <module name="intellij.java.indexing.impl" loading="embedded"/>
-    <module name="intellij.java.analysis.impl" loading="embedded"/>
-    <module name="intellij.java.structureView" loading="embedded"/>
+    <module name="intellij.jsp.spi" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.indexing.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.analysis.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.structureView" required-if-available="intellij.platform.backend"/>
 
-    <module name="intellij.java.impl" loading="embedded"/>
-    <module name="intellij.java.impl.refactorings" loading="embedded"/>
-    <module name="intellij.java.compiler.impl" loading="embedded"/>
-    <module name="intellij.java.typeMigration" loading="embedded"/>
-    <module name="intellij.java.impl.inspections" loading="embedded"/>
-    <module name="intellij.jvm.analysis.refactoring" loading="embedded"/>
-    <module name="intellij.jvm.analysis.quickFix" loading="embedded"/>
-    <module name="intellij.uiDesigner" loading="embedded"/>
-    <module name="intellij.java.manifest" loading="embedded"/>
-    <module name="intellij.java.ui" loading="embedded"/>
-    <module name="intellij.java.execution.impl" loading="embedded"/>
-    <module name="intellij.java.debugger.impl" loading="embedded"/>
-    <module name="intellij.java.debugger.memory.agent" loading="embedded"/>
+    <module name="intellij.java.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.impl.refactorings" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.compiler.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.typeMigration" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.impl.inspections" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.jvm.analysis.refactoring" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.jvm.analysis.quickFix" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.uiDesigner" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.manifest" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.ui" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.execution.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.debugger.impl" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.debugger.memory.agent" required-if-available="intellij.platform.backend"/>
     <module name="intellij.java.remoteServers.impl" loading="optional"/>
-    <module name="intellij.java.uast.ide"  loading="embedded"/>
-    <module name="intellij.java.backend" required-if-available="intellij.platform.backend" />
+    <module name="intellij.java.uast.ide"  required-if-available="intellij.platform.backend"/>
+
+    <module name="intellij.java.backend" required-if-available="intellij.platform.backend"/>
 
 
     <module name="intellij.java.debugger.impl.shared" loading="embedded"/>
@@ -80,10 +77,10 @@
     <module name="intellij.java.unscramble"/>
     <module name="intellij.java.vcs"/>
     <module name="intellij.java.terminal" loading="optional"/>
-    <module name="intellij.jvm.analysis.impl" required-if-available="intellij.platform.backend"/>
-    <module name="intellij.java.debugger.impl.frontend"/>
-    <module name="intellij.java.debugger.impl.backend" loading="embedded"/>
-    <module name="intellij.java.execution.impl.frontend"/>
+    <module name="intellij.jvm.analysis.impl"/>
+    <module name="intellij.java.debugger.impl.frontend" required-if-available="intellij.platform.frontend"/>
+    <module name="intellij.java.debugger.impl.backend" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.java.execution.impl.frontend" required-if-available="intellij.platform.frontend"/>
     <module name="intellij.java.execution.impl.backend" required-if-available="intellij.platform.backend"/>
     <module name="intellij.java.ultimate.icons" loading="optional"/>
     <module name="intellij.java.langInjection"/>
diff --git a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
index c555d461d195..a6b8d27f20b0 100644
--- a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
+++ b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
@@ -17,7 +17,6 @@
 
     <plugin id="com.intellij.modules.remoteServers"/>
     <plugin id="com.intellij.modules.java-capable"/>
-
   </dependencies>
 
   <extensionPoints>
diff --git a/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml b/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
index cdae3b5f21e1..25b7c363f081 100644
--- a/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
+++ b/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
@@ -1,6 +1,7 @@
 <idea-plugin visibility="internal">
   <dependencies>
     <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.platform.testFramework"/>
   </dependencies>
 </idea-plugin>
\ No newline at end of file
diff --git a/java/typeMigration/resources/intellij.java.typeMigration.xml b/java/typeMigration/resources/intellij.java.typeMigration.xml
index 929395283070..8c2248610b4b 100644
--- a/java/typeMigration/resources/intellij.java.typeMigration.xml
+++ b/java/typeMigration/resources/intellij.java.typeMigration.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
 
-  <!--  <module name="intellij.platform.analysis"/>-->
-  <!--  <module name="intellij.platform.core"/>-->
-  <!--  <module name="intellij.platform.lang"/>-->
-  <!--  <module name="intellij.platform.lang.impl"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java"/>&ndash;&gt;-->
-  <!--  <module name="intellij.platform.structuralSearch"/>-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.impl.refactorings"/>&ndash;&gt;-->
-  <!--  &lt;!&ndash;<module name="intellij.java.codeserver.highlighting"/>&ndash;&gt;-->
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.platform.lang.impl"/>
+    <module name="intellij.java"/>
+    <module name="intellij.platform.structuralSearch"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.codeserver.highlighting"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml
index 172321b794a9..8c12f4f6c0cf 100644
--- a/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml
+++ b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml
@@ -1,13 +1,11 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
     <module name="intellij.platform.core"/>
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.java.psi"/>-->
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.analysis"/>
-    <!--<module name="intellij.java.analysis"/>-->
-    <!--<module name="intellij.platform.uast.ide"/>-->
+    <module name="intellij.java.analysis"/>
+    <module name="intellij.platform.uast.ide"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
index 8da83c43d767..6c1550ffae60 100644
--- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
+++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
@@ -1,7 +1,5 @@
 <idea-plugin visibility="public">
   <dependencies>
-
-
     <module name="intellij.java.indexing"/>
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.java"/>
diff --git a/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml b/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml
index 8f95bc4e7457..7f0f3fc57e7f 100644
--- a/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml
+++ b/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml
@@ -1,14 +1,12 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.jvm.analysis.refactoring"/>-->
-    <!--<module name="intellij.platform.analysis"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.platform.core"/>-->
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.platform.lang"/>-->
-    <!--<module name="intellij.java.analysis"/>-->
+    <module name="intellij.jvm.analysis.refactoring"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.java.analysis"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml
index 5e917518a38c..cefafc491066 100644
--- a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml
+++ b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml
@@ -1,12 +1,10 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.jvm.analysis"/>
+    <module name="intellij.platform.core"/>
 
-  <!--  <module name="intellij.platform.analysis"/>-->
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.jvm.analysis"/>-->
-    <!--<module name="intellij.platform.core"/>-->
-    <!---->
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
diff --git a/uast/uast-common-ide/resources/intellij.platform.uast.ide.xml b/uast/uast-common-ide/resources/intellij.platform.uast.ide.xml
index 281cb75114c5..024da6f2bd6c 100644
--- a/uast/uast-common-ide/resources/intellij.platform.uast.ide.xml
+++ b/uast/uast-common-ide/resources/intellij.platform.uast.ide.xml
@@ -4,14 +4,12 @@
     <module name="intellij.platform.lang"/>
     <module name="intellij.platform.ide.impl"/>
     <module name="intellij.platform.projectModel"/>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
-    <!--<module name="intellij.java.frontback.psi.impl"/>-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.frontback.psi.impl"/>
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
     <module name="intellij.libraries.stream"/>
     <module name="intellij.platform.core"/>
 
diff --git a/uast/uast-common/BUILD.bazel b/uast/uast-common/BUILD.bazel
index c8d9d25208ea..8511df43a4cb 100644
--- a/uast/uast-common/BUILD.bazel
+++ b/uast/uast-common/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/util",
   ],
-  exports = ["//java/java-psi-api:psi"]
+  exports = ["//java/java-psi-api:psi"],
+  runtime_deps = ["//platform/backend"]
 )
 ### auto-generated section `build intellij.platform.uast` end
\ No newline at end of file
diff --git a/uast/uast-common/intellij.platform.uast.iml b/uast/uast-common/intellij.platform.uast.iml
index b0c1f98dcdac..437f16c8b651 100644
--- a/uast/uast-common/intellij.platform.uast.iml
+++ b/uast/uast-common/intellij.platform.uast.iml
@@ -30,5 +30,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/uast/uast-common/resources/intellij.platform.uast.xml b/uast/uast-common/resources/intellij.platform.uast.xml
index 64d99dbbda62..f2f493c1fd63 100644
--- a/uast/uast-common/resources/intellij.platform.uast.xml
+++ b/uast/uast-common/resources/intellij.platform.uast.xml
@@ -1,12 +1,10 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.syntax"/>-->
-    <!--<module name="intellij.java.frontback.psi.impl"/>-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.frontback.psi.impl"/>
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
     <module name="intellij.libraries.stream"/>
     <module name="intellij.platform.core"/>
 
diff --git a/uast/uast-java-ide/resources/intellij.java.uast.ide.xml b/uast/uast-java-ide/resources/intellij.java.uast.ide.xml
index 91a1964fdf06..364d91589f30 100644
--- a/uast/uast-java-ide/resources/intellij.java.uast.ide.xml
+++ b/uast/uast-java-ide/resources/intellij.java.uast.ide.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin>
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.impl"/>-->
-    <!--<module name="intellij.java.psi"/>-->
-    <!--<module name="intellij.platform.analysis"/>-->
-    <!--<module name="intellij.platform.core"/>-->
-    <!--<module name="intellij.java.uast"/>-->
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.java.uast"/>
 
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
diff --git a/uast/uast-java/BUILD.bazel b/uast/uast-java/BUILD.bazel
index 27f187564fa7..e881b0759ed9 100644
--- a/uast/uast-java/BUILD.bazel
+++ b/uast/uast-java/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//java/java-psi-impl:psi-impl",
     "//platform/util",
   ],
-  exports = ["//uast/uast-common:uast"]
+  exports = ["//uast/uast-common:uast"],
+  runtime_deps = ["//platform/backend"]
 )
 ### auto-generated section `build intellij.java.uast` end
\ No newline at end of file
diff --git a/uast/uast-java/intellij.java.uast.iml b/uast/uast-java/intellij.java.uast.iml
index d473fa321337..2c5dc224e708 100644
--- a/uast/uast-java/intellij.java.uast.iml
+++ b/uast/uast-java/intellij.java.uast.iml
@@ -30,5 +30,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/uast/uast-java/resources/intellij.java.uast.xml b/uast/uast-java/resources/intellij.java.uast.xml
index 66d9f22ff253..cea7fc3e2847 100644
--- a/uast/uast-java/resources/intellij.java.uast.xml
+++ b/uast/uast-java/resources/intellij.java.uast.xml
@@ -1,17 +1,15 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
-
-    <!--<module name="intellij.java.psi"/>-->
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.core"/>
-    <!--<module name="intellij.platform.uast"/>-->
-    <!--<module name="intellij.java.psi.impl"/>-->
-    <!--<module name="intellij.java.syntax"/>-->
-    <!--<module name="intellij.java.frontback.psi"/>-->
-    <!--<module name="intellij.java.frontback.psi.impl"/>-->
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.frontback.psi.impl"/>
     <module name="intellij.libraries.stream"/>
-    <!--todo temporary disabled-->
-    <!--<module name="intellij.platform.backend"/>-->
+
+    <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>