diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index 38dd823178b..7ceb8554dc0 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true,
  org.eclipse.cdt.internal.ui.dialogs;x-internal:=true,
  org.eclipse.cdt.internal.ui.dialogs.cpaths;x-internal:=true,
  org.eclipse.cdt.internal.ui.dnd;x-internal:=true,
- org.eclipse.cdt.internal.ui.editor;x-friends:="org.eclipse.cdt.codan.ui,org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui",
+ org.eclipse.cdt.internal.ui.editor;x-friends:="org.eclipse.cdt.codan.ui,org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.lsp4e.cpp.language",
  org.eclipse.cdt.internal.ui.editor.asm;x-internal:=true,
  org.eclipse.cdt.internal.ui.filters;x-internal:=true,
  org.eclipse.cdt.internal.ui.help;x-internal:=true,
@@ -50,7 +50,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true,
  org.eclipse.cdt.internal.ui.resources,
  org.eclipse.cdt.internal.ui.search;x-internal:=true,
  org.eclipse.cdt.internal.ui.search.actions;x-internal:=true,
- org.eclipse.cdt.internal.ui.text;x-friends:="org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui",
+ org.eclipse.cdt.internal.ui.text;x-friends:="org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.lsp4e.cpp.language",
  org.eclipse.cdt.internal.ui.text.asm;x-internal:=true,
  org.eclipse.cdt.internal.ui.text.c.hover;x-internal:=true,
  org.eclipse.cdt.internal.ui.text.contentassist;x-internal:=true,
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java
index 8289ef4133d..85ce0e58ad5 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java
@@ -15,7 +15,6 @@ import org.eclipse.cdt.ui.CUIPlugin;
  * 	Class to re-use existing auto-indentation support of CEditor in Generic Editor of LSP4E-CPP.
  */
 
-@SuppressWarnings("restriction")
 public class AutoIndentStrategyCPP extends CAutoIndentStrategy {
 
 	public AutoIndentStrategyCPP() {
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
index 03a756ce3db..0d732647d3b 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
@@ -72,7 +72,6 @@ import org.eclipse.ui.editors.text.TextEditor;
  * Hack-ish reconciler to get some colors in the generic editor using the C/C++
  * Server.
  */
-@SuppressWarnings("restriction")
 public class PresentationReconcilerCPP extends CPresentationReconciler {
 
 	private CCommentScanner fSinglelineCommentScanner;
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java
index 2eaeabcb60b..a78d30686ac 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java
@@ -16,7 +16,6 @@ import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.SymbolKind;
 
-@SuppressWarnings("restriction")
 public class HighlightSymbol {
 	private int stableId;
 	private ExtendedSymbolKindType parentKind;