diff --git a/java/compiler/impl/resources/intellij.java.compiler.impl.xml b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
index 54c3a4f84239..7e8b4c81be1c 100644
--- a/java/compiler/impl/resources/intellij.java.compiler.impl.xml
+++ b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
@@ -13,6 +13,7 @@
     <module name="intellij.java.compiler"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.jps.build"/>
diff --git a/java/compiler/openapi/resources/intellij.java.compiler.xml b/java/compiler/openapi/resources/intellij.java.compiler.xml
index bdd9fd98ca1d..af115ba71bb2 100644
--- a/java/compiler/openapi/resources/intellij.java.compiler.xml
+++ b/java/compiler/openapi/resources/intellij.java.compiler.xml
@@ -1,12 +1,13 @@
 <idea-plugin  visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.platform.externalSystem"/>
     <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 -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"
diff --git a/java/debugger/impl/resources/intellij.java.debugger.impl.xml b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
index 2381d139c3e0..c63c3ab0522d 100644
--- a/java/debugger/impl/resources/intellij.java.debugger.impl.xml
+++ b/java/debugger/impl/resources/intellij.java.debugger.impl.xml
@@ -19,6 +19,7 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.buildScripts.downloader"/>
diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml
index d5e8f2b057cd..8b805143d7b7 100644
--- a/java/execution/impl/resources/intellij.java.execution.impl.xml
+++ b/java/execution/impl/resources/intellij.java.execution.impl.xml
@@ -12,6 +12,7 @@
     <module name="intellij.java.execution"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.smRunner"/>
     <module name="intellij.platform.testRunner"/>
diff --git a/java/execution/openapi/resources/intellij.java.execution.xml b/java/execution/openapi/resources/intellij.java.execution.xml
index 5f3b2250b315..30a9f371a894 100644
--- a/java/execution/openapi/resources/intellij.java.execution.xml
+++ b/java/execution/openapi/resources/intellij.java.execution.xml
@@ -4,6 +4,7 @@
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.java"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
   </dependencies>
diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml
index 752fee8795d9..44850a6bceb5 100644
--- a/java/idea-ui/resources/intellij.java.ui.xml
+++ b/java/idea-ui/resources/intellij.java.ui.xml
@@ -6,13 +6,14 @@
     <module name="intellij.platform.externalSystem"/>
     <module name="intellij.platform.externalSystem.impl"/>
     <module name="intellij.platform.backend"/>
-    <module name="intellij.java.syntax"/>
     <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.psi"/>
+    <module name="intellij.java.syntax"/>
     <module name="intellij.libraries.maven.resolver.provider"/>
     <module name="intellij.platform.vcs.impl"/>
   </dependencies>
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 e268449ff4fd..db2b85ae09df 100644
--- a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
+++ b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
@@ -14,6 +14,7 @@
     <module name="intellij.java.codeserver.highlighting"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
diff --git a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
index 19e8776510a5..8e29f7e0e8cb 100644
--- a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
+++ b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
@@ -1,18 +1,19 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.debugger.impl.shared"/>
     <module name="intellij.platform.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="training"/>
     <module name="intellij.java"/>
     <module name="intellij.java.debugger"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
     <module name="intellij.java.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="training">
     <ift.language.extension language="JAVA" defaultProductName="IDEA,Aqua" implementationClass="com.intellij.java.ift.JavaLangSupport"/>
     <ift.learning.course language="JAVA" implementationClass="com.intellij.java.ift.JavaLearningCourse"/>
diff --git a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
index 694b08e26b2e..ff152c16c5ff 100644
--- a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
+++ b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
@@ -1,6 +1,7 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
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 9e74a1035e86..5dfe68ce8a4f 100644
--- a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
+++ b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
@@ -3,7 +3,6 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="com.intellij.modules.java-capable"/>
-    <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.java"/>
     <module name="intellij.java.analysis.impl"/>
@@ -13,6 +12,8 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
 
diff --git a/java/java-psi-impl/resources/intellij.java.psi.impl.xml b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
index 38ce969a6993..46d2ab29b024 100644
--- a/java/java-psi-impl/resources/intellij.java.psi.impl.xml
+++ b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
@@ -16,6 +16,7 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
diff --git a/java/java-structure-view/resources/intellij.java.structureView.xml b/java/java-structure-view/resources/intellij.java.structureView.xml
index 3bf803bb0362..d9ba99ae2a36 100644
--- a/java/java-structure-view/resources/intellij.java.structureView.xml
+++ b/java/java-structure-view/resources/intellij.java.structureView.xml
@@ -5,6 +5,7 @@
     <module name="intellij.java.psi.impl"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.java.analysis.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
diff --git a/java/jsp-spi/resources/intellij.jsp.spi.xml b/java/jsp-spi/resources/intellij.jsp.spi.xml
index 2812b1682b4b..aa997f732a9b 100644
--- a/java/jsp-spi/resources/intellij.jsp.spi.xml
+++ b/java/jsp-spi/resources/intellij.jsp.spi.xml
@@ -4,6 +4,7 @@
     <plugin id="com.intellij.modules.xml"/>
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.java"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.backend"/>
   </dependencies>
diff --git a/java/langInjection/resources/intellij.java.langInjection.xml b/java/langInjection/resources/intellij.java.langInjection.xml
index 1393b333ea16..48a865b7db30 100644
--- a/java/langInjection/resources/intellij.java.langInjection.xml
+++ b/java/langInjection/resources/intellij.java.langInjection.xml
@@ -1,18 +1,19 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.platform.langInjection.backend"/>
     <module name="intellij.regexp"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
     <module name="intellij.java.compiler.impl"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.java.langInjection.jps"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.langInjection"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">
     <localInspection language="JAVA" shortName="UnknownLanguage" groupKey="inspections.language.injection.group.name" enabledByDefault="true"
                      level="ERROR" implementationClass="org.intellij.plugins.intelliLang.inject.java.validation.UnknownLanguageID"
diff --git a/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml b/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml
index 3d2fbbe7f213..485c813c2f6b 100644
--- a/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml
+++ b/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml
@@ -1,14 +1,15 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="com.intellij.modules.structuralsearch"/>
     <module name="intellij.platform.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.structuralsearch.plugin.ui.StructuralSearchTemplateBuilder"
diff --git a/java/testFramework/resources/intellij.java.testFramework.xml b/java/testFramework/resources/intellij.java.testFramework.xml
index 52a64dbf7df0..5a9bbfe6ebf0 100644
--- a/java/testFramework/resources/intellij.java.testFramework.xml
+++ b/java/testFramework/resources/intellij.java.testFramework.xml
@@ -4,6 +4,7 @@
     <module name="intellij.libraries.junit4"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.testFramework.backend"/>
     <module name="intellij.java.testFramework.shared"/>
diff --git a/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml b/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
index cbfaea830724..3262cbeeb908 100644
--- a/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
+++ b/java/testFramework/shared/resources/intellij.java.testFramework.shared.xml
@@ -2,6 +2,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.libraries.groovy"/>
diff --git a/java/typeMigration/resources/intellij.java.typeMigration.xml b/java/typeMigration/resources/intellij.java.typeMigration.xml
index eaee597ab261..e09ca13e2797 100644
--- a/java/typeMigration/resources/intellij.java.typeMigration.xml
+++ b/java/typeMigration/resources/intellij.java.typeMigration.xml
@@ -8,6 +8,7 @@
     <module name="intellij.java.codeserver.highlighting"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.structuralSearch"/>
   </dependencies>
diff --git a/java/vcs/resources/intellij.java.vcs.xml b/java/vcs/resources/intellij.java.vcs.xml
index ba0c16865115..d992c27bc4c5 100644
--- a/java/vcs/resources/intellij.java.vcs.xml
+++ b/java/vcs/resources/intellij.java.vcs.xml
@@ -1,9 +1,11 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.platform.vcs.impl"/>
-    <module name="intellij.java.execution"/>
-
     <module name="intellij.platform.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.vcs.impl"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
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 495fbd9966bf..bb14a55cc99a 100644
--- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
+++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
@@ -7,6 +7,7 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.jvm.analysis.quickFix"/>
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 0ecc22943fda..9852561f51f4 100644
--- a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml
+++ b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml
@@ -3,6 +3,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.platform.uast"/>
   </dependencies>
diff --git a/plugins/ant/resources/META-INF/plugin.xml b/plugins/ant/resources/META-INF/plugin.xml
index 4f1d2f97c53e..3b7a599727d6 100644
--- a/plugins/ant/resources/META-INF/plugin.xml
+++ b/plugins/ant/resources/META-INF/plugin.xml
@@ -14,6 +14,7 @@ To use the <b>Ant</b> tool window, select <b>View > Tool Windows > Ant</b>.
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.testRunner"/>
     <module name="intellij.xml.dom"/>
diff --git a/plugins/commander/resources/META-INF/plugin.xml b/plugins/commander/resources/META-INF/plugin.xml
index ea07249a5761..b7c004fb817c 100644
--- a/plugins/commander/resources/META-INF/plugin.xml
+++ b/plugins/commander/resources/META-INF/plugin.xml
@@ -5,6 +5,7 @@
   <vendor>JetBrains</vendor>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
diff --git a/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml b/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
index 49396920a16b..e693c0614eef 100644
--- a/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
+++ b/plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml
@@ -1,15 +1,16 @@
 <idea-plugin visibility="internal" package="com.intellij.java.dev">
   <resource-bundle>messages.JavaDevBundle</resource-bundle>
 
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.platform.debugger.impl"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.dev.codeInsight"/>
     <module name="intellij.dev.psiViewer"/>
     <module name="intellij.java.debugger.impl"/>
-    <!-- endregion -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij.dev">
     <psiViewer.extension implementation="com.intellij.java.dev.psiViewer.PsiViewerExpressionExtension"/>
diff --git a/plugins/dev/intellij.kotlin.dev/resources/intellij.kotlin.dev.xml b/plugins/dev/intellij.kotlin.dev/resources/intellij.kotlin.dev.xml
index 4eea7b2ac003..e28194042753 100644
--- a/plugins/dev/intellij.kotlin.dev/resources/intellij.kotlin.dev.xml
+++ b/plugins/dev/intellij.kotlin.dev/resources/intellij.kotlin.dev.xml
@@ -1,9 +1,12 @@
 <idea-plugin package="org.jetbrains.idea.dev.kotlin">
 
   <dependencies>
-    <module name="intellij.dev.psiViewer"/>
-    <module name="intellij.dev.codeInsight"/>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.dev.codeInsight"/>
+    <module name="intellij.dev.psiViewer"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.dev">
diff --git a/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml b/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
index 314c3ea0e288..b9e03366f177 100644
--- a/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
+++ b/plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.apiDump"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.ApiDumpLangBundle</resource-bundle>
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index cd855821493b..c6651958ad94 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -6,6 +6,7 @@
     <module name="intellij.java.aetherDependencyResolver"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.java.xml.dom.impl"/>
diff --git a/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml b/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
index 1ed4e7d7976b..915390d74abd 100644
--- a/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
+++ b/plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
@@ -8,6 +8,7 @@
     <module name="intellij.gradle"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.libraries.skiko"/>
     <module name="intellij.platform.compose"/>
     <module name="intellij.platform.compose.markdown"/>
diff --git a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
index 0392d21f01ae..cb12bdbb026c 100644
--- a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
+++ b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.devkit.core"/>
     <module name="intellij.gradle.java"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.smRunner"/>
   </dependencies>
diff --git a/plugins/devkit/intellij.devkit.i18n/resources/intellij.devkit.i18n.xml b/plugins/devkit/intellij.devkit.i18n/resources/intellij.devkit.i18n.xml
index 4fa59bb1c8d1..99ea33ddd4fd 100644
--- a/plugins/devkit/intellij.devkit.i18n/resources/intellij.devkit.i18n.xml
+++ b/plugins/devkit/intellij.devkit.i18n/resources/intellij.devkit.i18n.xml
@@ -3,6 +3,7 @@
   <dependencies>
     <plugin id="com.intellij.java-i18n"/>
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.parser"/>
diff --git a/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml b/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
index 724413d47b68..251609bb9f84 100644
--- a/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
+++ b/plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml
@@ -1,9 +1,12 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.intellij.mcpServer"/>
     <module name="intellij.devkit.core"/>
     <module name="intellij.devkit.scaffolding"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.mcpServer">
diff --git a/plugins/devkit/intellij.devkit.themes/resources/intellij.devkit.themes.xml b/plugins/devkit/intellij.devkit.themes/resources/intellij.devkit.themes.xml
index 27f06a30f9ad..ad51b7044e92 100644
--- a/plugins/devkit/intellij.devkit.themes/resources/intellij.devkit.themes.xml
+++ b/plugins/devkit/intellij.devkit.themes/resources/intellij.devkit.themes.xml
@@ -2,6 +2,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.json.backend"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.psi"/>
diff --git a/plugins/devkit/intellij.devkit.threading/resources/intellij.devkit.threading.xml b/plugins/devkit/intellij.devkit.threading/resources/intellij.devkit.threading.xml
index 93d772450bb9..01280eaaba81 100644
--- a/plugins/devkit/intellij.devkit.threading/resources/intellij.devkit.threading.xml
+++ b/plugins/devkit/intellij.devkit.threading/resources/intellij.devkit.threading.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.compose"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.DevkitThreadingBundle</resource-bundle>
diff --git a/plugins/devkit/intellij.devkit.uiDesigner/resources/intellij.devkit.uiDesigner.xml b/plugins/devkit/intellij.devkit.uiDesigner/resources/intellij.devkit.uiDesigner.xml
index 1d566e6db0fd..5d35d045f920 100644
--- a/plugins/devkit/intellij.devkit.uiDesigner/resources/intellij.devkit.uiDesigner.xml
+++ b/plugins/devkit/intellij.devkit.uiDesigner/resources/intellij.devkit.uiDesigner.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.devkit.core"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.intellij.uiDesigner"/>
+    <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <!-- todo IDEA-282478
   <actions>
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k2/resources/intellij.devkit.workspaceModel.k2.xml b/plugins/devkit/intellij.devkit.workspaceModel/k2/resources/intellij.devkit.workspaceModel.k2.xml
index 5fdca427f6a8..31d6a7bd786d 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/k2/resources/intellij.devkit.workspaceModel.k2.xml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/k2/resources/intellij.devkit.workspaceModel.k2.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
     <plugin id="com.intellij.modules.kotlin.k2"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.workspaceModel"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.DevKitWorkspaceModelBundle</resource-bundle>
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml b/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
index 0a694ec9a06e..6e973336734a 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml
@@ -3,10 +3,11 @@
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
     <plugin id="org.editorconfig.editorconfigjetbrains"/>
-    <plugin id="com.intellij.copyright"/>
     <module name="intellij.java.backend"/>
+    <plugin id="com.intellij.copyright"/>
     <module name="intellij.devkit.core"/>
     <module name="intellij.java.aetherDependencyResolver"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
   </dependencies>
   <!-- endregion -->
diff --git a/plugins/devkit/intellij.kotlin.devkit/k2/resources/intellij.kotlin.devkit.k2.xml b/plugins/devkit/intellij.kotlin.devkit/k2/resources/intellij.kotlin.devkit.k2.xml
index c52f9bdf3788..1b334b68ceff 100644
--- a/plugins/devkit/intellij.kotlin.devkit/k2/resources/intellij.kotlin.devkit.k2.xml
+++ b/plugins/devkit/intellij.kotlin.devkit/k2/resources/intellij.kotlin.devkit.k2.xml
@@ -1,9 +1,12 @@
 <idea-plugin>
   <dependencies>
     <plugin id="com.intellij.modules.kotlin.k2"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.kotlin.codeInsight.intentions"/>
     <module name="intellij.kotlin.devkit"/>
     <module name="intellij.kotlin.refactorings"/>
-    <module name="intellij.kotlin.codeInsight.intentions"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/devkit/intellij.kotlin.devkit/resources/intellij.kotlin.devkit.xml b/plugins/devkit/intellij.kotlin.devkit/resources/intellij.kotlin.devkit.xml
index 369cf2f06d17..18482457bfe3 100644
--- a/plugins/devkit/intellij.kotlin.devkit/resources/intellij.kotlin.devkit.xml
+++ b/plugins/devkit/intellij.kotlin.devkit/resources/intellij.kotlin.devkit.xml
@@ -3,8 +3,9 @@
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
     <module name="intellij.devkit.core"/>
-    <module name="intellij.kotlin.codeInsight.shared"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.kotlin.codeInsight.fixes"/>
+    <module name="intellij.kotlin.codeInsight.shared"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.psi"/>
   </dependencies>
diff --git a/plugins/env-files-support/java/resources/intellij.dotenv.java.xml b/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
index e7a25c1dfcd1..6e888f7e6378 100644
--- a/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
+++ b/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
@@ -1,6 +1,9 @@
 <idea-plugin package="ru.adelf.idea.dotenv.java">
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="JAVA" implementationClass="ru.adelf.idea.dotenv.java.JavaEnvCompletionContributor"/>
diff --git a/plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml b/plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml
index 007e7888c0d5..0a9e95c04308 100644
--- a/plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml
+++ b/plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml
@@ -1,7 +1,10 @@
 <idea-plugin package="ru.adelf.idea.dotenv.kotlin">
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.dotenv.java"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="kotlin" implementationClass="ru.adelf.idea.dotenv.kotlin.KotlinEnvCompletionContributor"/>
diff --git a/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml b/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
index ebe681bedd17..4636d5ed98dd 100644
--- a/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
+++ b/plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.gradle"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.maven"/>
     <module name="intellij.platform.smRunner"/>
     <module name="intellij.platform.testRunner"/>
diff --git a/plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml b/plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml
index fa6c3eff1813..d0392c3d0764 100644
--- a/plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml
+++ b/plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml
@@ -1,6 +1,9 @@
 <idea-plugin>
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.cce">
diff --git a/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml b/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
index ca6b304c678d..4784c944c27e 100644
--- a/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
+++ b/plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
@@ -1,10 +1,11 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.grazie.core"/>
-    <!-- endregion -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij.grazie">
     <textExtractor language="JAVA" implementationClass="com.intellij.grazie.ide.language.java.JavaTextExtractor"/>
diff --git a/plugins/jshell/console/resources/intellij.java.jshell.console.xml b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
index f12e790adc24..c5348e0f51bc 100644
--- a/plugins/jshell/console/resources/intellij.java.jshell.console.xml
+++ b/plugins/jshell/console/resources/intellij.java.jshell.console.xml
@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
diff --git a/plugins/kotlin/base/code-insight/minimal/resource/intellij.kotlin.base.codeInsight.minimal.xml b/plugins/kotlin/base/code-insight/minimal/resource/intellij.kotlin.base.codeInsight.minimal.xml
index 2c0b01631441..5a41850a08c9 100644
--- a/plugins/kotlin/base/code-insight/minimal/resource/intellij.kotlin.base.codeInsight.minimal.xml
+++ b/plugins/kotlin/base/code-insight/minimal/resource/intellij.kotlin.base.codeInsight.minimal.xml
@@ -1,3 +1,8 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.java.psi"/>
+  </dependencies>
+  <!-- endregion -->
   <xi:include href="base-codeInsight-minimal.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml b/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
index 8d1ae8b7d174..82dda2b91c69 100644
--- a/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
+++ b/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
@@ -10,6 +10,7 @@
   <vendor>JetBrains</vendor>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
diff --git a/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml b/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
index 22f56df1684c..89d16a2d721f 100644
--- a/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
+++ b/plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.searchEverywhereMl.ranking.core"/>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.searchEverywhereMl.ranking.core"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.searcheverywhere.ml">
diff --git a/plugins/ui-designer/resources/META-INF/plugin.xml b/plugins/ui-designer/resources/META-INF/plugin.xml
index a8e511cc8390..29e42b2dd9b8 100644
--- a/plugins/ui-designer/resources/META-INF/plugin.xml
+++ b/plugins/ui-designer/resources/META-INF/plugin.xml
@@ -7,6 +7,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.xml.impl"/>
diff --git a/python/pluginJava/resources/intellij.python.community.plugin.java.xml b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
index 9f7813f700e5..bf5c54d802ab 100644
--- a/python/pluginJava/resources/intellij.python.community.plugin.java.xml
+++ b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
@@ -1,14 +1,15 @@
 <idea-plugin visibility="internal">
   <!--For IU or IC-->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <!-- Supports Java -->
     <module name="intellij.java.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.python.community.core.impl"/>
     <module name="intellij.python.community.plugin.impl"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <newProjectWizard.languageGenerator implementation="com.intellij.python.community.plugin.java.PythonNewProjectWizard"/>