diff --git a/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
index bfca4b5d4..fa334d149 100644
--- a/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
@@ -15,14 +15,7 @@ Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
  org.eclipse.xtext.ide.editor.contentassist,
  org.eclipse.xtext.ide.editor.contentassist.antlr,
  org.eclipse.xtext.ide.editor.contentassist.antlr.internal,
- org.eclipse.xtext.ide.editor.model;x-internal:=true,
+ org.eclipse.xtext.ide.editor.model,
  org.eclipse.xtext.ide.editor.partialEditing,
- org.eclipse.xtext.ide.editor.syntaxcoloring;
-  x-friends:="org.eclipse.xtext.xbase.ide,
-   org.eclipse.xtext.ui,
-   org.eclipse.xtext.xbase.ui,
-   org.eclipse.xtend.ide,
-   org.eclipse.xtext.xtext.ui,
-   org.eclipse.xtext.xtext.ui.tests,
-   org.eclipse.xtend.ide.common",
+ org.eclipse.xtext.ide.editor.syntaxcoloring,
  org.eclipse.xtext.ide.labels;x-friends:="org.eclipse.xtext.web"
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend
index 6a4362a4e..73fa6ac53 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend
@@ -17,6 +17,8 @@ import org.eclipse.xtext.parser.antlr.ITokenDefProvider
 
 /**
  * @author Anton Kosyakov
+ * 
+ * @since 2.9
  */
 abstract class TokenTypeToStringMapper {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend
index 713a952fa..507cc602f 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend
@@ -11,6 +11,7 @@ import org.eclipse.xtext.ide.editor.model.TokenTypeToStringMapper
 
 /** 
  * @author Anton Kosyakov - Initial contribution and API
+ * @since 2.9
  */
 abstract class AbstractAntlrTokenToAttributeIdMapper extends TokenTypeToStringMapper {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend
index c3c3cfe97..2a6d431bb 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend
@@ -12,6 +12,7 @@ import java.util.regex.Pattern
 
 /** 
  * @author Anton Kosyakov
+ * @since 2.9
  */
 @Singleton
 class DefaultAntlrTokenToAttributeIdMapper extends AbstractAntlrTokenToAttributeIdMapper {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend
index 501dbf6c6..78483f4bc 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend
@@ -9,6 +9,7 @@ package org.eclipse.xtext.ide.editor.syntaxcoloring
 
 /**
  * @author Anton Kosyakov - Initial contribution and API
+ * @since 2.9
  */
 interface HighlightingStyles {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java
index b51002370..96d51c100 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java
@@ -14,6 +14,7 @@ import java.util.Set;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
+ * @since 2.9
  */
 public class LightweightPosition implements Comparable<LightweightPosition>{