diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index d0c74e91a3b..2da8b73f47c 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -31,31 +31,41 @@ BuildCacheKt.setupBuildCache(settings)
 
 include "prepare-deps"
 
-if (buildProperties.includeCidrPlugins) {
-    logger.info("Including CIDR modules in buildSrc/settings.gradle")
+def target_AppCode_Clion = buildProperties.includeCidrPlugins && !projectVersions.contains("versions.androidStudioRelease")
+def target_AndroidStudio = buildProperties.includeCidrPlugins && projectVersions.contains("versions.androidStudioRelease")
+def target_IdeaUltimate = buildProperties.includeUltimate
+
+if (target_AppCode_Clion) {
+    logger.info("Including modules for AC and CL in buildSrc/settings.gradle")
+
     include ":prepare-deps:kotlin-native-platform-deps"
+
     project(":prepare-deps:kotlin-native-platform-deps").projectDir =
             file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps")
-    if (projectVersions.contains("versions.androidStudioRelease")) {
-        logger.info("Including Mobile MPP modules in buildSrc/settings.gradle")
-        include ":prepare-deps:cocoa-common-binaries"
-        project(":prepare-deps:cocoa-common-binaries").projectDir =
-                file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/cocoa-common-binaries")
-    } else {
-        logger.info("NOT including Mobile MPP modules in buildSrc/settings.gradle")
-    }
-} else {
-    logger.info("NOT including CIDR modules in buildSrc/settings.gradle")
-}
+} else if (target_AndroidStudio) {
+    logger.info("Including modules for AS (mobile plugin) in buildSrc/settings.gradle")
+
+    include ":prepare-deps:cocoa-common-binaries"
+    include ":prepare-deps:lldb-framework"
+    include ":prepare-deps:lldb-frontend"
+
+    project(":prepare-deps:cocoa-common-binaries").projectDir =
+            file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/cocoa-common-binaries")
+    project(":prepare-deps:lldb-framework").projectDir =
+            file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-framework")
+    project(":prepare-deps:lldb-frontend").projectDir =
+            file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend")
+} else if (target_IdeaUltimate) {
+    logger.info("Including modules for IU in buildSrc/settings.gradle")
 
-if (buildProperties.includeUltimate) {
-    logger.info("Including extension for IJ Ultimate in buildSrc/settings.gradle")
     include ":prepare-deps:lldb-frontend"
     include ":prepare-deps:native-debug-plugin"
+
     project(":prepare-deps:lldb-frontend").projectDir =
             file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend")
     project(":prepare-deps:native-debug-plugin").projectDir =
             file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/native-debug-plugin")
+
 } else {
-    logger.info("Not including extension for IJ Ultimate in buildSrc/settings.gradle")
-}
+    logger.info("Not including extra modules in buildSrc/settings.gradle")
+}
\ No newline at end of file