diff --git a/.idea/libraries/github_oshi_core.xml b/.idea/libraries/github_oshi_core.xml
new file mode 100644
index 000000000000..32af160d30a0
--- /dev/null
+++ b/.idea/libraries/github_oshi_core.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="github.oshi.core" type="repository">
+    <properties include-transitive-deps="false" maven-id="com.github.oshi:oshi-core:6.8.2">
+      <verification>
+        <artifact url="file://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar">
+          <sha256sum>9403c2537ac0dd425e556dfc3434e5d9f9a9547312472f4c27b7ab2673e9e862</sha256sum>
+        </artifact>
+      </verification>
+    </properties>
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
index d73c95e07987..c996e58e3c6c 100644
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -1597,6 +1597,13 @@ jvm_import(
   visibility = ["//visibility:public"]
 )
 
+jvm_import(
+  name = "github-oshi-core",
+  jar = "@com_github_oshi-oshi-core-6_8_2_http//file",
+  source_jar = "@com_github_oshi-oshi-core-6_8_2_http//file",
+  visibility = ["//visibility:public"]
+)
+
 java_library(
   name = "google-baksmali",
   exports = [
@@ -8503,13 +8510,6 @@ jvm_import(
   source_jar = "@com_soywiz_korlibs_krypto-krypto-jvm-4_0_10_http//file"
 )
 
-jvm_import(
-  name = "performance_testing-github-oshi-core",
-  jar = "@com_github_oshi-oshi-core-6_8_2_http//file",
-  source_jar = "@com_github_oshi-oshi-core-6_8_2_http//file",
-  visibility = ["//visibility:public"]
-)
-
 java_library(
   name = "platform-build_scripts-code_optimizer-proguard",
   exports = [
diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel
index 1adf87fda600..7bd10925473f 100644
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -2057,6 +2057,20 @@ http_file(
   downloaded_file_path = "git-learning-project-212.0.2.jar"
 )
 
+http_file(
+  name = "com_github_oshi-oshi-core-6_8_2_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar",
+  sha256 = "9403c2537ac0dd425e556dfc3434e5d9f9a9547312472f4c27b7ab2673e9e862",
+  downloaded_file_path = "oshi-core-6.8.2.jar"
+)
+
+http_file(
+  name = "com_github_oshi-oshi-core-6_8_2-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2-sources.jar",
+  sha256 = "70ff1b508309bbc8aa0b383d6a0f528b71e17886943de71fec8a8a5f20c54aef",
+  downloaded_file_path = "oshi-core-6.8.2-sources.jar"
+)
+
 http_file(
   name = "com_android_tools_smali-smali-baksmali-3_0_3_http",
   url = "https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2/com/android/tools/smali/smali-baksmali/3.0.3/smali-baksmali-3.0.3.jar",
@@ -12228,20 +12242,6 @@ http_file(
   downloaded_file_path = "krypto-jvm-4.0.10-sources.jar"
 )
 
-http_file(
-  name = "com_github_oshi-oshi-core-6_8_2_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar",
-  sha256 = "9403c2537ac0dd425e556dfc3434e5d9f9a9547312472f4c27b7ab2673e9e862",
-  downloaded_file_path = "oshi-core-6.8.2.jar"
-)
-
-http_file(
-  name = "com_github_oshi-oshi-core-6_8_2-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2-sources.jar",
-  sha256 = "70ff1b508309bbc8aa0b383d6a0f528b71e17886943de71fec8a8a5f20c54aef",
-  downloaded_file_path = "oshi-core-6.8.2-sources.jar"
-)
-
 http_file(
   name = "com_guardsquare-proguard-base-7_6_1_http",
   url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/guardsquare/proguard-base/7.6.1/proguard-base-7.6.1.jar",
diff --git a/plugins/performanceTesting/core/BUILD.bazel b/plugins/performanceTesting/core/BUILD.bazel
index 7593a6148dc5..80f70d26230f 100644
--- a/plugins/performanceTesting/core/BUILD.bazel
+++ b/plugins/performanceTesting/core/BUILD.bazel
@@ -46,7 +46,6 @@ jvm_library(
     "//platform/statistics",
     "//platform/execution-impl",
     "//platform/platform-impl/internal",
-    "@lib//:performance_testing-github-oshi-core",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "@lib//:kotlinx-coroutines-core",
@@ -66,6 +65,7 @@ jvm_library(
     "//plugins/performanceTesting/event-bus:tools-ide-starter-bus",
     "//platform/eel-provider",
     "@lib//:jbr-api",
+    "@lib//:github-oshi-core",
     ":libraries_cli-parser_provided",
   ]
 )
@@ -108,7 +108,6 @@ jvm_library(
     "//platform/statistics:statistics_test_lib",
     "//platform/execution-impl",
     "//platform/platform-impl/internal",
-    "@lib//:performance_testing-github-oshi-core",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "@lib//:kotlinx-coroutines-core",
@@ -132,6 +131,7 @@ jvm_library(
     "//plugins/performanceTesting/event-bus:tools-ide-starter-bus_test_lib",
     "//platform/eel-provider",
     "@lib//:jbr-api",
+    "@lib//:github-oshi-core",
   ]
 )
 ### auto-generated section `build intellij.performanceTesting` end
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
index 7f121e7f73d2..ee8612989354 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -38,29 +38,6 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" />
-    <orderEntry type="module-library">
-      <library name="github.oshi.core" type="repository">
-        <properties maven-id="com.github.oshi:oshi-core:6.8.2">
-          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar">
-              <sha256sum>9403c2537ac0dd425e556dfc3434e5d9f9a9547312472f4c27b7ab2673e9e862</sha256sum>
-            </artifact>
-          </verification>
-          <exclude>
-            <dependency maven-id="net.java.dev.jna:jna-platform" />
-            <dependency maven-id="net.java.dev.jna:jna" />
-            <dependency maven-id="org.slf4j:slf4j-api" />
-          </exclude>
-        </properties>
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.8.2/oshi-core-6.8.2-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
@@ -80,5 +57,6 @@
     <orderEntry type="module" module-name="intellij.tools.ide.starter.bus" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
     <orderEntry type="library" name="jbr-api" level="project" />
+    <orderEntry type="library" name="github.oshi.core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/core/plugin-content.yaml b/plugins/performanceTesting/core/plugin-content.yaml
index 49d2675b1a4a..3ec21ce9332f 100644
--- a/plugins/performanceTesting/core/plugin-content.yaml
+++ b/plugins/performanceTesting/core/plugin-content.yaml
@@ -10,9 +10,9 @@
   reason: <- intellij.performanceTesting.remoteDriver
 - name: lib/github.oshi.core.jar
   library: github.oshi.core
-  module: intellij.performanceTesting
   files:
   - name: $MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6/oshi-core-6.jar
+  reason: <- intellij.performanceTesting
 - name: lib/modules/intellij.performanceTesting.frontend.jar
   contentModules:
   - name: intellij.performanceTesting.frontend