diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_6.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_6.java
index 40132577a97..a4bd7c0b73f 100644
--- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_6.java
+++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_6.java
@@ -19,6 +19,7 @@
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @SuppressWarnings("all")
 public class Case_6 {
@@ -45,6 +46,7 @@ protected Object _transform(final EClass model) {
     return ListExtensions.<ETypeParameter, Object>map(model.getETypeParameters(), _function);
   }
 
+  @XbaseGenerated
   public Object transform(final ENamedElement model) {
     if (model instanceof EClass) {
       return _transform((EClass)model);
diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_9.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_9.java
index 07e5f7cf290..779713e84f0 100644
--- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_9.java
+++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_9.java
@@ -13,6 +13,7 @@
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @SuppressWarnings("all")
 public class Case_9 extends Case_8 {
@@ -50,6 +51,7 @@ public <T1 extends Object> List<List<T1>> foo(final T1 t) {
     return null;
   }
 
+  @XbaseGenerated
   public CharSequence generateTypeRef(final EObject c) {
     if (c instanceof ENamedElement) {
       return _generateTypeRef((ENamedElement)c);
diff --git a/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/JFlexGeneratorFragmentTemplate.java b/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/JFlexGeneratorFragmentTemplate.java
index 279b4a20d42..a196707007f 100644
--- a/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/JFlexGeneratorFragmentTemplate.java
+++ b/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/JFlexGeneratorFragmentTemplate.java
@@ -26,6 +26,7 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.generator.CodeConfig;
 import org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessExtensions;
 import org.eclipse.xtext.xtext.generator.parser.antlr.AntlrGrammarGenUtil;
@@ -230,6 +231,7 @@ protected void _collectTokens(final EObject it, final List<String> known) {
     }
   }
 
+  @XbaseGenerated
   public void collectTokens(final EObject it, final List<String> known) {
     if (it instanceof Keyword) {
       _collectTokens((Keyword)it, known);
diff --git a/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/XtendAntlrGrammarGeneratorHelper.java b/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/XtendAntlrGrammarGeneratorHelper.java
index f26981c1119..9ee1ca9e9f4 100644
--- a/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/XtendAntlrGrammarGeneratorHelper.java
+++ b/org.eclipse.xtend.core/generator-xtend-gen/org/eclipse/xtend/core/parser/XtendAntlrGrammarGeneratorHelper.java
@@ -25,6 +25,7 @@
 import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessExtensions;
 import org.eclipse.xtext.xtext.generator.parser.antlr.AntlrGrammarGenUtil;
 import org.eclipse.xtext.xtext.generator.parser.antlr.AntlrOptions;
@@ -93,6 +94,7 @@ protected void _collectTokens(final EObject it, final Set<String> tokens) {
     it.eContents().forEach(_function);
   }
 
+  @XbaseGenerated
   public void collectTokens(final EObject it, final Set<String> tokens) {
     if (it instanceof Keyword) {
       _collectTokens((Keyword)it, tokens);
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/compiler/MacroAwareStringConcatenation.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/compiler/MacroAwareStringConcatenation.java
index 43e5029686b..f70a4c0d07d 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/compiler/MacroAwareStringConcatenation.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/compiler/MacroAwareStringConcatenation.java
@@ -15,6 +15,7 @@
 import org.eclipse.xtext.common.types.JvmTypeReference;
 import org.eclipse.xtext.xbase.compiler.output.ImportingStringConcatenation;
 import org.eclipse.xtext.xbase.compiler.output.SharedAppendableState;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.typesystem.references.ITypeReferenceOwner;
 import org.eclipse.xtext.xbase.typesystem.references.LightweightTypeReference;
 
@@ -36,6 +37,7 @@ protected String _getStringRepresentation(final JvmTypeDeclarationImpl<?> object
     return this._getStringRepresentation(type);
   }
 
+  @XbaseGenerated
   protected String getStringRepresentation(final Object object) {
     if (object instanceof JvmTypeDeclarationImpl) {
       return _getStringRepresentation((JvmTypeDeclarationImpl<?>)object);
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/RichStringFormatter.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/RichStringFormatter.java
index ea4f50c941d..0181b3fdbfe 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/RichStringFormatter.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/RichStringFormatter.java
@@ -48,6 +48,7 @@
 import org.eclipse.xtext.xbase.lib.ObjectExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * cases to distinguish:
@@ -354,6 +355,7 @@ protected void _format(final RichStringForLoop expr, @Extension final IFormattab
     doc.surround(this._iTextRegionExtensions.regionFor(expr).keyword("ENDFOR"), _function_8);
   }
 
+  @XbaseGenerated
   public void format(final EObject richString, final IFormattableDocument doc) {
     if (richString instanceof RichString) {
       _format((RichString)richString, doc);
@@ -382,6 +384,7 @@ public void format(final EObject richString, final IFormattableDocument doc) {
     }
   }
 
+  @XbaseGenerated
   protected boolean hasSyntaxError(final IEObjectRegion region) {
     if (region instanceof NodeEObjectRegion) {
       return _hasSyntaxError((NodeEObjectRegion)region);
@@ -393,6 +396,7 @@ protected boolean hasSyntaxError(final IEObjectRegion region) {
     }
   }
 
+  @XbaseGenerated
   protected void suppressLineWraps(final Object it) {
     if (it instanceof HiddenRegionReplacer) {
       _suppressLineWraps((HiddenRegionReplacer)it);
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/XtendFormatter.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/XtendFormatter.java
index 020a807888d..11fa87102e2 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/XtendFormatter.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting2/XtendFormatter.java
@@ -74,6 +74,7 @@
 import org.eclipse.xtext.xbase.lib.IntegerRange;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 import org.eclipse.xtext.xtype.XImportDeclaration;
 import org.eclipse.xtext.xtype.XImportSection;
@@ -684,6 +685,7 @@ protected XClosure builder(final List<XExpression> params) {
   }
 
   @Override
+  @XbaseGenerated
   public void format(final Object anonymousClass, final IFormattableDocument format) {
     if (anonymousClass instanceof AnonymousClass) {
       _format((AnonymousClass)anonymousClass, format);
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ConstantExpressionsInterpreter.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ConstantExpressionsInterpreter.java
index 607a1b207c0..995c8d84c61 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ConstantExpressionsInterpreter.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ConstantExpressionsInterpreter.java
@@ -77,6 +77,7 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.typesystem.computation.NumberLiterals;
 import org.eclipse.xtext.xbase.typesystem.util.PendingLinkingCandidateResolver;
 import org.eclipse.xtext.xbase.typesystem.util.TypeLiteralLinkingCandidateResolver;
@@ -707,6 +708,7 @@ protected void resolveFeature(final XAbstractFeatureCall featureCall, final JvmI
     new PendingLinkingCandidateResolver<XAbstractFeatureCall>(featureCall).resolveLinkingProxy(((InternalEObject) featureCall), feature, XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE, XbasePackage.XABSTRACT_FEATURE_CALL__FEATURE);
   }
 
+  @XbaseGenerated
   public Object internalEvaluate(final XExpression it, final Context ctx) {
     if (it instanceof XBinaryOperation) {
       return _internalEvaluate((XBinaryOperation)it, ctx);
@@ -740,6 +742,7 @@ public Object internalEvaluate(final XExpression it, final Context ctx) {
     }
   }
 
+  @XbaseGenerated
   public String getFullName(final XExpression call) {
     if (call instanceof XFeatureCall) {
       return _getFullName((XFeatureCall)call);
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/AnnotationReferenceBuildContextImpl.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/AnnotationReferenceBuildContextImpl.java
index 744e42f6d09..6180449bdb4 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/AnnotationReferenceBuildContextImpl.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/AnnotationReferenceBuildContextImpl.java
@@ -56,6 +56,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @author kosyakov - Initial contribution and API
@@ -833,6 +834,7 @@ protected String getAnnotationValueTypeName(final JvmType type) {
     return _switchResult;
   }
 
+  @XbaseGenerated
   public void internalSet(final String name, final Object value, final boolean mustBeArray) {
     if (value instanceof EnumerationValueDeclaration) {
       _internalSet(name, (EnumerationValueDeclaration)value, mustBeArray);
@@ -921,6 +923,7 @@ public void internalSet(final String name, final Object value, final boolean mus
     }
   }
 
+  @XbaseGenerated
   protected void setValue(final JvmAnnotationValue it, final Object value, final String componentType, final boolean mustBeArray) {
     if (it instanceof JvmCustomAnnotationValue
          && value instanceof XtendAnnotationReferenceImpl) {
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/validation/XtendImplicitReturnFinder.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/validation/XtendImplicitReturnFinder.java
index df1eedaaf36..26c5fd561a1 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/validation/XtendImplicitReturnFinder.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/validation/XtendImplicitReturnFinder.java
@@ -28,6 +28,7 @@
 import org.eclipse.xtext.xbase.XSynchronizedExpression;
 import org.eclipse.xtext.xbase.XTryCatchFinallyExpression;
 import org.eclipse.xtext.xbase.XTypeLiteral;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.validation.ImplicitReturnFinder;
 import org.eclipse.xtext.xbase.validation.XbaseImplicitReturnFinder;
 
@@ -44,6 +45,7 @@ protected void _findImplicitReturns(final RichString expression, final ImplicitR
     acceptor.accept(expression);
   }
 
+  @XbaseGenerated
   public void findImplicitReturns(final XExpression expression, final ImplicitReturnFinder.Acceptor acceptor) {
     if (expression instanceof AnonymousClass) {
       _findImplicitReturns((AnonymousClass)expression, acceptor);
diff --git a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/AbstractXtendOutlineTreeBuilder.java b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/AbstractXtendOutlineTreeBuilder.java
index 32859ab0f58..05d660d7188 100644
--- a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/AbstractXtendOutlineTreeBuilder.java
+++ b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/AbstractXtendOutlineTreeBuilder.java
@@ -29,6 +29,7 @@
 import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypeExtensions;
 import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.typesystem.override.IResolvedConstructor;
 import org.eclipse.xtext.xbase.typesystem.override.IResolvedField;
 import org.eclipse.xtext.xbase.typesystem.override.IResolvedOperation;
@@ -193,6 +194,7 @@ protected IXtendOutlineContext buildFeature(final JvmDeclaredType inferredType,
 
   protected abstract void buildType(final EObject someType, final IXtendOutlineContext context);
 
+  @XbaseGenerated
   public void build(final EObject modelElement, final IXtendOutlineContext context) {
     if (modelElement != null) {
       _build(modelElement, context);
diff --git a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineJvmTreeBuilder.java b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineJvmTreeBuilder.java
index 123a703540e..6b87d4997ec 100644
--- a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineJvmTreeBuilder.java
+++ b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineJvmTreeBuilder.java
@@ -15,6 +15,7 @@
 import org.eclipse.xtend.core.xtend.XtendFile;
 import org.eclipse.xtend.core.xtend.XtendTypeDeclaration;
 import org.eclipse.xtext.common.types.JvmDeclaredType;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @author kosyakov - Initial contribution and API
@@ -47,6 +48,7 @@ protected void buildType(final EObject someType, final IXtendOutlineContext cont
     }
   }
 
+  @XbaseGenerated
   public void build(final EObject jvmDeclaredType, final IXtendOutlineContext context) {
     if (jvmDeclaredType instanceof JvmDeclaredType) {
       _build((JvmDeclaredType)jvmDeclaredType, context);
diff --git a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineSourceTreeBuilder.java b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineSourceTreeBuilder.java
index 64ba1f9b728..67eec441d9f 100644
--- a/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineSourceTreeBuilder.java
+++ b/org.eclipse.xtend.ide.common/xtend-gen/org/eclipse/xtend/ide/common/outline/XtendOutlineSourceTreeBuilder.java
@@ -29,6 +29,7 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @author kosyakov - Initial contribution and API
@@ -186,6 +187,7 @@ protected void buildType(final EObject someType, final IXtendOutlineContext cont
     }
   }
 
+  @XbaseGenerated
   public void build(final EObject xtendType, final IXtendOutlineContext context) {
     if (xtendType instanceof XtendTypeDeclaration) {
       _build((XtendTypeDeclaration)xtendType, context);
diff --git a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/editor/copyqualifiedname/XtendCopyQualifiedNameServiceTest.java b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/editor/copyqualifiedname/XtendCopyQualifiedNameServiceTest.java
index b02d7aebf90..56390c2fbd8 100644
--- a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/editor/copyqualifiedname/XtendCopyQualifiedNameServiceTest.java
+++ b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/editor/copyqualifiedname/XtendCopyQualifiedNameServiceTest.java
@@ -30,6 +30,7 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -886,6 +887,7 @@ public ResourceSet getResourceSet() {
     return this.getInjector().<IResourceSetProvider>getInstance(IResourceSetProvider.class).get(this.testHelper.getProject());
   }
 
+  @XbaseGenerated
   public void assertCopyQualifiedName(final EObject featureCall, final String expectedQualifiedName) {
     if (featureCall instanceof XAbstractFeatureCall) {
       _assertCopyQualifiedName((XAbstractFeatureCall)featureCall, expectedQualifiedName);
diff --git a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/editor/copyqualifiedname/XtendCopyQualifiedNameService.java b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/editor/copyqualifiedname/XtendCopyQualifiedNameService.java
index 48d5ab45b08..f88d9bfd0d4 100644
--- a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/editor/copyqualifiedname/XtendCopyQualifiedNameService.java
+++ b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/editor/copyqualifiedname/XtendCopyQualifiedNameService.java
@@ -18,6 +18,7 @@
 import org.eclipse.xtext.xbase.XAbstractFeatureCall;
 import org.eclipse.xtext.xbase.XConstructorCall;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.ui.editor.copyqualifiedname.XbaseCopyQualifiedNameService;
 
 /**
@@ -70,6 +71,7 @@ protected String toQualifiedName(final XtendConstructor it) {
     return _builder.toString();
   }
 
+  @XbaseGenerated
   public String getQualifiedName(final EObject it, final EObject context) {
     if (it instanceof JvmConstructor
          && context instanceof XConstructorCall) {
diff --git a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/labeling/XtendLabelProvider.java b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/labeling/XtendLabelProvider.java
index ed30e2e05a7..ba3832df5e9 100644
--- a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/labeling/XtendLabelProvider.java
+++ b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/labeling/XtendLabelProvider.java
@@ -40,6 +40,7 @@
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.xbase.XVariableDeclaration;
 import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.scoping.featurecalls.OperatorMapping;
 import org.eclipse.xtext.xbase.typesystem.override.IResolvedConstructor;
 import org.eclipse.xtext.xbase.typesystem.override.IResolvedField;
@@ -252,6 +253,7 @@ protected JvmTypeReference getDisplayedType(final XtendField field) {
   }
 
   @Override
+  @XbaseGenerated
   protected ImageDescriptor imageDescriptor(final Object operation) {
     if (operation instanceof JvmConstructor) {
       return _imageDescriptor((JvmConstructor)operation);
diff --git a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/AccessorsProcessor.java b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/AccessorsProcessor.java
index f33514ee972..4d918b10291 100644
--- a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/AccessorsProcessor.java
+++ b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/AccessorsProcessor.java
@@ -41,6 +41,7 @@
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @since 2.7
@@ -502,6 +503,7 @@ protected void _transform(final MutableClassDeclaration it, @Extension final Tra
     IterableExtensions.filter(it.getDeclaredFields(), _function).forEach(_function_1);
   }
 
+  @XbaseGenerated
   public void transform(final MutableMemberDeclaration it, final TransformationContext context) {
     if (it instanceof MutableClassDeclaration) {
       _transform((MutableClassDeclaration)it, context);
diff --git a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/DelegateProcessor.java b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/DelegateProcessor.java
index 065151cff27..1107cb81578 100644
--- a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/DelegateProcessor.java
+++ b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/DelegateProcessor.java
@@ -47,6 +47,7 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @since 2.7
@@ -522,6 +523,7 @@ public String returnIfNeeded(final ResolvedMethod it) {
       return _xifexpression;
     }
 
+    @XbaseGenerated
     public boolean isValidDelegate(final MemberDeclaration it) {
       if (it instanceof MethodDeclaration) {
         return _isValidDelegate((MethodDeclaration)it);
@@ -533,6 +535,7 @@ public boolean isValidDelegate(final MemberDeclaration it) {
       }
     }
 
+    @XbaseGenerated
     public TypeReference getType(final MemberDeclaration it) {
       if (it instanceof MethodDeclaration) {
         return _getType((MethodDeclaration)it);
@@ -544,6 +547,7 @@ public TypeReference getType(final MemberDeclaration it) {
       }
     }
 
+    @XbaseGenerated
     public CharSequence delegateAccess(final MemberDeclaration it, final MethodDeclaration method) {
       if (it instanceof MethodDeclaration) {
         return _delegateAccess((MethodDeclaration)it, method);
diff --git a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/FinalFieldsConstructorProcessor.java b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/FinalFieldsConstructorProcessor.java
index 770bec7cfaf..b0b5135b80f 100644
--- a/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/FinalFieldsConstructorProcessor.java
+++ b/org.eclipse.xtend.lib/xtend-gen/org/eclipse/xtend/lib/annotations/FinalFieldsConstructorProcessor.java
@@ -39,6 +39,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @since 2.7
@@ -270,6 +271,7 @@ protected void _transform(final MutableConstructorDeclaration it, @Extension fin
     util.makeFinalFieldsConstructor(it);
   }
 
+  @XbaseGenerated
   public void transform(final MutableTypeParameterDeclarator it, final TransformationContext context) {
     if (it instanceof MutableConstructorDeclaration) {
       _transform((MutableConstructorDeclaration)it, context);
diff --git a/org.eclipse.xtext.purexbase/xtend-gen/org/eclipse/xtext/purexbase/jvmmodel/PureXbaseJvmModelInferrer.java b/org.eclipse.xtext.purexbase/xtend-gen/org/eclipse/xtext/purexbase/jvmmodel/PureXbaseJvmModelInferrer.java
index fb3ffd1feca..24df20f8598 100644
--- a/org.eclipse.xtext.purexbase/xtend-gen/org/eclipse/xtext/purexbase/jvmmodel/PureXbaseJvmModelInferrer.java
+++ b/org.eclipse.xtext.purexbase/xtend-gen/org/eclipse/xtext/purexbase/jvmmodel/PureXbaseJvmModelInferrer.java
@@ -24,6 +24,7 @@
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * <p>Infers a JVM model from the source model.</p>
@@ -64,6 +65,7 @@ public String name(final Resource res) {
     return s.substring(0, _minus);
   }
 
+  @XbaseGenerated
   public void infer(final EObject m, final IJvmDeclaredTypeAcceptor acceptor, final boolean prelinkingPhase) {
     if (m instanceof Model) {
       _infer((Model)m, acceptor, prelinkingPhase);
diff --git a/org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java b/org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java
index e1f8d04c8c2..0ea79f88c21 100644
--- a/org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java
+++ b/org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java
@@ -121,6 +121,7 @@
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -1553,6 +1554,7 @@ protected Map<String, List<Diagnostic>> getDiagnostics() {
     }
   }
 
+  @XbaseGenerated
   protected String toExpectation(final Object it) {
     if (it instanceof Integer) {
       return _toExpectation((Integer)it);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/annotations/formatting2/XbaseWithAnnotationsFormatter.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/annotations/formatting2/XbaseWithAnnotationsFormatter.java
index acece9b6dad..79b8165de80 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/annotations/formatting2/XbaseWithAnnotationsFormatter.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/annotations/formatting2/XbaseWithAnnotationsFormatter.java
@@ -49,6 +49,7 @@
 import org.eclipse.xtext.xbase.formatting2.XbaseFormatter;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 import org.eclipse.xtext.xtype.XImportDeclaration;
 import org.eclipse.xtext.xtype.XImportSection;
@@ -104,6 +105,7 @@ protected void _format(final XAnnotation ann, @Extension final IFormattableDocum
     }
   }
 
+  @XbaseGenerated
   public void format(final Object ann, final IFormattableDocument document) {
     if (ann instanceof JvmTypeParameter) {
       _format((JvmTypeParameter)ann, document);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/JvmModelGenerator.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/JvmModelGenerator.java
index 1897e1df081..75126463506 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/JvmModelGenerator.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/JvmModelGenerator.java
@@ -106,6 +106,7 @@
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.typesystem.references.ITypeReferenceOwner;
 import org.eclipse.xtext.xbase.typesystem.references.StandardTypeReferenceOwner;
 import org.eclipse.xtext.xbase.typesystem.util.CommonTypeComputationServices;
@@ -1588,6 +1589,7 @@ protected Set<EObject> getSourceElements(final EObject jvmElement) {
     return this.jvmModelAssociations.getSourceElements(jvmElement);
   }
 
+  @XbaseGenerated
   public void internalDoGenerate(final EObject type, final IFileSystemAccess fsa) {
     if (type instanceof JvmDeclaredType) {
       _internalDoGenerate((JvmDeclaredType)type, fsa);
@@ -1601,6 +1603,7 @@ public void internalDoGenerate(final EObject type, final IFileSystemAccess fsa)
     }
   }
 
+  @XbaseGenerated
   public ITreeAppendable generateBody(final JvmDeclaredType it, final ITreeAppendable appendable, final GeneratorConfig config) {
     if (it instanceof JvmAnnotationType) {
       return _generateBody((JvmAnnotationType)it, appendable, config);
@@ -1614,6 +1617,7 @@ public ITreeAppendable generateBody(final JvmDeclaredType it, final ITreeAppenda
     }
   }
 
+  @XbaseGenerated
   public ITreeAppendable generateModifier(final JvmMember it, final ITreeAppendable appendable, final GeneratorConfig config) {
     if (it instanceof JvmConstructor) {
       return _generateModifier((JvmConstructor)it, appendable, config);
@@ -1631,6 +1635,7 @@ public ITreeAppendable generateModifier(final JvmMember it, final ITreeAppendabl
     }
   }
 
+  @XbaseGenerated
   public ITreeAppendable generateMember(final JvmMember it, final ITreeAppendable appendable, final GeneratorConfig config) {
     if (it instanceof JvmConstructor) {
       return _generateMember((JvmConstructor)it, appendable, config);
@@ -1648,6 +1653,7 @@ public ITreeAppendable generateMember(final JvmMember it, final ITreeAppendable
     }
   }
 
+  @XbaseGenerated
   public void toJavaLiteral(final JvmAnnotationValue value, final ITreeAppendable appendable, final GeneratorConfig config) {
     if (value instanceof JvmAnnotationAnnotationValue) {
       _toJavaLiteral((JvmAnnotationAnnotationValue)value, appendable, config);
@@ -1694,6 +1700,7 @@ public void toJavaLiteral(final JvmAnnotationValue value, final ITreeAppendable
     }
   }
 
+  @XbaseGenerated
   public Iterable<JvmMember> getMembersToBeCompiled(final JvmDeclaredType type) {
     if (type instanceof JvmEnumerationType) {
       return _getMembersToBeCompiled((JvmEnumerationType)type);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/ConstantConditionsInterpreter.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/ConstantConditionsInterpreter.java
index 6092b7b69a5..5164b5e4e86 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/ConstantConditionsInterpreter.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/ConstantConditionsInterpreter.java
@@ -48,6 +48,7 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
 import org.eclipse.xtext.xbase.typesystem.computation.NumberLiterals;
 
@@ -556,6 +557,7 @@ protected EvaluationResult _internalEvaluate(final XTypeLiteral it, final Evalua
     return new EvaluationResult(it, false);
   }
 
+  @XbaseGenerated
   public EvaluationResult internalEvaluate(final XExpression it, final EvaluationContext context) {
     if (it instanceof XBinaryOperation) {
       return _internalEvaluate((XBinaryOperation)it, context);
@@ -585,6 +587,7 @@ public EvaluationResult internalEvaluate(final XExpression it, final EvaluationC
     }
   }
 
+  @XbaseGenerated
   public EvaluationResult internalLogicalAnd(final Object left, final Object right, final boolean compileTimeConstant) {
     if (left instanceof Boolean
          && right instanceof Boolean) {
@@ -610,6 +613,7 @@ public EvaluationResult internalLogicalAnd(final Object left, final Object right
     }
   }
 
+  @XbaseGenerated
   public EvaluationResult internalLogicalOr(final Object left, final Object right, final boolean compileTimeConstant) {
     if (left instanceof Boolean
          && right instanceof Boolean) {
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/DefaultEarlyExitComputer.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/DefaultEarlyExitComputer.java
index bb1084ee92e..e210c933649 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/DefaultEarlyExitComputer.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/DefaultEarlyExitComputer.java
@@ -32,6 +32,7 @@
 import org.eclipse.xtext.xbase.XTryCatchFinallyExpression;
 import org.eclipse.xtext.xbase.XVariableDeclaration;
 import org.eclipse.xtext.xbase.XWhileExpression;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
@@ -298,6 +299,7 @@ protected Collection<IEarlyExitComputer.ExitPoint> _exitPoints(final XSynchroniz
     return this.getExitPoints(expression.getExpression());
   }
 
+  @XbaseGenerated
   protected Collection<IEarlyExitComputer.ExitPoint> exitPoints(final XExpression expression) {
     if (expression instanceof XDoWhileExpression) {
       return _exitPoints((XDoWhileExpression)expression);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/EvaluationResult.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/EvaluationResult.java
index b80fe10b427..076381def34 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/EvaluationResult.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/controlflow/EvaluationResult.java
@@ -18,6 +18,7 @@
 import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.xbase.XTypeLiteral;
 import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
 @Data
@@ -183,6 +184,7 @@ private Object _equalValue(final ThisReference myValue, final XTypeLiteral other
     return Boolean.valueOf(false);
   }
 
+  @XbaseGenerated
   private Object equalValue(final Object myValue, final Object otherValue) {
     if (myValue instanceof JvmEnumerationLiteral
          && otherValue instanceof JvmEnumerationLiteral) {
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataFactory.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataFactory.java
index 9fe7e231cd5..d226b55b2c0 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataFactory.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataFactory.java
@@ -22,6 +22,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @deprecated use {@link IHiddenRegionFormatter}
@@ -485,6 +486,7 @@ protected Iterable<FormattingData> newNewLineData(final HiddenLeafs leafs, final
     return _function;
   }
 
+  @XbaseGenerated
   protected Function1<? super FormattableDocument, ? extends Iterable<FormattingData>> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataInit it) {
     if (key instanceof BlankLineKey) {
       return _newFormattingData(leafs, (BlankLineKey)key, it);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/XbaseFormatter2.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/XbaseFormatter2.java
index 6a616d24470..9837f54d260 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/XbaseFormatter2.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/XbaseFormatter2.java
@@ -69,6 +69,7 @@
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.ObjectExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.services.XbaseGrammarAccess;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 
@@ -2663,6 +2664,7 @@ protected void formatClosureWrapIfNeeded(final XClosure expr, final INode open,
     format.operator_add(_prepend_1);
   }
 
+  @XbaseGenerated
   protected void format(final EObject ref, final FormattableDocument document) {
     if (ref instanceof JvmTypeParameter) {
       _format((JvmTypeParameter)ref, document);
@@ -2766,6 +2768,7 @@ protected void format(final EObject ref, final FormattableDocument document) {
     }
   }
 
+  @XbaseGenerated
   protected boolean isMultiParamInOwnLine(final XExpression fc, final FormattableDocument doc) {
     if (fc instanceof XFeatureCall) {
       return _isMultiParamInOwnLine((XFeatureCall)fc, doc);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XbaseFormatter.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XbaseFormatter.java
index 2eb20250442..116929b0851 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XbaseFormatter.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XbaseFormatter.java
@@ -72,6 +72,7 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.services.XbaseGrammarAccess;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 import org.eclipse.xtext.xtype.XImportDeclaration;
@@ -1374,6 +1375,7 @@ protected boolean isMultilineOrInNewLine(final EObject obj) {
     return ((obj != null) && (this.isMultiline(obj) || this.previousHiddenRegion(obj).isMultiline()));
   }
 
+  @XbaseGenerated
   public void format(final Object expr, final IFormattableDocument format) {
     if (expr instanceof JvmTypeParameter) {
       _format((JvmTypeParameter)expr, format);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XtypeFormatter.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XtypeFormatter.java
index 072899d58c2..bb4e6c59bd7 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XtypeFormatter.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting2/XtypeFormatter.java
@@ -26,6 +26,7 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 import org.eclipse.xtext.xtype.XImportDeclaration;
 import org.eclipse.xtext.xtype.XImportSection;
@@ -170,6 +171,7 @@ protected void _format(final XImportDeclaration imp, @Extension final IFormattab
     document.prepend(this.regionFor(imp).keyword(";"), _function_4);
   }
 
+  @XbaseGenerated
   public void format(final Object ref, final IFormattableDocument document) {
     if (ref instanceof JvmTypeParameter) {
       _format((JvmTypeParameter)ref, document);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/imports/ImportsCollector.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/imports/ImportsCollector.java
index 50a0c713e47..4040ef6ca22 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/imports/ImportsCollector.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/imports/ImportsCollector.java
@@ -40,6 +40,7 @@
 import org.eclipse.xtext.xbase.XbasePackage;
 import org.eclipse.xtext.xbase.annotations.xAnnotations.XAnnotation;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.services.XbaseGrammarAccess;
 
 /**
@@ -257,6 +258,7 @@ private void addJavaDocReferences(final INode documentationNode, final ITextRegi
     }
   }
 
+  @XbaseGenerated
   public void visit(final EObject jvmType, final INode originNode, final ImportsAcceptor acceptor) {
     if (jvmType instanceof JvmGenericType) {
       _visit((JvmGenericType)jvmType, originNode, acceptor);
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/ConstantOperators.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/ConstantOperators.java
index e721a0d43c7..2e67198666b 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/ConstantOperators.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/ConstantOperators.java
@@ -17,6 +17,7 @@
 import org.eclipse.xtext.xbase.lib.DoubleExtensions;
 import org.eclipse.xtext.xbase.lib.InputOutput;
 import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * @author Sven Efftinge - Initial contribution and API
@@ -2621,6 +2622,7 @@ protected boolean _notSame(final Integer left, final Integer right) {
     return (_intValue != _intValue_1);
   }
 
+  @XbaseGenerated
   public Object minus(final Object e) {
     if (e instanceof Byte) {
       return _minus((Byte)e);
@@ -2642,6 +2644,7 @@ public Object minus(final Object e) {
     }
   }
 
+  @XbaseGenerated
   public Object plus(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -2763,6 +2766,7 @@ public Object plus(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public Object shiftLeft(final Object i, final Object bits) {
     if (i instanceof Integer
          && bits instanceof Integer) {
@@ -2779,6 +2783,7 @@ public Object shiftLeft(final Object i, final Object bits) {
     }
   }
 
+  @XbaseGenerated
   public Object shiftRight(final Object i, final Object bits) {
     if (i instanceof Integer
          && bits instanceof Integer) {
@@ -2795,6 +2800,7 @@ public Object shiftRight(final Object i, final Object bits) {
     }
   }
 
+  @XbaseGenerated
   public Object shiftRightUnsigned(final Object i, final Object bits) {
     if (i instanceof Integer
          && bits instanceof Integer) {
@@ -2811,6 +2817,7 @@ public Object shiftRightUnsigned(final Object i, final Object bits) {
     }
   }
 
+  @XbaseGenerated
   public boolean and(final Object left, final Object right) {
     if (left instanceof Boolean
          && right instanceof Boolean) {
@@ -2824,6 +2831,7 @@ public boolean and(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean or(final Object left, final Object right) {
     if (left instanceof Boolean
          && right instanceof Boolean) {
@@ -2837,6 +2845,7 @@ public boolean or(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean lessThan(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -2955,6 +2964,7 @@ public boolean lessThan(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public Object minus(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3073,6 +3083,7 @@ public Object minus(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean greaterThan(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3191,6 +3202,7 @@ public boolean greaterThan(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public Object modulo(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3309,6 +3321,7 @@ public Object modulo(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public Object multiply(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3427,6 +3440,7 @@ public Object multiply(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public Object divide(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3545,6 +3559,7 @@ public Object divide(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean same(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3663,6 +3678,7 @@ public boolean same(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean lessEquals(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3781,6 +3797,7 @@ public boolean lessEquals(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean greaterEquals(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
@@ -3899,6 +3916,7 @@ public boolean greaterEquals(final Object left, final Object right) {
     }
   }
 
+  @XbaseGenerated
   public boolean notSame(final Object left, final Object right) {
     if (left instanceof Byte
          && right instanceof Byte) {
diff --git a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/SwitchConstantExpressionsInterpreter.java b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/SwitchConstantExpressionsInterpreter.java
index 4766725f4e6..dd287e3a588 100644
--- a/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/SwitchConstantExpressionsInterpreter.java
+++ b/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/interpreter/SwitchConstantExpressionsInterpreter.java
@@ -36,6 +36,7 @@
 import org.eclipse.xtext.xbase.jvmmodel.ILogicalContainerProvider;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xbase.typesystem.computation.NumberLiterals;
 
 /**
@@ -158,6 +159,7 @@ public Object evaluateAssociatedExpression(final XExpression it, final Context c
     return _switchResult;
   }
 
+  @XbaseGenerated
   public Object internalEvaluate(final XExpression it, final Context ctx) {
     if (it instanceof XBinaryOperation) {
       return _internalEvaluate((XBinaryOperation)it, ctx);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java
index b31e870bedb..96dffea9974 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java
@@ -57,6 +57,7 @@
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.RuleNames;
 import org.eclipse.xtext.xtext.generator.CodeConfig;
 import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
@@ -944,6 +945,7 @@ public CharSequence toStringLiteral(final AbstractElement it) {
     return _switchResult;
   }
 
+  @XbaseGenerated
   public String grammarElementIdentifier(final EObject it) {
     if (it instanceof AbstractElement) {
       return _grammarElementIdentifier((AbstractElement)it);
@@ -957,6 +959,7 @@ public String grammarElementIdentifier(final EObject it) {
     }
   }
 
+  @XbaseGenerated
   public String grammarElementAccess(final EObject it) {
     if (it instanceof AbstractElement) {
       return _grammarElementAccess((AbstractElement)it);
@@ -970,6 +973,7 @@ public String grammarElementAccess(final EObject it) {
     }
   }
 
+  @XbaseGenerated
   public boolean predicated(final AbstractElement it) {
     if (it instanceof Assignment) {
       return _predicated((Assignment)it);
@@ -983,6 +987,7 @@ public boolean predicated(final AbstractElement it) {
     }
   }
 
+  @XbaseGenerated
   public String localVar(final AbstractElement it) {
     if (it instanceof EnumLiteralDeclaration) {
       return _localVar((EnumLiteralDeclaration)it);
@@ -996,6 +1001,7 @@ public String localVar(final AbstractElement it) {
     }
   }
 
+  @XbaseGenerated
   public List<AbstractElement> contentsAsList(final EObject it) {
     if (it instanceof UnorderedGroup) {
       return _contentsAsList((UnorderedGroup)it);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.java
index 6b06185dd9a..9ff54ccf181 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.java
@@ -51,6 +51,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.generator.AbstractXtextGeneratorFragment;
 import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
 import org.eclipse.xtext.xtext.generator.grammarAccess.FragmentFakingEcoreResource;
@@ -1020,6 +1021,7 @@ protected List<Grammar> getEffectivelyUsedGrammars(final Grammar grammar) {
     return IterableExtensions.<Grammar>toList(IterableExtensions.<Grammar>toSet(IterableExtensions.<Grammar>filter(ListExtensions.<AbstractRule, Grammar>map(GrammarUtil.allRules(grammar), _function), _function_1)));
   }
 
+  @XbaseGenerated
   protected StringConcatenationClient cache(final AbstractRule it) {
     if (it instanceof EnumRule) {
       return _cache((EnumRule)it);
@@ -1033,6 +1035,7 @@ protected StringConcatenationClient cache(final AbstractRule it) {
     }
   }
 
+  @XbaseGenerated
   protected StringConcatenationClient initializer(final AbstractRule it) {
     if (it instanceof EnumRule) {
       return _initializer((EnumRule)it);
@@ -1046,6 +1049,7 @@ protected StringConcatenationClient initializer(final AbstractRule it) {
     }
   }
 
+  @XbaseGenerated
   protected StringConcatenationClient getter(final AbstractRule it, final Grammar original) {
     if (it instanceof EnumRule) {
       return _getter((EnumRule)it, original);
@@ -1059,6 +1063,7 @@ protected StringConcatenationClient getter(final AbstractRule it, final Grammar
     }
   }
 
+  @XbaseGenerated
   protected String gaRuleAccessorLocalVarName(final AbstractRule rule) {
     if (rule instanceof EnumRule) {
       return _gaRuleAccessorLocalVarName((EnumRule)rule);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java
index 484ccc915f4..097213bd6a7 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java
@@ -37,6 +37,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.FlattenedGrammarAccess;
 import org.eclipse.xtext.xtext.RuleFilter;
 import org.eclipse.xtext.xtext.RuleNames;
@@ -1104,6 +1105,7 @@ protected boolean _mustBeParenthesized(final Alternatives it) {
     return true;
   }
 
+  @XbaseGenerated
   protected CharSequence compileRule(final Object it, final Grammar grammar, final AntlrOptions options) {
     if (it instanceof EnumRule) {
       return _compileRule((EnumRule)it, grammar, options);
@@ -1119,6 +1121,7 @@ protected CharSequence compileRule(final Object it, final Grammar grammar, final
     }
   }
 
+  @XbaseGenerated
   protected String dataTypeEbnf2(final AbstractElement it, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _dataTypeEbnf2((Alternatives)it, supportActions);
@@ -1138,6 +1141,7 @@ protected String dataTypeEbnf2(final AbstractElement it, final boolean supportAc
     }
   }
 
+  @XbaseGenerated
   protected String ebnf2(final AbstractElement it, final AntlrOptions options, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _ebnf2((Alternatives)it, options, supportActions);
@@ -1163,6 +1167,7 @@ protected String ebnf2(final AbstractElement it, final AntlrOptions options, fin
     }
   }
 
+  @XbaseGenerated
   protected String crossrefEbnf(final AbstractElement it, final CrossReference ref, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _crossrefEbnf((Alternatives)it, ref, supportActions);
@@ -1178,6 +1183,7 @@ protected String crossrefEbnf(final AbstractElement it, final CrossReference ref
     }
   }
 
+  @XbaseGenerated
   protected String assignmentEbnf(final AbstractElement it, final Assignment assignment, final AntlrOptions options, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _assignmentEbnf((Alternatives)it, assignment, options, supportActions);
@@ -1199,6 +1205,7 @@ protected String assignmentEbnf(final AbstractElement it, final Assignment assig
     }
   }
 
+  @XbaseGenerated
   public boolean mustBeParenthesized(final AbstractElement it) {
     if (it instanceof Alternatives) {
       return _mustBeParenthesized((Alternatives)it);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.java
index f9bf2afa273..7f79859e0c9 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.java
@@ -30,6 +30,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @SuppressWarnings("all")
 public abstract class AbstractAntlrGrammarWithActionsGenerator extends AbstractAntlrGrammarGenerator {
@@ -614,6 +615,7 @@ protected boolean _mustBeParenthesized(final RuleCall it) {
     return ((this._grammarAccessExtensions.predicated(it) || it.isFirstSetPredicated()) || (it.getCardinality() != null));
   }
 
+  @XbaseGenerated
   protected CharSequence compileInitHiddenTokens(final AbstractRule it, final AntlrOptions options) {
     if (it instanceof ParserRule) {
       return _compileInitHiddenTokens((ParserRule)it, options);
@@ -625,6 +627,7 @@ protected CharSequence compileInitHiddenTokens(final AbstractRule it, final Antl
     }
   }
 
+  @XbaseGenerated
   protected CharSequence compileInitUnorderedGroups(final AbstractRule it, final AntlrOptions options) {
     if (it instanceof ParserRule) {
       return _compileInitUnorderedGroups((ParserRule)it, options);
@@ -636,6 +639,7 @@ protected CharSequence compileInitUnorderedGroups(final AbstractRule it, final A
     }
   }
 
+  @XbaseGenerated
   protected CharSequence compileRestoreHiddenTokens(final AbstractRule it, final AntlrOptions options) {
     if (it instanceof ParserRule) {
       return _compileRestoreHiddenTokens((ParserRule)it, options);
@@ -647,6 +651,7 @@ protected CharSequence compileRestoreHiddenTokens(final AbstractRule it, final A
     }
   }
 
+  @XbaseGenerated
   protected CharSequence compileRestoreUnorderedGroups(final AbstractRule it, final AntlrOptions options) {
     if (it instanceof ParserRule) {
       return _compileRestoreUnorderedGroups((ParserRule)it, options);
@@ -659,6 +664,7 @@ protected CharSequence compileRestoreUnorderedGroups(final AbstractRule it, fina
   }
 
   @Override
+  @XbaseGenerated
   protected String ebnf2(final AbstractElement it, final AntlrOptions options, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _ebnf2((Alternatives)it, options, supportActions);
@@ -685,6 +691,7 @@ protected String ebnf2(final AbstractElement it, final AntlrOptions options, fin
   }
 
   @Override
+  @XbaseGenerated
   protected String assignmentEbnf(final AbstractElement it, final Assignment assignment, final AntlrOptions options, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _assignmentEbnf((Alternatives)it, assignment, options, supportActions);
@@ -707,6 +714,7 @@ protected String assignmentEbnf(final AbstractElement it, final Assignment assig
   }
 
   @Override
+  @XbaseGenerated
   public boolean mustBeParenthesized(final AbstractElement it) {
     if (it instanceof Alternatives) {
       return _mustBeParenthesized((Alternatives)it);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.java
index 21fbc5cc33b..b068bdf35b4 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.java
@@ -36,6 +36,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @SuppressWarnings("all")
 public class AntlrContentAssistGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
@@ -1303,6 +1304,7 @@ protected boolean shouldBeSkipped(final TerminalRule it, final Grammar grammar)
   }
 
   @Override
+  @XbaseGenerated
   protected CharSequence compileRule(final Object it, final Grammar grammar, final AntlrOptions options) {
     if (it instanceof Alternatives) {
       return _compileRule((Alternatives)it, grammar, options);
@@ -1327,6 +1329,7 @@ protected CharSequence compileRule(final Object it, final Grammar grammar, final
   }
 
   @Override
+  @XbaseGenerated
   protected String assignmentEbnf(final AbstractElement it, final Assignment assignment, final AntlrOptions options, final boolean supportsActions) {
     if (it instanceof Alternatives) {
       return _assignmentEbnf((Alternatives)it, assignment, options, supportsActions);
@@ -1349,6 +1352,7 @@ protected String assignmentEbnf(final AbstractElement it, final Assignment assig
   }
 
   @Override
+  @XbaseGenerated
   protected String crossrefEbnf(final AbstractElement it, final CrossReference ref, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _crossrefEbnf((Alternatives)it, ref, supportActions);
@@ -1364,6 +1368,7 @@ protected String crossrefEbnf(final AbstractElement it, final CrossReference ref
     }
   }
 
+  @XbaseGenerated
   protected String crossrefEbnf(final AbstractRule it, final RuleCall call, final CrossReference ref, final boolean supportActions) {
     if (it instanceof EnumRule) {
       return _crossrefEbnf((EnumRule)it, call, ref, supportActions);
@@ -1378,6 +1383,7 @@ protected String crossrefEbnf(final AbstractRule it, final RuleCall call, final
   }
 
   @Override
+  @XbaseGenerated
   protected String ebnf2(final AbstractElement it, final AntlrOptions options, final boolean supportActions) {
     if (it instanceof Alternatives) {
       return _ebnf2((Alternatives)it, options, supportActions);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.java
index d2f2bd83351..ebc26ff9939 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.java
@@ -35,6 +35,7 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @Singleton
 @SuppressWarnings("all")
@@ -1220,6 +1221,7 @@ protected CharSequence newLeafNode(final EObject it, final String token) {
   }
 
   @Override
+  @XbaseGenerated
   protected CharSequence compileRule(final Object it, final Grammar grammar, final AntlrOptions options) {
     if (it instanceof EnumRule) {
       return _compileRule((EnumRule)it, grammar, options);
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.java
index f9294b4abaa..6106d9da090 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.java
@@ -38,6 +38,7 @@
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtext.generator.AbstractInheritingFragment;
 import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
 import org.eclipse.xtext.xtext.generator.model.FileAccessFactory;
@@ -609,6 +610,7 @@ public Set<String> getFQFeatureNamesToExclude(final Grammar g) {
     return _xifexpression;
   }
 
+  @XbaseGenerated
   private StringConcatenationClient assignmentTerminal(final AbstractElement alternatives, final StringConcatenationClient accessor) {
     if (alternatives instanceof Alternatives) {
       return _assignmentTerminal((Alternatives)alternatives, accessor);
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java
index d1e10c81b81..6cef96f3ce6 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java
@@ -37,6 +37,7 @@
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 @SuppressWarnings("all")
 public class DomainmodelJvmModelInferrer extends AbstractModelInferrer {
@@ -160,6 +161,7 @@ private void removeDuplicateGettersSetters(final JvmDeclaredType inferredType) {
     this._domainmodelJvmModelHelper.handleDuplicateJvmOperations(inferredType, _function);
   }
 
+  @XbaseGenerated
   public void infer(final EObject entity, final IJvmDeclaredTypeAcceptor acceptor, final boolean prelinkingPhase) {
     if (entity instanceof Entity) {
       _infer((Entity)entity, acceptor, prelinkingPhase);
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/formatting2/RuleEngineFormatter.java b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/formatting2/RuleEngineFormatter.java
index ece3a16ba2a..23f6ad00b43 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/formatting2/RuleEngineFormatter.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/formatting2/RuleEngineFormatter.java
@@ -59,6 +59,7 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 import org.eclipse.xtext.xtype.XFunctionTypeRef;
 import org.eclipse.xtext.xtype.XImportDeclaration;
 import org.eclipse.xtext.xtype.XImportSection;
@@ -309,6 +310,7 @@ protected void formatBodyParagraph(final XExpression expr, @Extension final IFor
   }
 
   @Override
+  @XbaseGenerated
   public void format(final Object device, final IFormattableDocument document) {
     if (device instanceof JvmTypeParameter) {
       _format((JvmTypeParameter)device, document);
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/jvmmodel/RuleEngineJvmModelInferrer.java b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/jvmmodel/RuleEngineJvmModelInferrer.java
index 5765b0f0157..b974b5dad5b 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/jvmmodel/RuleEngineJvmModelInferrer.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/xtend-gen/org/eclipse/xtext/example/homeautomation/jvmmodel/RuleEngineJvmModelInferrer.java
@@ -35,6 +35,7 @@
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.eclipse.xtext.xbase.lib.XbaseGenerated;
 
 /**
  * <p>Infers a JVM model from the source model.</p>
@@ -284,6 +285,7 @@ public static String getRuleMethodName(final Rule rule) {
     return ("execute" + _replaceAll);
   }
 
+  @XbaseGenerated
   public void infer(final EObject element, final IJvmDeclaredTypeAcceptor acceptor, final boolean isPreIndexingPhase) {
     if (element instanceof Model) {
       _infer((Model)element, acceptor, isPreIndexingPhase);
diff --git a/pom.xml b/pom.xml
index 04f8b31934b..ba45ccf2286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
 		This is the version of the currently released latest version of the xtend-maven-plugin that we
 		use during the Maven builds for processing Xtend files.
 		-->
-		<xtend-maven-plugin-version>2.36.0.M1</xtend-maven-plugin-version>
+		<xtend-maven-plugin-version>2.36.0.M2</xtend-maven-plugin-version>
 
 		<root-dir>${basedir}/..</root-dir>