diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel
index b9a88e752a28..4539ebe63f00 100644
--- a/java/compiler/impl/BUILD.bazel
+++ b/java/compiler/impl/BUILD.bazel
@@ -10,6 +10,7 @@ jvm_library(
     "//java/compiler/openapi:java-compiler",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/util/jdom",
     "//platform/util",
diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml
index a8fc4bc3804e..5068fdcd9d1b 100644
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler" exported="" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.util" />
diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel
index 32d16b49cd1b..b0cd141bca40 100644
--- a/java/java-impl-refactorings/BUILD.bazel
+++ b/java/java-impl-refactorings/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/lang-impl",
     "//platform/platform-impl:ide-impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/statistics",
     "//java/openapi:java",
diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
index a66ce95dbc86..3528c348762d 100644
--- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.java" />
diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel
index 8cf9d003168e..0dd2c67a04dd 100644
--- a/java/java-impl/BUILD.bazel
+++ b/java/java-impl/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/foldings",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView-impl",
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 02ff65cf1ea2..d57da9879a89 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.foldings" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index cb507134e9c8..3eaa82d89930 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/foldings",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/testFramework",
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 748250774843..76eec43fb11f 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
diff --git a/platform/build-scripts/usages/BUILD.bazel b/platform/build-scripts/usages/BUILD.bazel
index 8c96af22c3f3..754e76aff444 100644
--- a/platform/build-scripts/usages/BUILD.bazel
+++ b/platform/build-scripts/usages/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "//jps/model-api:model",
     "//jps/model-serialization",
-  ]
+  ],
+  runtime_deps = ["//jps/model-impl"]
 )
 ### auto-generated section `build intellij.platform.buildScripts.usages` end
\ No newline at end of file
diff --git a/platform/build-scripts/usages/intellij.platform.buildScripts.usages.iml b/platform/build-scripts/usages/intellij.platform.buildScripts.usages.iml
index b468d6e05063..5d8b3b224b36 100644
--- a/platform/build-scripts/usages/intellij.platform.buildScripts.usages.iml
+++ b/platform/build-scripts/usages/intellij.platform.buildScripts.usages.iml
@@ -18,6 +18,7 @@
     <orderEntry type="library" name="hash4j" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt b/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt
index 961f6c5d753a..02ba7ad4f1c9 100644
--- a/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt
+++ b/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt
@@ -81,7 +81,7 @@ internal class AddDependencyToImlByUsage {
         "intellij.platform.credentialStore",
         "intellij.platform.credentialStore.impl",
         //"intellij.platform.macro",
-        //"intellij.platform.lvcs",
+        "intellij.platform.lvcs",
         "intellij.platform.lvcs.impl",
         //"intellij.c",
         //"intellij.cidr.core",
diff --git a/platform/dvcs-impl/BUILD.bazel b/platform/dvcs-impl/BUILD.bazel
index 8305ae2ecf33..c0c4c9b41932 100644
--- a/platform/dvcs-impl/BUILD.bazel
+++ b/platform/dvcs-impl/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-impl",
     "//platform/project/shared:project",
     "//platform/vcs-impl/shared",
@@ -51,6 +52,7 @@ jvm_library(
   deps = [
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-impl",
     "//platform/vcs-impl:vcs-impl_test_lib",
     "//platform/project/shared:project",
diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
index 66afdb841362..efc3a0911f74 100644
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -11,6 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="module" module-name="intellij.platform.project" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.shared" />
diff --git a/platform/external-system-impl/BUILD.bazel b/platform/external-system-impl/BUILD.bazel
index 866a9fdac5e9..78d860a91c19 100644
--- a/platform/external-system-impl/BUILD.bazel
+++ b/platform/external-system-impl/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/external-system-api:externalSystem",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/projectModel-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index 4cc449891d64..bde9e0a51c5f 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -34,6 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/platform/lang-api/BUILD.bazel b/platform/lang-api/BUILD.bazel
index ed9608ccb3d2..ab53c4559554 100644
--- a/platform/lang-api/BUILD.bazel
+++ b/platform/lang-api/BUILD.bazel
@@ -37,7 +37,6 @@ jvm_library(
   exports = [
     "//platform/platform-api:ide",
     "//platform/lang-core",
-    "//platform/lvcs-api:lvcs",
     "//platform/indexing-api:indexing",
     "//platform/projectModel-api:projectModel",
     "//platform/analysis-api:analysis",
diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml
index 6a3358e1eaa4..2fb3159980ae 100644
--- a/platform/lang-api/intellij.platform.lang.iml
+++ b/platform/lang-api/intellij.platform.lang.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.lvcs" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index 9c3642fff4a1..cfb9fcd0c609 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "@lib//:oro_matcher",
     "@lib//:velocity",
     "//platform/platform-impl:ide-impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/usageView",
     "@lib//:cli-parser",
     "//platform/indexing-api:indexing",
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index d90586cf5e3f..1f5361224fec 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -38,6 +38,7 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel
index 7657ebf94909..104c1694a31d 100644
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -44,6 +44,7 @@ jvm_library(
     "//platform/core-impl",
     "@lib//:miglayout-swing",
     "//platform/indexing-api:indexing",
+    "//platform/lvcs-api:lvcs",
     "//platform/projectModel-impl",
     "//platform/workspace/jps",
     "@lib//:commons-imaging",
@@ -189,6 +190,7 @@ jvm_library(
     "//platform/core-impl",
     "@lib//:miglayout-swing",
     "//platform/indexing-api:indexing",
+    "//platform/lvcs-api:lvcs",
     "//platform/projectModel-impl",
     "//platform/workspace/jps",
     "@lib//:commons-imaging",
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 8e0dda507333..fc0ac1bd8b0b 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -44,6 +44,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="library" name="miglayout-swing" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="library" name="commons-imaging" level="project" />
diff --git a/platform/smRunner/BUILD.bazel b/platform/smRunner/BUILD.bazel
index fc9bb4eca846..191c3cf4672d 100644
--- a/platform/smRunner/BUILD.bazel
+++ b/platform/smRunner/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
     "//platform/execution-impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/testRunner",
     "//platform/xdebugger-api:debugger",
     "//platform/platform-impl:ide-impl",
@@ -47,6 +48,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/execution-impl",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/testRunner",
     "//platform/testRunner:testRunner_test_lib",
     "//platform/xdebugger-api:debugger",
diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index 39dc1304618c..a90ec3f03611 100644
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/platform/structuralsearch/BUILD.bazel b/platform/structuralsearch/BUILD.bazel
index ca76de905b84..e68a662ce1e2 100644
--- a/platform/structuralsearch/BUILD.bazel
+++ b/platform/structuralsearch/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/util",
     "//platform/util/jdom",
     "//xml/impl",
diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.iml b/platform/structuralsearch/intellij.platform.structuralSearch.iml
index 85161322c177..79f9598282ba 100644
--- a/platform/structuralsearch/intellij.platform.structuralSearch.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel
index b0edf6e70c79..038be10a8519 100644
--- a/platform/testFramework/BUILD.bazel
+++ b/platform/testFramework/BUILD.bazel
@@ -64,6 +64,7 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/lang-api:lang",
     "//platform/lang-impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/service-container",
     "//platform/structure-view-impl:structureView-impl",
@@ -150,6 +151,7 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/lang-api:lang",
     "//platform/lang-impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/service-container",
     "//platform/service-container:service-container_test_lib",
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index d0148c1f8d69..c872c41f7ef5 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -49,6 +49,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel
index 1232c75f2dbe..3d878934fc6f 100644
--- a/platform/vcs-impl/BUILD.bazel
+++ b/platform/vcs-impl/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
     "//platform/credential-store",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/platform-api:ide",
     "//platform/platform-impl:ide-impl",
@@ -74,6 +75,7 @@ jvm_library(
     "//platform/credential-store",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/platform-api:ide",
     "//platform/platform-impl:ide-impl",
diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index 9f3b493a7ff7..4203f4d6d744 100644
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -39,6 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel
index 5dcbc9b4b8a9..98098ab5c616 100644
--- a/platform/xdebugger-impl/BUILD.bazel
+++ b/platform/xdebugger-impl/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/lang-impl",
     "//platform/execution-impl",
     "//platform/diff-api:diff",
+    "//platform/lvcs-api:lvcs",
     "@lib//:stream_ex",
     "//platform/statistics",
     "@lib//:fastutil-min",
@@ -65,6 +66,7 @@ jvm_library(
     "//platform/execution-impl",
     "//platform/diff-api:diff",
     "//platform/xdebugger-testFramework:debugger-testFramework",
+    "//platform/lvcs-api:lvcs",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/testFramework/extensions:testExtensions",
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index 60e1153c14e0..17794e4a1fed 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -43,6 +43,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" name="StreamEx" level="project" />
diff --git a/plugins/ant/BUILD.bazel b/plugins/ant/BUILD.bazel
index 731d3be776c4..335348b59ca6 100644
--- a/plugins/ant/BUILD.bazel
+++ b/plugins/ant/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/ide-core-impl",
     "//java/compiler/impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//java/java-runtime:rt",
     "//java/execution/impl",
@@ -62,6 +63,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/ide-core-impl",
     "//java/compiler/impl",
+    "//platform/lvcs-api:lvcs",
     "//platform/refactoring",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml
index f3336b628a23..165bd214e003 100644
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.rt" />
diff --git a/plugins/commander/BUILD.bazel b/plugins/commander/BUILD.bazel
index ad23c283318c..dd5b8895944e 100644
--- a/plugins/commander/BUILD.bazel
+++ b/plugins/commander/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
     "//platform/core-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/util/jdom",
     "//platform/core-api:core",
@@ -40,6 +41,7 @@ jvm_library(
     "//plugins/ui-designer:java-guiForms-designer",
     "//plugins/ui-designer:java-guiForms-designer_test_lib",
     "//platform/core-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/util/jdom",
     "//platform/testFramework",
diff --git a/plugins/commander/intellij.commander.iml b/plugins/commander/intellij.commander.iml
index 06d12d76e434..92a9c24363ea 100644
--- a/plugins/commander/intellij.commander.iml
+++ b/plugins/commander/intellij.commander.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.guiForms.designer" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/github/github-core/BUILD.bazel b/plugins/github/github-core/BUILD.bazel
index ad58174689d4..f4ff2268b854 100644
--- a/plugins/github/github-core/BUILD.bazel
+++ b/plugins/github/github-core/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
   srcs = glob(["gen/**/*.kt", "gen/**/*.java", "src/**/*.kt", "src/**/*.java"], allow_empty = True),
   deps = [
     "//platform/credential-store",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/external-process-auth-helper",
     "//plugins/git4idea:vcs-git",
@@ -86,6 +87,7 @@ jvm_library(
   associates = [":vcs-github"],
   deps = [
     "//platform/credential-store",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/external-process-auth-helper",
     "//platform/external-process-auth-helper:external-process-auth-helper_test_lib",
diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml
index dc844bedb0b6..b5413c646df1 100644
--- a/plugins/github/github-core/intellij.vcs.github.iml
+++ b/plugins/github/github-core/intellij.vcs.github.iml
@@ -34,6 +34,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.externalProcessAuthHelper" />
     <orderEntry type="module" module-name="intellij.vcs.git" />
diff --git a/plugins/hg4idea/BUILD.bazel b/plugins/hg4idea/BUILD.bazel
index 6759be61c42e..af6e80e99cb0 100644
--- a/plugins/hg4idea/BUILD.bazel
+++ b/plugins/hg4idea/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//platform/credential-store",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/platform-api:ide",
     "//platform/vcs-impl",
@@ -44,6 +45,7 @@ jvm_library(
   deps = [
     "//platform/credential-store",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/lvcs-api:lvcs",
     "//platform/vcs-api:vcs",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
diff --git a/plugins/hg4idea/intellij.vcs.hg.iml b/plugins/hg4idea/intellij.vcs.hg.iml
index c47b040e581d..d497a049ec96 100644
--- a/plugins/hg4idea/intellij.vcs.hg.iml
+++ b/plugins/hg4idea/intellij.vcs.hg.iml
@@ -11,6 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
diff --git a/plugins/kotlin/jvm/shared/BUILD.bazel b/plugins/kotlin/jvm/shared/BUILD.bazel
index 4df23a59474f..2b1e914a464c 100644
--- a/plugins/kotlin/jvm/shared/BUILD.bazel
+++ b/plugins/kotlin/jvm/shared/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "//jps/model-api:model",
+    "//platform/lvcs-api:lvcs",
     "//platform/util/jdom",
     "@lib//:gson",
     "@lib//:kotlinc-kotlin-compiler-common",
diff --git a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
index de5d53740a1d..ae29d4b1d654 100644
--- a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
+++ b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
@@ -26,6 +26,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />