diff --git a/java/compiler/openapi/resources/intellij.java.compiler.xml b/java/compiler/openapi/resources/intellij.java.compiler.xml
index 5b06be433209..50bbaf752eda 100644
--- a/java/compiler/openapi/resources/intellij.java.compiler.xml
+++ b/java/compiler/openapi/resources/intellij.java.compiler.xml
@@ -1,17 +1,11 @@
 <idea-plugin  visibility="public">
   <dependencies>
-    <module name="intellij.java"/>
-    <module name="intellij.platform.analysis"/>
-    <module name="intellij.platform.core"/>
-    <module name="intellij.platform.lang.core"/>
-    <module name="intellij.platform.util.ui"/>
     <module name="intellij.platform.externalSystem"/>
-    <module name="intellij.platform.core.ui"/>
-    <module name="intellij.platform.projectModel"/>
-
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
-
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/java/debugger/impl/resources/intellij.java.debugger.impl.xml b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
index 6f1cfc1bb77c..215155476ca8 100644
--- a/java/debugger/impl/resources/intellij.java.debugger.impl.xml
+++ b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
@@ -1,37 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
   <dependencies>
-    <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"/>
-    <module name="intellij.jsp"/>
-    <module name="intellij.platform.jps.build"/>
-    <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.platform.core.ui"/>
-    <!--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"/>
-
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.backend"/>
-
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.compiler.impl"/>
+    <module name="intellij.java.debugger"/>
+    <module name="intellij.java.debugger.impl.shared"/>
+    <module name="intellij.java.debugger.memory.agent"/>
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.resources"/>
+    <module name="intellij.jsp"/>
+    <module name="intellij.platform.jps.build"/>
+    <!-- endregion -->
   </dependencies>
 
   <xi:include href="/META-INF/java-debugger.xml"/>
diff --git a/java/execution/openapi/resources/intellij.java.execution.xml b/java/execution/openapi/resources/intellij.java.execution.xml
index c6693fcaf111..d95df465ae5c 100644
--- a/java/execution/openapi/resources/intellij.java.execution.xml
+++ b/java/execution/openapi/resources/intellij.java.execution.xml
@@ -1,18 +1,12 @@
 <idea-plugin visibility="public">
   <dependencies>
+    <plugin id="com.intellij.modules.java-capable"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <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"/>
-    <module name="intellij.platform.projectModel"/>
-    <module name="intellij.platform.util.ui"/>
-    <module name="intellij.platform.core.ui"/>
-
     <module name="intellij.platform.backend"/>
-    <plugin id="com.intellij.modules.java-capable"/>
-
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml
index 74d84ec5b3aa..2f8ceaa3ab20 100644
--- a/java/idea-ui/resources/intellij.java.ui.xml
+++ b/java/idea-ui/resources/intellij.java.ui.xml
@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <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"/>
+    <plugin id="com.intellij.modules.java-capable"/>
     <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"/>
-
+    <module name="intellij.java"/>
+    <module name="intellij.java.aetherDependencyResolver"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.compiler.impl"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.libraries.maven.resolver.provider"/>
+    <module name="intellij.platform.vcs.impl"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.disableCompilationDependenciesResolutionTask"
diff --git a/java/java-analysis-api/resources/intellij.java.analysis.xml b/java/java-analysis-api/resources/intellij.java.analysis.xml
index 7f1b2f9223c1..e282dc7171b2 100644
--- a/java/java-analysis-api/resources/intellij.java.analysis.xml
+++ b/java/java-analysis-api/resources/intellij.java.analysis.xml
@@ -1,16 +1,14 @@
 <idea-plugin  visibility="public">
   <dependencies>
-    <module name="intellij.platform.analysis"/>
-    <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.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.platform.uast.ide"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
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 adb8bfc4a897..ba0c8586851f 100644
--- a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
+++ b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
@@ -1,28 +1,19 @@
 <idea-plugin  visibility="public">
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
-    <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.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.xml.psi"/>
-    <module name="intellij.xml.psi.impl"/>
-    <module name="intellij.platform.ide"/>
-    <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.xml.analysis"/>
-
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java"/>
+    <module name="intellij.java.analysis"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.frontback.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.resources.en"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
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 d8496b1cbbdd..7c7c7d690820 100644
--- a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
+++ b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin visibility="public">
   <dependencies>
-    <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"/>
-    <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"/>
-    <module name="intellij.java.codeserver.core"/>
-
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
-
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.jsp"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/java/java-impl/resources/intellij.java.impl.xml b/java/java-impl/resources/intellij.java.impl.xml
index 40eb6a5b2002..0154a14a5a30 100644
--- a/java/java-impl/resources/intellij.java.impl.xml
+++ b/java/java-impl/resources/intellij.java.impl.xml
@@ -1,44 +1,36 @@
 <idea-plugin visibility="public" xmlns:xi="http://www.w3.org/2001/XInclude">
   <dependencies>
-
     <plugin id="com.intellij.modules.xml"/>
-    <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"/>
-    <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.vcs"/>
-    <module name="intellij.jsp"/>
-    <module name="intellij.jsp.spi"/>
-    <module name="intellij.java.execution"/>
     <module name="intellij.xml.dom.impl"/>
-    <module name="intellij.java.psi.impl"/>
-    <module name="intellij.java.frontback.impl"/>
     <module name="intellij.regexp"/>
-    <module name="intellij.java.indexing.impl"/>
-    <module name="intellij.java.indexing"/>
-    <module name="intellij.java.analysis.impl"/>
     <module name="intellij.platform.externalSystem"/>
-    <module name="intellij.java.structureView"/>
-    <module name="intellij.spellchecker"/>
     <module name="intellij.platform.builtInServer.impl"/>
-    <module name="intellij.libraries.gson"/>
-    <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.bookmarks.backend"/>
     <module name="intellij.platform.todo.backend"/>
-    <module name="intellij.java.codeserver.highlighting"/>
-    <module name="intellij.java.codeserver.core"/>
     <module name="intellij.xml.psi"/>
-    <module name="intellij.java.syntax"/>
-    <module name="intellij.java.psi"/>
-
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java"/>
+    <module name="intellij.java.analysis.impl"/>
+    <module name="intellij.java.codeserver.core"/>
+    <module name="intellij.java.codeserver.highlighting"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.frontback.impl"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.psi.impl"/>
+    <module name="intellij.java.structureView"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.jsp"/>
+    <module name="intellij.jsp.spi"/>
+    <module name="intellij.spellchecker"/>
+    <!-- endregion -->
   </dependencies>
 
   <xi:include href="/META-INF/UsageData.xml"/>
diff --git a/java/manifest/resources/intellij.java.manifest.xml b/java/manifest/resources/intellij.java.manifest.xml
index 2a380a2df8ad..c8949e19b977 100644
--- a/java/manifest/resources/intellij.java.manifest.xml
+++ b/java/manifest/resources/intellij.java.manifest.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0"  encoding="UTF-8"?>
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
   <dependencies>
-    <module name="intellij.platform.projectModel"/>
-    <module name="intellij.platform.core"/>
-    <module name="intellij.platform.ide.impl"/>
-    <module name="intellij.platform.analysis"/>
-    <module name="intellij.platform.ide"/>
-    <module name="intellij.platform.lang"/>
-    <module name="intellij.platform.core.impl"/>
-
-    <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"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.spellchecker"/>
+    <!-- endregion -->
   </dependencies>
 
   <xi:include href="/META-INF/ManifestSupport.xml"/>
diff --git a/java/testFramework/resources/intellij.java.testFramework.xml b/java/testFramework/resources/intellij.java.testFramework.xml
index c1497624a50d..ff4a75debb04 100644
--- a/java/testFramework/resources/intellij.java.testFramework.xml
+++ b/java/testFramework/resources/intellij.java.testFramework.xml
@@ -1,9 +1,13 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.libraries.junit4"/>
     <module name="intellij.java.testFramework.backend"/>
     <module name="intellij.java.testFramework.shared"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <module name="intellij.libraries.junit4"/>
-    <!-- endregion -->
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.lang.impl"/>
+    <module name="intellij.platform.projectModel"/>
   </dependencies>
+  <!-- endregion -->
 </idea-plugin>
\ No newline at end of file
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 364d91589f30..4610e9fd8630 100644
--- a/uast/uast-java-ide/resources/intellij.java.uast.ide.xml
+++ b/uast/uast-java-ide/resources/intellij.java.uast.ide.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <idea-plugin>
   <dependencies>
-    <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"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.uast"/>
+    <!-- endregion -->
   </dependencies>
 
   <!--from intellij.java.psi.impl.xml-->