diff --git a/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
index 4b7ef4e7c..7bd81c530 100644
--- a/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
@@ -9,7 +9,9 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtend.lib,
- org.eclipse.core.runtime;bundle-version="3.6.0"
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ io.typefox.lsapi,
+ io.typefox.lsapi.services
 Import-Package: org.apache.log4j;version="1.2.15"
 Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
  org.eclipse.xtext.ide.editor.bracketmatching;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide",
@@ -25,4 +27,11 @@ Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
  org.eclipse.xtext.ide.editor.navigation,
  org.eclipse.xtext.ide.editor.partialEditing,
  org.eclipse.xtext.ide.editor.syntaxcoloring,
- org.eclipse.xtext.ide.labels;x-friends:="org.eclipse.xtext.web"
+ org.eclipse.xtext.ide.labels;x-friends:="org.eclipse.xtext.web",
+ org.eclipse.xtext.ide.server,
+ org.eclipse.xtext.ide.server.concurrent,
+ org.eclipse.xtext.ide.server.contentassist,
+ org.eclipse.xtext.ide.server.findReferences,
+ org.eclipse.xtext.ide.server.hover,
+ org.eclipse.xtext.ide.server.symbol,
+ org.eclipse.xtext.ide.util
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend
index e2d7f00ef..b03a03780 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend
@@ -13,6 +13,7 @@ import org.eclipse.xtend.lib.annotations.Data
 
 /**
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 @Data class Document {
     
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend
index e3f71c962..159f6b443 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend
@@ -25,6 +25,7 @@ import static extension org.eclipse.xtext.nodemodel.util.NodeModelUtils.*
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class DocumentExtensions {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
index 94c33ad8f..7015c480d 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
@@ -73,8 +73,8 @@ import org.eclipse.xtext.validation.Issue
 import static io.typefox.lsapi.util.LsapiFactories.*
 
 /**
- * 
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 @Accessors class LanguageServerImpl implements LanguageServer, WorkspaceService, WindowService, TextDocumentService {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend
index 7447be356..4741e97a4 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend
@@ -31,6 +31,7 @@ import org.eclipse.xtext.util.CancelIndicator
 
 /**
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 class ProjectManager {
     
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend
index ab635e017..d9169047c 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend
@@ -18,6 +18,7 @@ import java.io.PrintStream
 
 /**
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 class ServerLauncher {
     
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend
index f46405cd2..fcf67c61f 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend
@@ -18,6 +18,7 @@ import org.eclipse.xtext.resource.ResourceServiceProviderServiceLoader
 
 /**
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 class ServerModule extends AbstractModule {
     
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend
index 5fff70c87..a2db79764 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend
@@ -13,6 +13,7 @@ import org.eclipse.emf.common.util.URI
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class UriExtensions {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend
index aa10f7d5f..9f6f2922f 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend
@@ -26,6 +26,7 @@ import org.eclipse.xtext.validation.Issue
 
 /**
  * @author Sven Efftinge - Initial contribution and API
+ * @since 2.11
  */
 class WorkspaceManager {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend
index 67ed80cbb..057187124 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend
@@ -11,6 +11,7 @@ import org.eclipse.xtext.util.CancelIndicator
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 interface CancellableIndicator extends CancelIndicator {
 	def void cancel()
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend
index 8f6474eba..76018a976 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend
@@ -11,6 +11,7 @@ import org.eclipse.xtend.lib.annotations.Accessors
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 class RequestCancelIndicator implements CancellableIndicator {
 
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend
index cae32830b..5dadcc542 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend
@@ -18,6 +18,7 @@ import org.eclipse.xtext.util.CancelIndicator
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class RequestManager {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend
index 52305f95a..ea6ccf7cd 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend
@@ -23,6 +23,7 @@ import org.eclipse.xtext.service.OperationCanceledManager
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class ContentAssistService {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend
index 40fefc7ec..5c240522a 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend
@@ -16,6 +16,7 @@ import org.eclipse.xtext.util.concurrent.IUnitOfWork
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @FinalFieldsConstructor
 class WorkspaceResourceAccess implements IResourceAccess {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend
index 6818bb248..fbfa9b3fe 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend
@@ -20,6 +20,7 @@ import static io.typefox.lsapi.util.LsapiFactories.*
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class HoverService {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend
index b457577bc..861c1f20a 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend
@@ -39,6 +39,7 @@ import static extension org.eclipse.emf.ecore.util.EcoreUtil.*
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class DocumentSymbolService {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend
index 9a63378af..2d72fe76c 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend
@@ -19,6 +19,7 @@ import org.eclipse.xtext.util.CancelIndicator
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @Singleton
 class WorkspaceSymbolService {
diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend
index f307ba420..6f7c13ec7 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend
@@ -13,6 +13,7 @@ import org.eclipse.xtext.util.CancelIndicator
 
 /**
  * @author kosyakov - Initial contribution and API
+ * @since 2.11
  */
 @FinalFieldsConstructor
 class CancelIndicatorProgressMonitor implements IProgressMonitor {