diff --git a/plugins/org.eclipse.xtext.xtext.generator/build.gradle b/plugins/org.eclipse.xtext.xtext.generator/build.gradle
index 445098022..eb3682312 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/build.gradle
+++ b/plugins/org.eclipse.xtext.xtext.generator/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 	compile "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
 	compile "org.eclipse.emf:org.eclipse.emf.mwe2.lib:$versions.emfMwe2"
 	compile "com.ibm.icu:icu4j:$versions.icu"
+	optional "org.eclipse.jdt:org.eclipse.jdt.core:3.10.0"
 }
diff --git a/separate-builds/core/build.gradle b/separate-builds/core/build.gradle
index ba5ec759b..7b5ed9861 100644
--- a/separate-builds/core/build.gradle
+++ b/separate-builds/core/build.gradle
@@ -7,6 +7,7 @@ subprojects {
 	}
 	
 	apply plugin: 'java'
+	apply plugin: 'eclipse'
 	apply plugin: 'maven'
 	apply from: "${rootDir}/gradle/versions.gradle"
 	apply from: "${rootDir}/gradle/eclipse-project-layout.gradle"
diff --git a/separate-builds/core/gradle/java-compiler-settings.gradle b/separate-builds/core/gradle/java-compiler-settings.gradle
index dd2a8469c..432f691ae 100644
--- a/separate-builds/core/gradle/java-compiler-settings.gradle
+++ b/separate-builds/core/gradle/java-compiler-settings.gradle
@@ -22,3 +22,6 @@ configurations {
 }
 
 sourceSets.main.compileClasspath += configurations.optional
+eclipse.classpath.plusConfigurations += [configurations.optional]
+javadoc.classpath += configurations.optional
+javadoc.options.addStringOption('-Xdoclint:none')
\ No newline at end of file