diff --git a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties b/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties
index ad6df68d951..b072fb45e90 100644
--- a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties
+++ b/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties
@@ -21,5 +21,3 @@ server.label = C/C++ Language Server
 
 reindex.command.name = Reindex
 reindex.command.label = Reindex
-
-cDocumentSetupParticipant =C Document Setup Participant
diff --git a/lsp/org.eclipse.cdt.lsp.core/plugin.xml b/lsp/org.eclipse.cdt.lsp.core/plugin.xml
index 5ee553081cf..b2c54a7e4f2 100644
--- a/lsp/org.eclipse.cdt.lsp.core/plugin.xml
+++ b/lsp/org.eclipse.cdt.lsp.core/plugin.xml
@@ -37,40 +37,10 @@
             id="org.eclipse.cdt.lsp.core">
       </contentTypeMapping>
    </extension>
-   <extension
-         id="org.eclipse.cdt.lsp.core.CDocumentSetupParticipant"
-         name="%cDocumentSetupParticipant"
-         point="org.eclipse.core.filebuffers.documentSetup">
-      <participant
-            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
-            contentTypeId="org.eclipse.cdt.lsp.core">
-      </participant>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.eclipse.cdt.lsp.core"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.eclipse.cdt.lsp.core.PresentationReconcilerCPP"
-            contentType="org.eclipse.cdt.lsp.core">
-      </presentationReconciler>
-   </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
             class="org.eclipse.cdt.lsp.core.PreferenceInitializer">
       </initializer>
    </extension>
-   <extension
-         point="org.eclipse.ui.genericeditor.autoEditStrategies">
-      <autoEditStrategy
-            class="org.eclipse.cdt.lsp.core.AutoIndentStrategyCPP"
-            contentType="org.eclipse.cdt.lsp.core">
-      </autoEditStrategy>
-   </extension>
 </plugin>
diff --git a/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF
index 63484bfea9b..6d232ceea45 100644
--- a/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF
@@ -8,8 +8,11 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.osgi;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.equinox.preferences;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="3.16.0",
  org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
  org.eclipse.lsp4e;bundle-version="0.13.1",
+ org.eclipse.cdt.core;bundle-version="6.10.0",
+ org.eclipse.cdt.ui;bundle-version="6.6.0",
  org.eclipse.cdt.lsp.core;bundle-version="[1.1.0,2.0.0)"
 Export-Package: org.eclipse.cdt.lsp.internal.ui;x-internal:=true,
  org.eclipse.cdt.lsp.internal.ui.preferences;x-internal:=true
diff --git a/lsp/org.eclipse.cdt.lsp.ui/OSGI-INF/l10n/bundle.properties b/lsp/org.eclipse.cdt.lsp.ui/OSGI-INF/l10n/bundle.properties
index 8a451bcd9aa..016aca22a54 100644
--- a/lsp/org.eclipse.cdt.lsp.ui/OSGI-INF/l10n/bundle.properties
+++ b/lsp/org.eclipse.cdt.lsp.ui/OSGI-INF/l10n/bundle.properties
@@ -16,3 +16,5 @@ Bundle-Name = CDT LSP UI
 Bundle-Vendor = Eclipse CDT
 
 preferencePages.languageServer.name=C/C++ Language Server
+
+cDocumentSetupParticipant =C Document Setup Participant
diff --git a/lsp/org.eclipse.cdt.lsp.ui/plugin.xml b/lsp/org.eclipse.cdt.lsp.ui/plugin.xml
index 326451604b2..f731e94fd62 100644
--- a/lsp/org.eclipse.cdt.lsp.ui/plugin.xml
+++ b/lsp/org.eclipse.cdt.lsp.ui/plugin.xml
@@ -22,4 +22,34 @@
             name="%preferencePages.languageServer.name">
       </page>
    </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editorContentTypeBinding
+            contentTypeId="org.eclipse.cdt.lsp.core"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
+   </extension>
+   <extension
+         point="org.eclipse.ui.genericeditor.autoEditStrategies">
+      <autoEditStrategy
+            class="org.eclipse.cdt.lsp.internal.ui.text.AutoIndentStrategyCPP"
+            contentType="org.eclipse.cdt.lsp.core">
+      </autoEditStrategy>
+   </extension>
+   <extension
+         point="org.eclipse.ui.genericeditor.presentationReconcilers">
+      <presentationReconciler
+            class="org.eclipse.cdt.lsp.core.PresentationReconcilerCPP"
+            contentType="org.eclipse.cdt.lsp.core">
+      </presentationReconciler>
+   </extension>
+   <extension
+         id="org.eclipse.cdt.lsp.core.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.lsp.core">
+      </participant>
+   </extension>
 </plugin>
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/AutoIndentStrategyCPP.java
similarity index 95%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java
rename to lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/AutoIndentStrategyCPP.java
index 23ef938e025..dfded7590e1 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java
+++ b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/AutoIndentStrategyCPP.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core;
+package org.eclipse.cdt.lsp.internal.ui.text;
 
 import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy;
 import org.eclipse.cdt.ui.CUIPlugin;