diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index bb3b31dd8..f906aefc5 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -48,5 +48,6 @@ Export-Package: com.avaloq.tools.ddk.check,
  com.avaloq.tools.ddk.check.util,
  com.avaloq.tools.ddk.check.validation
 Import-Package: org.eclipse.jdt.internal.ui.text,
- org.apache.logging.log4j
+ org.apache.logging.log4j,
+ org.apache.log4j
 Automatic-Module-Name: com.avaloq.tools.ddk.check.core
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/internal/CheckActivator.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/internal/CheckActivator.java
index 92269abd3..69413efd4 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/internal/CheckActivator.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/internal/CheckActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.check.CheckRuntimeModule;
 import com.avaloq.tools.ddk.check.ui.CheckUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class CheckActivator extends AbstractUIPlugin {
 	
 	private static CheckActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/internal/CheckcfgActivator.java b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/internal/CheckcfgActivator.java
index 4a98c64b3..5a9b81ea9 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/internal/CheckcfgActivator.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/internal/CheckcfgActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.checkcfg.CheckCfgRuntimeModule;
 import com.avaloq.tools.ddk.checkcfg.ui.CheckCfgUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class CheckcfgActivator extends AbstractUIPlugin {
 	
 	private static CheckcfgActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
index ad0e8a081..d66b7e32c 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
@@ -109,7 +109,7 @@ Workflow {
       }
       code = {
         encoding = "UTF-8"
-        lineDelimiter = "\r\n"
+        lineDelimiter = "\n"
         fileHeader = "/*\n * generated by Xtext\n */"
         preferXtendStubs = false
       }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
index 0af1514f8..9731d4e6f 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
@@ -90,7 +90,7 @@ Workflow {
           }
           code = {
             encoding = "UTF-8"
-            lineDelimiter = "\r\n"
+            lineDelimiter = "\n"
             fileHeader = "/*\n * generated by Xtext\n */"
             preferXtendStubs = false
           }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
index 12c077344..038a37d7c 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
@@ -78,7 +78,7 @@ Workflow {
           }
           code = {
             encoding = "UTF-8"
-            lineDelimiter = "\r\n"
+            lineDelimiter = "\n"
             fileHeader = "/*\n * generated by Xtext\n */"
             preferXtendStubs = false
           }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
index fc08c4ef1..c47f886b4 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
@@ -54,7 +54,7 @@ Workflow {
       }
       code = {
         encoding = "UTF-8"
-        lineDelimiter = "\r\n"
+        lineDelimiter = "\n"
         fileHeader = "/*\n * generated by Xtext\n */"
       }
     }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2
index c12c4dbc8..3703fe345 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2
@@ -41,7 +41,7 @@ Workflow {
       }
       code = {
         encoding = "UTF-8"
-        lineDelimiter = "\r\n"
+        lineDelimiter = "\n"
         fileHeader = "/*\n * generated by Xtext\n */"
       }
     }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
index 04d8f70a5..006a2ea70 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
@@ -90,7 +90,7 @@ Workflow {
           }
           code = {
             encoding = "UTF-8"
-            lineDelimiter = "\r\n"
+            lineDelimiter = "\n"
             fileHeader = "/*\n * generated by Xtext\n */"
             preferXtendStubs = false
           }
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2
index 9c503789f..6bf233e44 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2
@@ -90,7 +90,7 @@ Workflow {
           }
           code = {
             encoding = "UTF-8"
-            lineDelimiter = "\r\n"
+            lineDelimiter = "\n"
             fileHeader = "/*\n * generated by Xtext\n */"
             preferXtendStubs = false
           }
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/internal/ExportActivator.java b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/internal/ExportActivator.java
index 42a9452b1..8fa387a52 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/internal/ExportActivator.java
+++ b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/internal/ExportActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.xtext.export.ExportRuntimeModule;
 import com.avaloq.tools.ddk.xtext.export.ui.ExportUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class ExportActivator extends AbstractUIPlugin {
 	
 	private static ExportActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 0581e640d..91835f841 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -38,4 +38,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.export,
  com.avaloq.tools.ddk.xtext.export.serializer,
  com.avaloq.tools.ddk.xtext.export.generator
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.export
-
+Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/internal/ExpressionActivator.java b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/internal/ExpressionActivator.java
index 74eb08796..04fe26d6e 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/internal/ExpressionActivator.java
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/internal/ExpressionActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.xtext.expression.ExpressionRuntimeModule;
 import com.avaloq.tools.ddk.xtext.expression.ui.ExpressionUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class ExpressionActivator extends AbstractUIPlugin {
 	
 	private static ExpressionActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index f98107ec3..c991b27f8 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
-Import-Package: org.apache.logging.log4j
+Import-Package: org.apache.logging.log4j,
+ org.apache.log4j
 Export-Package: com.avaloq.tools.ddk.xtext.expression,
  com.avaloq.tools.ddk.xtext.expression.conversion,
  com.avaloq.tools.ddk.xtext.expression.expression,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/internal/FormatActivator.java b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/internal/FormatActivator.java
index ee2fda75e..1ff30d19b 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/internal/FormatActivator.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/internal/FormatActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.xtext.format.FormatRuntimeModule;
 import com.avaloq.tools.ddk.xtext.format.ui.FormatUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class FormatActivator extends AbstractUIPlugin {
 	
 	private static FormatActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.xtext.format/model/generated/Format.genmodel b/com.avaloq.tools.ddk.xtext.format/model/generated/Format.genmodel
index 678193360..336bfe7d2 100644
--- a/com.avaloq.tools.ddk.xtext.format/model/generated/Format.genmodel
+++ b/com.avaloq.tools.ddk.xtext.format/model/generated/Format.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/com.avaloq.tools.ddk.xtext.format/src-gen"
     modelPluginID="com.avaloq.tools.ddk.xtext.format" forceOverwrite="true" modelName="Format"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
+    complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
   <genPackages prefix="Format" basePackage="com.avaloq.tools.ddk.xtext.format" disposableProviderFactory="true"
       fileExtensions="format" ecorePackage="Format.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Format.ecore#//MatcherType">
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/internal/ScopeActivator.java b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/internal/ScopeActivator.java
index 523a3391c..7f5afa7d8 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/internal/ScopeActivator.java
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/internal/ScopeActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.xtext.scope.ScopeRuntimeModule;
 import com.avaloq.tools.ddk.xtext.scope.ui.ScopeUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class ScopeActivator extends AbstractUIPlugin {
 	
 	private static ScopeActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index c620290d6..4e2568a11 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib
-Import-Package: org.apache.logging.log4j
+Import-Package: org.apache.logging.log4j,
+ org.apache.log4j
 Export-Package: com.avaloq.tools.ddk.xtext.scope,
  com.avaloq.tools.ddk.xtext.scope.parser.antlr,
  com.avaloq.tools.ddk.xtext.scope.parser.antlr.internal,
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
index 2219e00a3..0ee30a8c2 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/com.avaloq.tools.ddk.xtext.test/src-gen"
     modelPluginID="com.avaloq.tools.ddk.xtext.test" forceOverwrite="true" modelName="FormatterTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="FormatterTestLanguage" basePackage="com.avaloq.tools.ddk.xtext.formatter"
       disposableProviderFactory="true" fileExtensions="mydsl" ecorePackage="FormatterTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="FormatterTestLanguage.ecore#//Enum1">
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageRuntimeModule.xtend b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageRuntimeModule.xtend
new file mode 100644
index 000000000..d73565513
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageRuntimeModule.xtend
@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.xtext.formatter
+
+
+/**
+ * Use this class to register components to be used at runtime / without the Equinox extension registry.
+ */
+class FormatterTestLanguageRuntimeModule extends AbstractFormatterTestLanguageRuntimeModule {
+}
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetup.xtend b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetup.xtend
new file mode 100644
index 000000000..b0ccd5747
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetup.xtend
@@ -0,0 +1,15 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.xtext.formatter
+
+
+/**
+ * Initialization support for running Xtext languages without Equinox extension registry.
+ */
+class FormatterTestLanguageStandaloneSetup extends FormatterTestLanguageStandaloneSetupGenerated {
+
+	def static void doSetup() {
+		new FormatterTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration()
+	}
+}
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSemanticSequencer.xtend b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSemanticSequencer.xtend
new file mode 100644
index 000000000..747a680f4
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSemanticSequencer.xtend
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.xtext.formatter.serializer
+
+
+class FormatterTestLanguageSemanticSequencer extends AbstractFormatterTestLanguageSemanticSequencer {
+}
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSyntacticSequencer.xtend b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSyntacticSequencer.xtend
new file mode 100644
index 000000000..e4ad5c344
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/serializer/FormatterTestLanguageSyntacticSequencer.xtend
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.xtext.formatter.serializer
+
+
+class FormatterTestLanguageSyntacticSequencer extends AbstractFormatterTestLanguageSyntacticSequencer {
+}
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/internal/ValidActivator.java b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/internal/ValidActivator.java
index 3c8613842..b92215eaf 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/internal/ValidActivator.java
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/internal/ValidActivator.java
@@ -5,10 +5,10 @@
 
 import com.avaloq.tools.ddk.xtext.valid.ValidRuntimeModule;
 import com.avaloq.tools.ddk.xtext.valid.ui.ValidUiModule;
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class ValidActivator extends AbstractUIPlugin {
 	
 	private static ValidActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index a7134e64a..fadd27449 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.valid,
  com.avaloq.tools.ddk.xtext.valid.formatting,
  com.avaloq.tools.ddk.xtext.valid.serializer
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.valid
+Import-Package: org.apache.log4j
diff --git a/ddk-configuration/.settings/org.eclipse.core.runtime.prefs b/ddk-configuration/.settings/org.eclipse.core.runtime.prefs
index de53b9e7b..6e9dbe8f3 100644
--- a/ddk-configuration/.settings/org.eclipse.core.runtime.prefs
+++ b/ddk-configuration/.settings/org.eclipse.core.runtime.prefs
@@ -1,3 +1,3 @@
 #Thu Nov 18 13:45:58 CET 2010
 eclipse.preferences.version=1
-line.separator=\r\n
+line.separator=\n