diff --git a/bundles/org.eclipse.search/.project b/bundles/org.eclipse.search/.project
index 35821137d43..88541630343 100644
--- a/bundles/org.eclipse.search/.project
+++ b/bundles/org.eclipse.search/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/bundles/org.eclipse.search/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.search/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 00000000000..5faf08b7d5c
--- /dev/null
+++ b/bundles/org.eclipse.search/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.search/META-INF/MANIFEST.MF
index f49bba72f71..8f108c544d4 100644
--- a/bundles/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.search/META-INF/MANIFEST.MF
@@ -30,6 +30,6 @@ Require-Bundle:
  org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ltk.ui.refactoring;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.search.core;bundle-version="[3.16.0,4.0.0)";visibility:=reexport
+Service-Component: OSGI-INF/org.eclipse.search.ui.dirtyEditorSearchParticipant.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.search
-Service-Component: OSGI-INF/*.xml
diff --git a/bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml b/bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml
deleted file mode 100644
index b7b26d54aa6..00000000000
--- a/bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="org.eclipse.search.ui.dirtyEditorSearchParticipant">
-   <implementation class="org.eclipse.search.internal.ui.text.DirtyFileSearchParticipant"/>
-   <service>
-      <provide interface="org.eclipse.search.internal.core.text.DirtyFileProvider"/>
-   </service>
-   <property name="weight" type="Integer" value="100"/>
-</scr:component>
diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java
index b7e293f90b2..d8f4c5fe838 100644
--- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java
+++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java
@@ -16,6 +16,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.osgi.service.component.annotations.Component;
+
 import org.eclipse.core.resources.IFile;
 
 import org.eclipse.core.filebuffers.FileBuffers;
@@ -38,6 +40,7 @@
 
 import org.eclipse.search.internal.core.text.DirtyFileProvider;
 
+@Component(service = DirtyFileProvider.class, name = "org.eclipse.search.ui.dirtyEditorSearchParticipant", property = "weight:Integer=100")
 public class DirtyFileSearchParticipant implements DirtyFileProvider {
 
 	@Override