diff --git a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
index 5ea94427143..6be66165d4d 100644
--- a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
+++ b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     api(project(":compiler:psi"))
     api(project(":analysis:decompiled:decompiler-to-psi"))
     api(project(":analysis:light-classes-base"))
+    api(project(":analysis:analysis-api-providers"))
     implementation(intellijCore())
 }
 
diff --git a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
index c59a9a7407e..4dc1f3707b4 100644
--- a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
+++ b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NonNls
 import org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.LightMemberOriginForCompiledField
 import org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.LightMemberOriginForCompiledMethod
 import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
-import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
+import org.jetbrains.kotlin.analysis.providers.createAllLibrariesModificationTracker
 import org.jetbrains.kotlin.asJava.classes.ClassInnerStuffCache
 import org.jetbrains.kotlin.asJava.classes.getEnumEntriesPsiMethod
 import org.jetbrains.kotlin.asJava.classes.lazyPub
@@ -36,7 +36,7 @@ open class KtLightClassForDecompiledDeclaration(
         ClassInnerStuffCache(
             /* aClass = */ this,
             /* generateEnumMethods = */ true,
-            /* modificationTracker = */ KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker,
+            /* modificationTracker = */ project.createAllLibrariesModificationTracker(),
         )
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c13306b94ef..4a5008b5a1d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,6 +150,8 @@ val commonCompilerModules = arrayOf(
     ":analysis:decompiled:decompiler-to-file-stubs",
     ":analysis:decompiled:decompiler-to-psi",
     ":analysis:decompiled:light-classes-for-decompiled",
+    ":analysis:analysis-api-providers",
+    ":analysis:project-structure",
     ":analysis:kt-references",
 ).also { extra["commonCompilerModules"] = it }