diff --git a/java/java-backend/resources/intellij.java.backend.xml b/java/java-backend/resources/intellij.java.backend.xml
index 74f41a1a7a84..750890460b23 100644
--- a/java/java-backend/resources/intellij.java.backend.xml
+++ b/java/java-backend/resources/intellij.java.backend.xml
@@ -2,70 +2,59 @@
 
 
   <dependencies>
-
-    <!--dependencies for the whole java.backend plugin-->
-    <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.vcs"/>
     <plugin id="com.intellij.modules.xdebugger"/>
     <plugin id="com.intellij.modules.xml"/>
-
     <module name="intellij.platform.vcs.impl.lang"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.xml.dom.impl"/>
     <module name="intellij.regexp"/>
-
-    <!--  java modules for backend from old layout -->
-    <module name="intellij.java.syntax"/>
-    <module name="intellij.java.frontback.psi"/>
-    <module name="intellij.java.frontback.psi.impl"/>
-    <module name="intellij.java.psi"/>
-    <module name="intellij.java.psi.impl"/>
-    <module name="intellij.java.frontback.impl"/>
-
-    <module name="intellij.java.indexing"/>
-    <module name="intellij.platform.uast"/>
-    <module name="intellij.platform.uast.ide"/>
-    <module name="intellij.java.uast"/>
-    <module name="intellij.java.compiler"/>
-    <module name="intellij.java.analysis"/>
+    <module name="intellij.java.typeMigration"/>
+    <module name="intellij.java.manifest"/>
+    <module name="intellij.platform.jps.build"/>
+    <plugin id="com.intellij.modules.java-capable"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
-    <module name="intellij.java.resources"/>
-    <module name="intellij.java.execution"/>
-    <module name="intellij.jvm.analysis"/>
-    <module name="intellij.jsp"/>
-
-    <module name="intellij.java.resources.en"/>
-    <module name="intellij.java.debugger"/>
+    <module name="intellij.java.analysis"/>
+    <module name="intellij.java.analysis.impl"/>
     <module name="intellij.java.codeserver.core"/>
     <module name="intellij.java.codeserver.highlighting"/>
-
-    <module name="intellij.jsp.spi"/>
-    <module name="intellij.java.indexing.impl"/>
-    <module name="intellij.java.analysis.impl"/>
-    <module name="intellij.java.structureView"/>
-
-    <module name="intellij.java.impl"/>
-    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.compiler"/>
     <module name="intellij.java.compiler.impl"/>
-    <module name="intellij.java.typeMigration"/>
-    <module name="intellij.java.impl.inspections"/>
-    <module name="intellij.jvm.analysis.refactoring"/>
-    <module name="intellij.jvm.analysis.quickFix"/>
-    <module name="intellij.uiDesigner"/>
-    <module name="intellij.java.manifest"/>
-    <module name="intellij.java.ui"/>
-    <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.debugger"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.debugger.impl.backend"/>
     <module name="intellij.java.debugger.memory.agent"/>
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.frontback.impl"/>
+    <module name="intellij.java.frontback.psi"/>
+    <module name="intellij.java.frontback.psi.impl"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.java.impl.inspections"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <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.resources"/>
+    <module name="intellij.java.resources.en"/>
+    <module name="intellij.java.structureView"/>
+    <module name="intellij.java.syntax"/>
+    <module name="intellij.java.uast"/>
     <module name="intellij.java.uast.ide"/>
-
-    <module name="intellij.platform.jps.build"/>
-    <module name="intellij.platform.jps.build.dependencyGraph"/>
-
-    <!--only backend-->
+    <module name="intellij.java.ui"/>
+    <module name="intellij.jsp"/>
+    <module name="intellij.jsp.spi"/>
+    <module name="intellij.jvm.analysis"/>
+    <module name="intellij.jvm.analysis.quickFix"/>
+    <module name="intellij.jvm.analysis.refactoring"/>
     <module name="intellij.platform.backend"/>
-    <plugin id="com.intellij.modules.java-capable"/>
+    <module name="intellij.platform.jps.build.dependencyGraph"/>
+    <module name="intellij.platform.uast"/>
+    <module name="intellij.platform.uast.ide"/>
+    <module name="intellij.uiDesigner"/>
+    <!-- endregion -->
   </dependencies>
 
   <!--only main settings-->
diff --git a/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml b/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml
index ac8387fd0c15..fb1080bebe1a 100644
--- a/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml
+++ b/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml
@@ -1,8 +1,9 @@
 <idea-plugin visibility="internal">
   <dependencies>
-    <module name="intellij.platform.vcs.impl"/>
-    <plugin id="com.intellij.modules.lang"/>
     <module name="intellij.platform.todo"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.platform.vcs.impl"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.conversion.ConversionService"
diff --git a/plugins/github/github-core/resources/intellij.vcs.github.xml b/plugins/github/github-core/resources/intellij.vcs.github.xml
index 3feb8602710c..b14d3808dfa1 100644
--- a/plugins/github/github-core/resources/intellij.vcs.github.xml
+++ b/plugins/github/github-core/resources/intellij.vcs.github.xml
@@ -1,9 +1,10 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="Git4Idea"/>
     <module name="intellij.platform.collaborationTools"/>
     <module name="intellij.platform.collaborationTools.auth"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.GithubBundle</resource-bundle>
diff --git a/plugins/gitlab/gitlab-core/resources/intellij.vcs.gitlab.xml b/plugins/gitlab/gitlab-core/resources/intellij.vcs.gitlab.xml
index 000e0927881c..a47e9e4cb0a7 100644
--- a/plugins/gitlab/gitlab-core/resources/intellij.vcs.gitlab.xml
+++ b/plugins/gitlab/gitlab-core/resources/intellij.vcs.gitlab.xml
@@ -2,10 +2,11 @@
   <resource-bundle>messages.GitLabBundle</resource-bundle>
 
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="Git4Idea"/>
-    <module name="intellij.platform.vcs.log"/>
     <module name="intellij.platform.collaborationTools"/>
+    <module name="intellij.platform.vcs.log"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/plugins/jshell/console/resources/intellij.java.jshell.console.xml b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
index 12c2b5849eda..b25818993017 100644
--- a/plugins/jshell/console/resources/intellij.java.jshell.console.xml
+++ b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
@@ -1,6 +1,5 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
     <module name="intellij.java.backend"/>
   </dependencies>
 
diff --git a/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml b/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
index 25870c0371dd..e39fc738ec1a 100644
--- a/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
+++ b/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
@@ -1,7 +1,8 @@
 <idea-plugin package="org.intellij.plugins.markdown.spellchecker">
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.spellchecker"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <spellchecker.support language="Markdown"
diff --git a/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml b/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
index 68963e34a92f..ca0f7c84ea01 100644
--- a/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
+++ b/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
@@ -1,8 +1,9 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.xml"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.platform.backend"/>
     <module name="intellij.properties"/>
+    <!-- endregion -->
   </dependencies>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/properties/resources/intellij.properties.backend.xml b/plugins/properties/resources/intellij.properties.backend.xml
index 0ca7bf99d3e2..b34b29c324c8 100644
--- a/plugins/properties/resources/intellij.properties.backend.xml
+++ b/plugins/properties/resources/intellij.properties.backend.xml
@@ -1,14 +1,15 @@
 <idea-plugin visibility="public">
   <resource-bundle>messages.PropertiesBundle</resource-bundle>
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.xml"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.platform.backend"/>
-    <module name="intellij.properties"/>
-    <module name="intellij.properties.psi"/>
-    <module name="intellij.properties.backend.psi"/>
-    <module name="intellij.spellchecker"/>
     <module name="intellij.platform.structuralSearch"/>
+    <module name="intellij.properties"/>
+    <module name="intellij.properties.backend.psi"/>
+    <module name="intellij.properties.psi"/>
+    <module name="intellij.spellchecker"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/plugins/yaml/backend/resources/intellij.yaml.backend.xml b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
index 1e9fd43b94b0..9cb8a077ad96 100644
--- a/plugins/yaml/backend/resources/intellij.yaml.backend.xml
+++ b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
@@ -1,11 +1,12 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <plugin id="com.intellij.modules.lang"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.json.backend"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.searchEverywhere.backend"/>
-    <module name="intellij.yaml"/>
     <module name="intellij.spellchecker"/>
+    <module name="intellij.yaml"/>
+    <!-- endregion -->
   </dependencies>
   
   <extensions defaultExtensionNs="com.intellij">