diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel
index 77746e9467b2..c1e94c04732b 100644
--- a/java/java-impl-refactorings/BUILD.bazel
+++ b/java/java-impl-refactorings/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//platform/diff-impl",
     "//platform/util/jdom",
     "//platform/core-ui",
+    "//java/codeserver/core:java-codeserver-core",
   ]
 )
 ### auto-generated section `build intellij.java.impl.refactorings` end
\ No newline at end of file
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index c50485b84a51..c413f7b58ae2 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -118,6 +118,7 @@ jvm_library(
     "//platform/searchEverywhere/shared:searchEverywhere",
     "//platform/searchEverywhere/testFramework",
     "//java/codeserver/highlighting:java-codeserver-highlighting",
+    "//java/codeserver/core:java-codeserver-core",
   ],
   runtime_deps = [
     "//community-resources:customization",
diff --git a/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel
index d6283e1748f7..55a57b613ade 100644
--- a/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel
+++ b/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel
@@ -1,6 +1,5 @@
 ### auto-generated section `build intellij.compose.ide.plugin.k1` start
-load("@rules_java//java:defs.bzl", "java_library")
-load("@rules_jvm//:jvm.bzl", "jvm_resources")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
 
 jvm_resources(
   name = "ide-plugin-k1_resources",
@@ -8,14 +7,28 @@ jvm_resources(
   strip_prefix = "resources"
 )
 
-java_library(
+jvm_library(
   name = "ide-plugin-k1",
+  module_name = "intellij.compose.ide.plugin.k1",
   visibility = ["//visibility:public"],
-  runtime_deps = [
-    ":ide-plugin-k1_resources",
+  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
+  deps = [
     "@lib//:kotlin-stdlib",
     "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared",
-  ]
+    "//platform/core-api:core",
+    "//platform/analysis-api:analysis",
+    "//platform/util",
+    "@lib//:kotlinc-kotlin-compiler-common-provided",
+    "//plugins/kotlin/base/fe10/code-insight:kotlin-base-fe10-code-insight",
+    "//plugins/kotlin/base/fe10/analysis:kotlin-base-fe10-analysis",
+    "//platform/core-impl",
+    "//java/java-psi-api:psi",
+    "@lib//:kotlinc-kotlin-compiler-fe10-provided",
+    "//plugins/kotlin/base/analysis:kotlin-base-analysis",
+    "//platform/editor-ui-api:editor-ui",
+    "//plugins/kotlin/completion/impl-k1:kotlin-completion-impl-k1",
+  ],
+  runtime_deps = [":ide-plugin-k1_resources"]
 )
 ### auto-generated section `build intellij.compose.ide.plugin.k1` end
 
@@ -37,6 +50,8 @@ jvm_test(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/testFramework/core",
+    "@lib//:kotlin-test-assertions-core-jvm",
+    "@lib//:kotlinc-kotlin-compiler-common-provided",
   ],
   runtime_deps = ["//plugins/compose/intellij.compose.ide.plugin.k1:ide-plugin-k1"]
 )
diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel
index 670e9e4e1fd9..23b1b2c29e57 100644
--- a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel
+++ b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel
@@ -26,6 +26,10 @@ jvm_library(
     "//platform/analysis-impl",
     "@lib//:kotlinc-kotlin-compiler-common-provided",
     "@lib//:kotlinc-analysis-api-provided",
+    "//platform/util",
+    "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-api-utils",
+    "//java/java-psi-api:psi",
+    "//plugins/kotlin/completion/impl-k2:kotlin-completion-impl-k2",
   ],
   runtime_deps = [":ide-plugin-k2_resources"]
 )
@@ -61,6 +65,7 @@ jvm_test(
     "//platform/testFramework/core",
     "@lib//:kotlinc-kotlin-compiler-common-provided",
     "@lib//:kotlinc-analysis-api-provided",
+    "@lib//:kotlin-test-assertions-core-jvm",
   ]
 )
 ### auto-generated section `build intellij.compose.ide.plugin.k2.tests` end
\ No newline at end of file
diff --git a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel
index 130d224dff99..01d0eb08db07 100644
--- a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel
+++ b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
     "//plugins/kotlin/base/indices:kotlin-base-indices",
     "@lib//:kotlinc-kotlin-compiler-common-provided",
     "@lib//:kotlinc-analysis-api-provided",
+    "//java/java-psi-api:psi",
   ],
   runtime_deps = [":ide-plugin-shared_resources"]
 )
@@ -58,6 +59,9 @@ jvm_library(
     "@lib//:kotlinc-analysis-api",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
+    "@lib//:kotlin-test-assertions-core-jvm",
+    "@lib//:io-mockk",
+    "@lib//:io-mockk-jvm",
   ]
 )