diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
index 54d3aa687..c47049b5d 100644
--- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -126,7 +126,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.common,
  org.eclipse.xtend;bundle-version="1.1.0";resolution:=optional,
  org.eclipse.xtend.typesystem.emf;bundle-version="1.0.1";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="3.5.0";resolution:=optional
+ org.eclipse.core.runtime;bundle-version="3.5.0";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="3.5.0";resolution:=optional
 Import-Package: org.apache.log4j;version="1.2.15"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.xtext.internal.Activator
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IDerivedResourceMarkers.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IDerivedResourceMarkers.java
new file mode 100644
index 000000000..d6e01ec3d
--- /dev/null
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IDerivedResourceMarkers.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2012 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.generator;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author Sebastian Zarnekow - Initial contribution and API
+ * @since 2.3
+ */
+public interface IDerivedResourceMarkers {
+
+	boolean installMarker(IFile file, String source) throws CoreException;
+
+	String getSource(IMarker marker);
+
+	IMarker findDerivedResourceMarker(IFile file, String source) throws CoreException;
+
+	IMarker[] findDerivedResourceMarkers(IFile file) throws CoreException;
+
+	List<IFile> findDerivedResources(IContainer container, String source) throws CoreException;
+
+}
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java
index b721703ed..3eb5c57de 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.validation.IResourceValidator;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
 
 /**
  * An {@link IResourceServiceProvider} for non-Xtext resources. 
@@ -62,7 +63,10 @@ public class GenericResourceServiceProvider implements IResourceServiceProvider
 		return encodingProvider;
 	}
 	
+	@Inject
+	private Injector injector;
+	
 	public <T> T get(Class<T> t) {
-		return null;
+		return injector.getInstance(t);
 	}
 }