diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 4b8c00dd5116..19cd89ba1285 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -25,6 +25,7 @@
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.java.rt" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.jsp.spi" />
     <orderEntry type="module" module-name="intellij.java.execution" />
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index 0893eda15dad..dd958aa718fd 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 4e61e0687437..3c6407fb99d1 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -38,6 +38,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
     <orderEntry type="module" module-name="intellij.platform.workspaceModel.ide" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
index bc41542e2de7..deafe8b90fbe 100644
--- a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
+++ b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
@@ -13,7 +13,8 @@
     <orderEntry type="module" module-name="intellij.platform.remoteServers" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
index 1011e9c03742..3353db8cc152 100644
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.scriptDebugger.backend" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
   </component>
diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index ac98452f40d2..cff93d543c1e 100644
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml
index 682faa825c67..fc77c72d3a2f 100644
--- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml
+++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
diff --git a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
index d61fd85eba63..652f9b6efb02 100644
--- a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
+++ b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
@@ -15,6 +15,7 @@
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 1b489b4ab1b5..7e2e4e839e72 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
     <orderEntry type="library" exported="" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
     <orderEntry type="library" exported="" name="Log4J" level="project" />
diff --git a/platform/testRunner/intellij.platform.testRunner.iml b/platform/testRunner/intellij.platform.testRunner.iml
index 36b3271295ec..c2ba99995105 100644
--- a/platform/testRunner/intellij.platform.testRunner.iml
+++ b/platform/testRunner/intellij.platform.testRunner.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index 30a284d87bae..65564dfd21ff 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -11,6 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml
index a37784530496..caaf500d811f 100644
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -24,6 +24,7 @@
     <orderEntry type="module" module-name="intellij.xml" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.ant.jps" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" />
diff --git a/plugins/configuration-script/intellij.configurationScript.iml b/plugins/configuration-script/intellij.configurationScript.iml
index 64376ce1b171..59ea53326d86 100644
--- a/plugins/configuration-script/intellij.configurationScript.iml
+++ b/plugins/configuration-script/intellij.configurationScript.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.json" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="module" module-name="intellij.yaml" scope="TEST" />
diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml
index 6bdaa1bd1468..8020b4852635 100644
--- a/plugins/coverage-common/intellij.platform.coverage.iml
+++ b/plugins/coverage-common/intellij.platform.coverage.iml
@@ -17,6 +17,7 @@
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
   </component>
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index 108e464094d5..31dcfa3e9cdc 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -24,6 +24,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.vcs.git.rt" />
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="module" module-name="intellij.platform.vcs.dvcs.impl" exported="" />
diff --git a/plugins/sh/intellij.sh.iml b/plugins/sh/intellij.sh.iml
index 1c8f1ef3eecd..80ae02ca6817 100644
--- a/plugins/sh/intellij.sh.iml
+++ b/plugins/sh/intellij.sh.iml
@@ -14,6 +14,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.terminal" />
     <orderEntry type="library" name="pty4j" level="project" />
     <orderEntry type="library" name="gson" level="project" />
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 315b07f26f58..a4f65227a9c2 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -19,7 +19,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="jediterm-pty" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.configurationStore.tests" scope="TEST" />
     <orderEntry type="library" name="winp" level="project" />
   </component>
diff --git a/plugins/xslt-debugger/intellij.xslt.debugger.iml b/plugins/xslt-debugger/intellij.xslt.debugger.iml
index 82cee82e50fb..7d6a207b518d 100644
--- a/plugins/xslt-debugger/intellij.xslt.debugger.iml
+++ b/plugins/xslt-debugger/intellij.xslt.debugger.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.xslt.debugger.engine" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.xml" />
diff --git a/python/ide/impl/intellij.pycharm.community.customization.impl.iml b/python/ide/impl/intellij.pycharm.community.customization.impl.iml
index 7c97511ad85f..a21a493ace19 100644
--- a/python/ide/impl/intellij.pycharm.community.customization.impl.iml
+++ b/python/ide/impl/intellij.pycharm.community.customization.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.python.community.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
     <orderEntry type="library" name="Guava" level="project" />
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index 4102fd4fbf9e..ef26414ba971 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.python.community" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.python.pydev" />
     <orderEntry type="library" name="XmlRPC" level="project" />
diff --git a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
index ad6ac9a7cba6..c929e538b948 100644
--- a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
+++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.python.community.impl" />
     <orderEntry type="library" name="Guava" level="project" />
   </component>
diff --git a/python/python-rest/intellij.python.reStructuredText.iml b/python/python-rest/intellij.python.reStructuredText.iml
index 9b23fcd9a401..77c80dfdece9 100644
--- a/python/python-rest/intellij.python.reStructuredText.iml
+++ b/python/python-rest/intellij.python.reStructuredText.iml
@@ -10,6 +10,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.reStructuredText" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml
index 43fa6ded2610..77fa9f2e45b7 100644
--- a/xml/impl/intellij.xml.impl.iml
+++ b/xml/impl/intellij.xml.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="module-library">
       <library name="XmlBeans" type="repository">