diff --git a/.idea/anchors.xml b/.idea/anchors.xml
new file mode 100644
index 000000000000..3117cdb9f670
--- /dev/null
+++ b/.idea/anchors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinIdeAnchorService">
+    <option name="moduleNameToAnchorName">
+      <map>
+        <entry key="kotlin-plugin-android-compile-deps" value="intellij.tools.dependencies.kotlin" />
+      </map>
+    </option>
+  </component>
+  <component name="LibraryToSourceAnalysisState">
+    <option name="isEnabled" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 525b40778a7f..aadd0c586220 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -796,6 +796,7 @@
       <module fileurl="file://$PROJECT_DIR$/build/dependencies/intellij.tools.dependencies.iml" filepath="$PROJECT_DIR$/build/dependencies/intellij.tools.dependencies.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/dependencies/androidSdkUpload/intellij.tools.dependencies.androidSdkUpload.iml" filepath="$PROJECT_DIR$/build/dependencies/androidSdkUpload/intellij.tools.dependencies.androidSdkUpload.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/dependencies/gradle-api-deps/intellij.tools.dependencies.gradle.iml" filepath="$PROJECT_DIR$/build/dependencies/gradle-api-deps/intellij.tools.dependencies.gradle.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/dependencies/kotlin-deps/intellij.tools.dependencies.kotlin.iml" filepath="$PROJECT_DIR$/build/dependencies/kotlin-deps/intellij.tools.dependencies.kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/index-tools/intellij.tools.index.iml" filepath="$PROJECT_DIR$/tools/index-tools/intellij.tools.index.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/antLayout/intellij.tools.jps.antTasks.iml" filepath="$PROJECT_DIR$/jps/antLayout/intellij.tools.jps.antTasks.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/standalone-builder/intellij.tools.jps.build.standalone.iml" filepath="$PROJECT_DIR$/jps/standalone-builder/intellij.tools.jps.build.standalone.iml" />
diff --git a/build/dependencies/kotlin-deps/intellij.tools.dependencies.kotlin.iml b/build/dependencies/kotlin-deps/intellij.tools.dependencies.kotlin.iml
new file mode 100644
index 000000000000..9684314f81ee
--- /dev/null
+++ b/build/dependencies/kotlin-deps/intellij.tools.dependencies.kotlin.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/build/dependencies/kotlin-deps/src/.gitkeep b/build/dependencies/kotlin-deps/src/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1