diff --git a/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java b/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java
index 88c4c1e9a..6631761d8 100644
--- a/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java
+++ b/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java
@@ -8,7 +8,6 @@
 package de.gebit.integrity.scoping;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.util.IAcceptor;
@@ -16,7 +15,8 @@
 import de.gebit.integrity.utils.IntegrityDSLUtil;
 
 /**
- * Custom {@link IDefaultResourceDescriptionStrategy} implementation which filters out private stuff.
+ * Custom {@link org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy} implementation which filters out
+ * private stuff.
  *
  * @author Rene Schneider - initial API and implementation
  *
diff --git a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java
index 9c10fad47..262e2a603 100644
--- a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java
+++ b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java
@@ -33,7 +33,6 @@
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.xtext.resource.IResourceFactory;
 import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.resource.XtextResourceFactory;
 import org.eclipse.xtext.resource.XtextResourceSet;
 
 import com.google.inject.Inject;
@@ -392,8 +391,9 @@ public List<Diagnostic> call() throws Exception {
 	}
 
 	/**
-	 * This sync object is used to synchronize access to {@link XtextResourceFactory}, {@link XtextResource} and
-	 * {@link XtextResourceSet}. I'm not sure if those are parallelizable, so better be safe than sorry.
+	 * This sync object is used to synchronize access to {@link org.eclipse.xtext.resource.XtextResourceFactory},
+	 * {@link XtextResource} and {@link XtextResourceSet}. I'm not sure if those are parallelizable, so better be safe
+	 * than sorry.
 	 */
 	protected Object resourceLoadingSyncObject = new Object();
 
diff --git a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/providers/FilesystemArchiveTestResourceProvider.java b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/providers/FilesystemArchiveTestResourceProvider.java
index f5b3f481f..010437b16 100644
--- a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/providers/FilesystemArchiveTestResourceProvider.java
+++ b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/providers/FilesystemArchiveTestResourceProvider.java
@@ -11,13 +11,11 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import de.gebit.integrity.providers.TestResourceProvider;
-
 /**
- * This is a compound {@link TestResourceProvider}, able to read Integrity scripts directly from the file system, within
- * a directory on the filesystem, and within archive files (and archives within archives). It wraps a
- * {@link FilesystemTestResourceProvider} and an {@link ArchiveTestResourceProvider}, which provide the actual
- * functionality.
+ * This is a compound {@link de.gebit.integrity.providers.TestResourceProvider}, able to read Integrity scripts directly
+ * from the file system, within a directory on the filesystem, and within archive files (and archives within archives).
+ * It wraps a {@link FilesystemTestResourceProvider} and an {@link ArchiveTestResourceProvider}, which provide the
+ * actual functionality.
  * 
  * @author Rene Schneider - initial API and implementation
  *