diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1d4ca8371574..da901b6be475 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -855,7 +855,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" filepath="$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" filepath="$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/platform/libraries/grpc/intellij.libraries.grpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" />
diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml
index e3a3eee1f968..ffeaf63b27f0 100644
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -10,7 +10,6 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
-    <module name="intellij.platform.images.copyright"/>
     <module name="intellij.xml.xmlbeans"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
@@ -19,7 +18,8 @@
     <module name="intellij.platform.experiment"/>
     <module name="intellij.idea.customization.base"/>
   </content>
-  
+  <xi:include href="/META-INF/common-ide-modules.xml"/>
+
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.openapi.updateSettings.UpdateStrategyCustomization"
                         serviceImplementation="com.intellij.openapi.updateSettings.base.ShowWhatIsNewPageAfterUpdateCustomization"
diff --git a/platform/libraries/grpc/intellij.libraries.grpc.iml b/libraries/grpc/intellij.libraries.grpc.iml
similarity index 100%
rename from platform/libraries/grpc/intellij.libraries.grpc.iml
rename to libraries/grpc/intellij.libraries.grpc.iml
diff --git a/platform/libraries/grpc/resources/intellij.libraries.grpc.xml b/libraries/grpc/resources/intellij.libraries.grpc.xml
similarity index 100%
rename from platform/libraries/grpc/resources/intellij.libraries.grpc.xml
rename to libraries/grpc/resources/intellij.libraries.grpc.xml
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 3f5ee87d8406..2a815b6ba6b6 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -529,13 +529,21 @@ private suspend fun getProductPluginContentModules(context: BuildContext, produc
     readXmlAsModel(file)
   }?.let { root ->
     collectProductModules(root = root, result = result)
+
+    // we don't want to allow providing product modules in any x-include, check only specific ones
+    if (root.children.any { it.name == "include" && it.getAttributeValue("href") == "/META-INF/common-ide-modules.xml" }) {
+      collectProductModules(
+        root = readXmlAsModel(context.findFileInModuleSources("intellij.platform.resources", "META-INF/common-ide-modules.xml")!!),
+        result = result,
+      )
+    }
   }
 
   withContext(Dispatchers.IO) {
-    val file = context.findFileInModuleSources("intellij.platform.resources", "META-INF/PlatformLangPlugin.xml")
-    file?.let { readXmlAsModel(it) }
-  }?.let {
-    collectProductModules(root = it, result = result)
+    collectProductModules(
+      root = readXmlAsModel(context.findFileInModuleSources("intellij.platform.resources", "META-INF/PlatformLangPlugin.xml")!!),
+      result = result,
+    )
   }
 
   return result
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index e13b3c0fa49b..7efd006e033d 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -14,9 +14,6 @@
     <module name="intellij.platform.navbar.compatibility.ide"/>
     <module name="intellij.platform.navbar.compatibility.monolith"/>
     <module name="intellij.platform.settings.local"/>
-
-    <module name="intellij.platform.vcs.log.impl"/>
-    <module name="intellij.platform.vcs.dvcs.impl"/>
   </content>
 
   <xi:include href="PlatformLangComponents.xml"/>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
new file mode 100644
index 000000000000..712aa5ff4374
--- /dev/null
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -0,0 +1,8 @@
+<idea>
+  <content>
+    <module name="intellij.platform.images.copyright"/>
+
+    <module name="intellij.platform.vcs.log.impl"/>
+    <module name="intellij.platform.vcs.dvcs.impl"/>
+  </content>
+</idea>
\ No newline at end of file
diff --git a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
index 022ec05b7f38..4af24ce16b03 100644
--- a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
@@ -6,11 +6,11 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
-    <module name="intellij.platform.images.copyright"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
     <module name="intellij.ide.startup.importSettings"/>
   </content>
+  <xi:include href="/META-INF/common-ide-modules.xml"/>
 
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>