diff --git a/platform/platform-resources/src/META-INF/essential-modules.xml b/platform/platform-resources/src/META-INF/essential-modules.xml
index 5bf65c8ea457..5602298f0c5a 100644
--- a/platform/platform-resources/src/META-INF/essential-modules.xml
+++ b/platform/platform-resources/src/META-INF/essential-modules.xml
@@ -24,10 +24,6 @@
     <module name="intellij.platform.editor.backend"/>
     <module name="intellij.platform.editor.frontend"/>
 
-    <module name="intellij.platform.vcs.impl.backend"/>
-    <module name="intellij.platform.vcs.impl.frontend"/>
-    <module name="intellij.platform.vcs.impl.shared"/>
-
     <module name="intellij.platform.debugger.impl.frontend"/>
     <module name="intellij.platform.debugger.impl.backend"/>
 
diff --git a/platform/platform-resources/src/META-INF/vcs-modules-frontend.xml b/platform/platform-resources/src/META-INF/vcs-modules-frontend.xml
new file mode 100644
index 000000000000..f70f69b506d8
--- /dev/null
+++ b/platform/platform-resources/src/META-INF/vcs-modules-frontend.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <content>
+    <module name="intellij.platform.vcs.impl.frontend"/>
+  </content>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/vcs-modules-shared.xml b/platform/platform-resources/src/META-INF/vcs-modules-shared.xml
new file mode 100644
index 000000000000..f4332d26158c
--- /dev/null
+++ b/platform/platform-resources/src/META-INF/vcs-modules-shared.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+  <content>
+    <module name="intellij.platform.vcs.impl.shared"/>
+    <module name="intellij.platform.vcs.dvcs.impl.shared"/>
+  </content>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/vcs-modules.xml b/platform/platform-resources/src/META-INF/vcs-modules.xml
index cf92c187fb90..ee17459f841a 100644
--- a/platform/platform-resources/src/META-INF/vcs-modules.xml
+++ b/platform/platform-resources/src/META-INF/vcs-modules.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <content>
     <module name="intellij.platform.vcs.impl"/>
     <module name="intellij.platform.vcs.impl.exec"/>
@@ -6,6 +6,9 @@
     <module name="intellij.platform.vcs.impl.lang.actions"/>
     <module name="intellij.platform.vcs.log.impl"/>
     <module name="intellij.platform.vcs.dvcs.impl"/>
-    <module name="intellij.platform.vcs.dvcs.impl.shared"/>
+    <module name="intellij.platform.vcs.impl.backend"/>
   </content>
+
+  <xi:include href="/META-INF/vcs-modules-shared.xml"/>
+  <xi:include href="/META-INF/vcs-modules-frontend.xml"/>
 </idea-plugin>
\ No newline at end of file