diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.xtend
index ab8ec8929..d11ce6b08 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.xtend
+++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.xtend
@@ -10,6 +10,7 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide
 import com.google.inject.Guice
 import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageRuntimeModule
 import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageStandaloneSetup
+import org.eclipse.xtext.util.Modules2
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -17,6 +18,6 @@ import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguage
 class PartialContentAssistTestLanguageIdeSetup extends PartialContentAssistTestLanguageStandaloneSetup {
 
 	override createInjector() {
-		Guice.createInjector(new PartialContentAssistTestLanguageRuntimeModule, new PartialContentAssistTestLanguageIdeModule)
+		Guice.createInjector(Modules2.mixin(new PartialContentAssistTestLanguageRuntimeModule, new PartialContentAssistTestLanguageIdeModule))
 	}
 }
diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.java
index 8fd1df5ed..0050cff48 100644
--- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.java
@@ -12,6 +12,7 @@ import com.google.inject.Injector;
 import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageRuntimeModule;
 import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageStandaloneSetup;
 import org.eclipse.xtext.ide.tests.testlanguage.ide.PartialContentAssistTestLanguageIdeModule;
+import org.eclipse.xtext.util.Modules2;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -22,6 +23,6 @@ public class PartialContentAssistTestLanguageIdeSetup extends PartialContentAssi
   public Injector createInjector() {
     PartialContentAssistTestLanguageRuntimeModule _partialContentAssistTestLanguageRuntimeModule = new PartialContentAssistTestLanguageRuntimeModule();
     PartialContentAssistTestLanguageIdeModule _partialContentAssistTestLanguageIdeModule = new PartialContentAssistTestLanguageIdeModule();
-    return Guice.createInjector(_partialContentAssistTestLanguageRuntimeModule, _partialContentAssistTestLanguageIdeModule);
+    return Guice.createInjector(Modules2.mixin(_partialContentAssistTestLanguageRuntimeModule, _partialContentAssistTestLanguageIdeModule));
   }
 }
diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/BeeLangTestLanguageIdeSetup.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/BeeLangTestLanguageIdeSetup.java
index fa48657c6..44d94cada 100644
--- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/BeeLangTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/BeeLangTestLanguageIdeSetup.java
@@ -3,10 +3,12 @@
  */
 package org.eclipse.xtext.testlanguages.backtracking.ide;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import org.eclipse.xtext.testlanguages.backtracking.BeeLangTestLanguageRuntimeModule;
 import org.eclipse.xtext.testlanguages.backtracking.BeeLangTestLanguageStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -15,6 +17,6 @@ public class BeeLangTestLanguageIdeSetup extends BeeLangTestLanguageStandaloneSe
 
 	@Override
 	public Injector createInjector() {
-		return Guice.createInjector(new BeeLangTestLanguageRuntimeModule(), new BeeLangTestLanguageIdeModule());
+		return Guice.createInjector(Modules2.mixin(new BeeLangTestLanguageRuntimeModule(), new BeeLangTestLanguageIdeModule()));
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/ExBeeLangTestLanguageIdeSetup.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/ExBeeLangTestLanguageIdeSetup.java
index ee222b751..03d46e0ec 100644
--- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/ExBeeLangTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/ExBeeLangTestLanguageIdeSetup.java
@@ -7,6 +7,7 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguageRuntimeModule;
 import org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguageStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -15,6 +16,6 @@ public class ExBeeLangTestLanguageIdeSetup extends ExBeeLangTestLanguageStandalo
 
 	@Override
 	public Injector createInjector() {
-		return Guice.createInjector(new ExBeeLangTestLanguageRuntimeModule(), new ExBeeLangTestLanguageIdeModule());
+		return Guice.createInjector(Modules2.mixin(new ExBeeLangTestLanguageRuntimeModule(), new ExBeeLangTestLanguageIdeModule()));
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/SimpleBeeLangTestLanguageIdeSetup.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/SimpleBeeLangTestLanguageIdeSetup.java
index 7ffff6ded..a8d6a7574 100644
--- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/SimpleBeeLangTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/SimpleBeeLangTestLanguageIdeSetup.java
@@ -3,10 +3,12 @@
  */
 package org.eclipse.xtext.testlanguages.backtracking.ide;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguageRuntimeModule;
 import org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguageStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -15,6 +17,6 @@ public class SimpleBeeLangTestLanguageIdeSetup extends SimpleBeeLangTestLanguage
 
 	@Override
 	public Injector createInjector() {
-		return Guice.createInjector(new SimpleBeeLangTestLanguageRuntimeModule(), new SimpleBeeLangTestLanguageIdeModule());
+		return Guice.createInjector(Modules2.mixin(new SimpleBeeLangTestLanguageRuntimeModule(), new SimpleBeeLangTestLanguageIdeModule()));
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/noJdt/ide/NoJdtTestLanguageIdeSetup.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/noJdt/ide/NoJdtTestLanguageIdeSetup.java
index a5dd6f079..fbb65ab46 100644
--- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/noJdt/ide/NoJdtTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/noJdt/ide/NoJdtTestLanguageIdeSetup.java
@@ -7,6 +7,7 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.eclipse.xtext.testlanguages.noJdt.NoJdtTestLanguageRuntimeModule;
 import org.eclipse.xtext.testlanguages.noJdt.NoJdtTestLanguageStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -15,6 +16,6 @@ public class NoJdtTestLanguageIdeSetup extends NoJdtTestLanguageStandaloneSetup
 
 	@Override
 	public Injector createInjector() {
-		return Guice.createInjector(new NoJdtTestLanguageRuntimeModule(), new NoJdtTestLanguageIdeModule());
+		return Guice.createInjector(Modules2.mixin(new NoJdtTestLanguageRuntimeModule(), new NoJdtTestLanguageIdeModule()));
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeSetup.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeSetup.java
index b64b73343..32e91729e 100644
--- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeSetup.java
+++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeSetup.java
@@ -3,10 +3,12 @@
  */
 package org.eclipse.xtext.testlanguages.xtextgrammar.ide;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguageRuntimeModule;
 import org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguageStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension registry.
@@ -15,6 +17,6 @@ public class XtextGrammarTestLanguageIdeSetup extends XtextGrammarTestLanguageSt
 
 	@Override
 	public Injector createInjector() {
-		return Guice.createInjector(new XtextGrammarTestLanguageRuntimeModule(), new XtextGrammarTestLanguageIdeModule());
+		return Guice.createInjector(Modules2.mixin(new XtextGrammarTestLanguageRuntimeModule(), new XtextGrammarTestLanguageIdeModule()));
 	}
 }