diff --git a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
index 2869a6d..91fdf13 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
@@ -15,16 +15,16 @@
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.util,
  org.antlr.runtime,
- org.eclipse.xtext.xbase,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase;visibility:=reexport,
+ org.eclipse.xtext.common.types;visibility:=reexport,
+ org.eclipse.xtext.xbase.lib;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.xtext.ecore,
- org.eclipse.emf.ecore.xcore.lib,
- org.eclipse.emf.codegen.ecore.xtext
+ org.eclipse.xtext.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xcore.lib;visibility:=reexport,
+ org.eclipse.emf.codegen.ecore.xtext;visibility:=reexport
 Import-Package: org.apache.log4j,
  org.apache.commons.logging,
  org.eclipse.xtext.xbase.lib
diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/XcoreRuntimeModule.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/XcoreRuntimeModule.java
index d434b92..7d19dad 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/XcoreRuntimeModule.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/XcoreRuntimeModule.java
@@ -210,6 +210,7 @@
 
   @SuppressWarnings("deprecation")
   @SingletonBinding(eager=true)
+  @Override
   public Class<? extends org.eclipse.xtext.xbase.scoping.featurecalls.StaticImplicitMethodsFeatureForTypeProvider.ExtensionClassNameProvider> 
     bindStaticImplicitMethodsFeatureForTypeProvider$ExtensionClassNameProvider()
   {