diff --git a/debug/org.eclipse.debug.ui.launchview/.gitignore b/debug/org.eclipse.debug.ui.launchview/.gitignore
new file mode 100644
index 00000000000..7bec98dd976
--- /dev/null
+++ b/debug/org.eclipse.debug.ui.launchview/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.xml
diff --git a/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider.xml b/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider.xml
deleted file mode 100644
index cf17032a341..00000000000
--- a/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="createService" deactivate="destroyService" name="org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider">
-   <service>
-      <provide interface="org.eclipse.debug.ui.launchview.services.ILaunchObjectProvider"/>
-   </service>
-   <implementation class="org.eclipse.debug.ui.launchview.internal.impl.DebugCoreProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel.xml b/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel.xml
deleted file mode 100644
index 43e8551bf9a..00000000000
--- a/debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" deactivate="deactivate" immediate="true" name="org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel">
-   <service>
-      <provide interface="org.eclipse.debug.ui.launchview.internal.model.ILaunchModel"/>
-   </service>
-   <reference bind="addLaunchObjectProvider" cardinality="0..n" interface="org.eclipse.debug.ui.launchview.services.ILaunchObjectProvider" name="LaunchObjectProvider" policy="dynamic" policy-option="greedy" unbind="removeLaunchObjectProvider"/>
-   <reference bind="setWorkbench" cardinality="1..1" interface="org.eclipse.ui.IWorkbench" name="Workbench" policy="static" unbind="unsetWorkbench"/>
-   <implementation class="org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel"/>
-</scr:component>
\ No newline at end of file
diff --git a/resources/bundles/org.eclipse.core.resources/.gitignore b/resources/bundles/org.eclipse.core.resources/.gitignore
index 3b8b98010a5..34b419d357e 100644
--- a/resources/bundles/org.eclipse.core.resources/.gitignore
+++ b/resources/bundles/org.eclipse.core.resources/.gitignore
@@ -1,3 +1,4 @@
 temp.folder
 bin_ant
-ant_tasks
\ No newline at end of file
+ant_tasks
+/OSGI-INF/org.eclipse.*.xml
diff --git a/resources/bundles/org.eclipse.core.resources/.settings/org.eclipse.pde.ds.annotations.prefs b/resources/bundles/org.eclipse.core.resources/.settings/org.eclipse.pde.ds.annotations.prefs
index 73a356b6d05..b5c60ed2648 100644
--- a/resources/bundles/org.eclipse.core.resources/.settings/org.eclipse.pde.ds.annotations.prefs
+++ b/resources/bundles/org.eclipse.core.resources/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -1,5 +1,5 @@
 classpath=true
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true
diff --git a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
index 288a87d3612..ae662334bb6 100644
--- a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
+++ b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)";resolution:=
  org.eclipse.core.filesystem;bundle-version="[1.10.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.31.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/ResourceChangeListenerRegistrar.xml,
- OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml
+Service-Component: OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml,
+ OSGI-INF/org.eclipse.core.internal.resources.ResourceChangeListenerRegistrar.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.core.resources
 Import-Package: com.sun.jna;version="[5.14.0,6.0.0)",
diff --git a/resources/bundles/org.eclipse.core.resources/OSGI-INF/ResourceChangeListenerRegistrar.xml b/resources/bundles/org.eclipse.core.resources/OSGI-INF/ResourceChangeListenerRegistrar.xml
deleted file mode 100644
index f8a02cf8bac..00000000000
--- a/resources/bundles/org.eclipse.core.resources/OSGI-INF/ResourceChangeListenerRegistrar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.4.0" name="ResourceChangeListenerRegistrar" init="1">
-   <implementation class="org.eclipse.core.internal.resources.ResourceChangeListenerRegistrar"/>
-   <reference name="IWorkspace"
-    interface="org.eclipse.core.resources.IWorkspace" parameter="0"/>
-   <reference name="LoggerFactory"
-    interface="org.osgi.service.log.LoggerFactory"
-    bind="setLoggerFactory"
-    unbind="unsetLogger"
-    policy="dynamic"
-    cardinality="0..1"/>
-   <reference name="IResourceChangeListener"
-    interface="org.eclipse.core.resources.IResourceChangeListener"
-    bind="addResourceChangeListener"
-    unbind="removeResourceChangeListener"
-    policy="dynamic"
-    cardinality="1..n"/>
-</scr:component>
diff --git a/resources/bundles/org.eclipse.core.resources/OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml b/resources/bundles/org.eclipse.core.resources/OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml
deleted file mode 100644
index c2f80de0d0f..00000000000
--- a/resources/bundles/org.eclipse.core.resources/OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="register" deactivate="unregister" name="org.eclipse.core.internal.resources.CheckMissingNaturesListener">
-   <property name="event.mask" type="Integer" value="1"/>
-   <service>
-      <provide interface="org.eclipse.core.resources.IResourceChangeListener"/>
-   </service>
-   <reference cardinality="1..1" field="bundleScope" interface="org.eclipse.core.runtime.preferences.IScopeContext" name="bundleScope" target="(&amp;(objectClass=org.eclipse.core.runtime.preferences.IScopeContext)(type=bundle))"/>
-   <reference cardinality="1..1" field="log" interface="org.eclipse.core.runtime.ILog" name="log"/>
-   <reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
-   <implementation class="org.eclipse.core.internal.resources.CheckMissingNaturesListener"/>
-</scr:component>
\ No newline at end of file
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceChangeListenerRegistrar.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceChangeListenerRegistrar.java
index a5be6c39221..1181a45c176 100644
--- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceChangeListenerRegistrar.java
+++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceChangeListenerRegistrar.java
@@ -17,6 +17,11 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.osgi.service.debug.DebugOptionsListener;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.log.Logger;
 import org.osgi.service.log.LoggerFactory;
 
@@ -30,6 +35,7 @@
  * that (for example) {@link DebugOptionsListener} is used to receive callbacks.
  * </p>
  */
+@Component
 public final class ResourceChangeListenerRegistrar {
 
 	private final IWorkspace workspace;
@@ -40,7 +46,8 @@ public final class ResourceChangeListenerRegistrar {
 	 *
 	 * @param workspace the workspace to associate listeners with
 	 */
-	public ResourceChangeListenerRegistrar(IWorkspace workspace) {
+	@Activate
+	public ResourceChangeListenerRegistrar(@Reference IWorkspace workspace) {
 		this.workspace = workspace;
 	}
 
@@ -52,6 +59,7 @@ public ResourceChangeListenerRegistrar(IWorkspace workspace) {
 	 *                   required
 	 *                   {@link IWorkspace#addResourceChangeListener(IResourceChangeListener, int)}
 	 */
+	@Reference(policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.AT_LEAST_ONE)
 	public void addResourceChangeListener(IResourceChangeListener listener, Map<String, Object> properties) {
 		// TODO Add as public API https://bugs.eclipse.org/bugs/show_bug.cgi?id=564985
 		Object mask = properties.get(IResourceChangeListener.PROPERTY_EVENT_MASK);
@@ -81,6 +89,7 @@ public void removeResourceChangeListener(IResourceChangeListener listener) {
 	 *
 	 * @param factory the factory
 	 */
+	@Reference(unbind = "unsetLogger", policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.OPTIONAL)
 	public void setLoggerFactory(LoggerFactory factory) {
 		this.logger = factory.getLogger(ResourceChangeListenerRegistrar.class);
 	}
@@ -88,7 +97,7 @@ public void setLoggerFactory(LoggerFactory factory) {
 	/**
 	 * Unsets the logger generated from the associated logger factory
 	 */
-	public void unsetLogger() {
+	public void unsetLogger(LoggerFactory factory) {
 		this.logger = null;
 	}
 }
diff --git a/runtime/bundles/org.eclipse.core.contenttype/.gitignore b/runtime/bundles/org.eclipse.core.contenttype/.gitignore
new file mode 100644
index 00000000000..7bec98dd976
--- /dev/null
+++ b/runtime/bundles/org.eclipse.core.contenttype/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.xml
diff --git a/runtime/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.pde.ds.annotations.prefs b/runtime/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 00000000000..5faf08b7d5c
--- /dev/null
+++ b/runtime/bundles/org.eclipse.core.contenttype/.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/runtime/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF
index 5f20efa7593..a159c3f8a0d 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF
+++ b/runtime/bundles/org.eclipse.core.contenttype/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Import-Package: javax.xml.parsers,
  org.xml.sax.helpers
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.core.contenttype
-Service-Component: OSGI-INF/contenttypemanager.xml
+Service-Component: OSGI-INF/org.eclipse.core.internal.content.ContentTypeManager.xml
diff --git a/runtime/bundles/org.eclipse.core.contenttype/OSGI-INF/contenttypemanager.xml b/runtime/bundles/org.eclipse.core.contenttype/OSGI-INF/contenttypemanager.xml
deleted file mode 100644
index ec03cccf822..00000000000
--- a/runtime/bundles/org.eclipse.core.contenttype/OSGI-INF/contenttypemanager.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" immediate="true" name="org.eclipse.core.runtime.content.IContentTypeManager">
-   <implementation class="org.eclipse.core.internal.content.ContentTypeManager"/>
-   <service>
-      <provide interface="org.eclipse.core.runtime.content.IContentTypeManager"/>
-   </service>
-   <reference bind="addRegistryChangeListener" cardinality="0..1" interface="org.eclipse.core.runtime.IExtensionRegistry" name="IExtensionRegistry" policy="dynamic" unbind="removeRegistryChangeListener"/>
-</scr:component>
diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java
index 83d05492507..9acd67477f1 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeManager.java
@@ -16,15 +16,38 @@
 
 import java.io.InputStream;
 import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.content.*;
-import org.eclipse.core.runtime.preferences.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IRegistryChangeEvent;
+import org.eclipse.core.runtime.IRegistryChangeListener;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.core.runtime.ServiceCaller;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.content.IContentTypeManager;
+import org.eclipse.core.runtime.content.IContentTypeMatcher;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.osgi.service.debug.DebugOptions;
 import org.eclipse.osgi.util.NLS;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.prefs.BackingStoreException;
 
+@Component(service = IContentTypeManager.class, immediate = true)
 public class ContentTypeManager extends ContentTypeMatcher implements IContentTypeManager {
 	private static class ContentTypeRegistryChangeListener implements IRegistryChangeListener {
 		@Override
@@ -74,7 +97,7 @@ static class DebuggingHolder {
 	 */
 	protected final ListenerList<IContentTypeChangeListener> contentTypeListeners = new ListenerList<>();
 
-
+	@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC)
 	public void addRegistryChangeListener(IExtensionRegistry registry) {
 		if (registry == null)
 			return;
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/.gitignore b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/.gitignore
new file mode 100644
index 00000000000..7bec98dd976
--- /dev/null
+++ b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.xml
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml
deleted file mode 100644
index d40b841a2a9..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier">
-   <property name="dependency.injection.annotation" value="org.eclipse.e4.core.di.extensions.EventTopic"/>
-   <property name="event.topics" value="org/eclipse/e4/core/contexts/IEclipseContext/DISPOSE"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <reference bind="setEventAdmin" interface="org.osgi.service.event.EventAdmin" name="EventAdmin"/>
-   <implementation class="org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml
deleted file mode 100644
index 8de23ff2617..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier">
-   <property name="dependency.injection.annotation" value="org.eclipse.e4.core.di.extensions.OSGiBundle"/>
-   <property name="event.topics" value="org/eclipse/e4/core/contexts/IEclipseContext/DISPOSE"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <implementation class="org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml
deleted file mode 100644
index 4ec4c3fa204..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" deactivate="removeAllListeners" immediate="true" name="org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier">
-   <property name="dependency.injection.annotation" value="org.eclipse.e4.core.di.extensions.Preference"/>
-   <property name="event.topics" value="org/eclipse/e4/core/contexts/IEclipseContext/DISPOSE"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <reference bind="setPreferencesService" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="PreferencesService"/>
-   <implementation class="org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.ServiceSupplier.xml b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.ServiceSupplier.xml
deleted file mode 100644
index e9baf7bf3a7..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/OSGI-INF/org.eclipse.e4.core.di.internal.extensions.ServiceSupplier.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" deactivate="deactivate" name="org.eclipse.e4.core.di.internal.extensions.ServiceSupplier">
-   <property name="dependency.injection.annotation" value="org.eclipse.e4.core.di.extensions.Service"/>
-   <property name="event.topics" value="org/eclipse/e4/core/contexts/IEclipseContext/DISPOSE"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <reference bind="setLogger" cardinality="0..1" interface="org.osgi.service.log.LoggerFactory" name="Logger" policy="dynamic" unbind="unsetLogger"/>
-   <implementation class="org.eclipse.e4.core.di.internal.extensions.ServiceSupplier"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/.gitignore b/runtime/bundles/org.eclipse.e4.core.services/.gitignore
new file mode 100644
index 00000000000..7bec98dd976
--- /dev/null
+++ b/runtime/bundles/org.eclipse.e4.core.services/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.xml
diff --git a/runtime/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.pde.ds.annotations.prefs b/runtime/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 00000000000..5faf08b7d5c
--- /dev/null
+++ b/runtime/bundles/org.eclipse.e4.core.services/.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/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
index c4e40579c16..59d8f554080 100644
--- a/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -43,7 +43,14 @@ Export-Package: org.eclipse.e4.core.internal.services;x-friends:="org.eclipse.e4
  org.eclipse.e4.core.services.statusreporter;x-friends:="org.eclipse.e4.ui.workbench.swt,org.eclipse.e4.ui.progress,org.eclipse.ui.ide",
  org.eclipse.e4.core.services.translation
 Eclipse-ExtensibleAPI: true
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.TranslationObjectSupplier.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledBundles.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledFeatures.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemEnvironment.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemProperties.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.services.about.UserPreferences.xml
 Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))"
 Automatic-Module-Name: org.eclipse.e4.core.services
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider.xml
deleted file mode 100644
index 926495951d4..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider.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" name="org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider">
-   <service>
-      <provide interface="org.eclipse.e4.core.services.translation.ResourceBundleProvider"/>
-   </service>
-   <reference bind="setBundleLocalization" cardinality="1..1" interface="org.eclipse.osgi.service.localization.BundleLocalization" name="BundleLocalization" policy="static"/>
-   <implementation class="org.eclipse.e4.core.internal.services.DefaultResourceBundleProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl.xml
deleted file mode 100644
index 8c65d6194f1..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl.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" name="org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl">
-   <service>
-      <provide interface="org.eclipse.e4.core.services.nls.IMessageFactoryService"/>
-   </service>
-   <reference bind="setLogger" cardinality="0..1" interface="org.osgi.service.log.LoggerFactory" name="Logger" policy="dynamic" unbind="unsetLogger"/>
-   <implementation class="org.eclipse.e4.core.internal.services.MessageFactoryServiceImpl"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.TranslationObjectSupplier.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.TranslationObjectSupplier.xml
deleted file mode 100644
index 610275651fa..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.TranslationObjectSupplier.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.core.internal.services.TranslationObjectSupplier">
-   <property name="dependency.injection.annotation" type="String" value="org.eclipse.e4.core.services.nls.Translation"/>
-   <property name="event.topics" value="org/eclipse/e4/core/contexts/IEclipseContext/DISPOSE"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <implementation class="org.eclipse.e4.core.internal.services.TranslationObjectSupplier"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledBundles.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledBundles.xml
deleted file mode 100644
index cb45d50b718..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledBundles.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" name="org.eclipse.e4.core.internal.services.about.InstalledBundles">
-   <property name="section" value="section.installed.bundles"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.services.about.ISystemInformation"/>
-   </service>
-   <implementation class="org.eclipse.e4.core.internal.services.about.InstalledBundles"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledFeatures.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledFeatures.xml
deleted file mode 100644
index a7a0b05115b..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.InstalledFeatures.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.core.internal.services.about.InstalledFeatures">
-   <property name="section" value="section.installed.features"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.services.about.ISystemInformation"/>
-   </service>
-   <reference bind="bindBundleProvider" cardinality="0..n" interface="org.eclipse.core.runtime.IBundleGroupProvider" name="BundleProvider" unbind="unbindBundleProvider"/>
-   <implementation class="org.eclipse.e4.core.internal.services.about.InstalledFeatures"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemEnvironment.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemEnvironment.xml
deleted file mode 100644
index b926533473b..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemEnvironment.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" name="org.eclipse.e4.core.internal.services.about.SystemEnvironment">
-   <property name="section" value="section.system.environment"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.services.about.ISystemInformation"/>
-   </service>
-   <implementation class="org.eclipse.e4.core.internal.services.about.SystemEnvironment"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemProperties.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemProperties.xml
deleted file mode 100644
index ac8167a7ec0..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.SystemProperties.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" name="org.eclipse.e4.core.internal.services.about.SystemProperties">
-   <property name="section" value="section.system.properties"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.services.about.ISystemInformation"/>
-   </service>
-   <implementation class="org.eclipse.e4.core.internal.services.about.SystemProperties"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.UserPreferences.xml b/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.UserPreferences.xml
deleted file mode 100644
index 4cb8bbdb413..00000000000
--- a/runtime/bundles/org.eclipse.e4.core.services/OSGI-INF/org.eclipse.e4.core.internal.services.about.UserPreferences.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.core.internal.services.about.UserPreferences">
-   <property name="section" value="section.user.preferences"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.services.about.ISystemInformation"/>
-   </service>
-   <reference bind="bindPreferencesService" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="PreferencesService"/>
-   <implementation class="org.eclipse.e4.core.internal.services.about.UserPreferences"/>
-</scr:component>
\ No newline at end of file
diff --git a/runtime/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java b/runtime/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java
index a10216d2f55..c35d91a2b32 100644
--- a/runtime/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java
+++ b/runtime/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/DefaultResourceBundleProvider.java
@@ -19,6 +19,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 
 /**
  * Default implementation of {@link ResourceBundleProvider} that simply delegates to the
@@ -45,7 +47,7 @@ public ResourceBundle getResourceBundle(Bundle bundle, String locale) {
 	 *            The {@link BundleLocalization} that should be set to this
 	 *            {@link ResourceBundleProvider}
 	 */
-	@Reference
+	@Reference(cardinality = ReferenceCardinality.MANDATORY, policy = ReferencePolicy.STATIC)
 	void setBundleLocalization(BundleLocalization localization) {
 		this.localization = localization;
 	}
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF
index 6d8998c977d..b2d11dc688b 100644
--- a/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF
@@ -37,7 +37,17 @@ Export-Package: org.eclipse.e4.core.internal.tests;x-internal:=true,
  org.eclipse.e4.core.internal.tests.manual;x-internal:=true,
  org.eclipse.e4.core.internal.tests.nls;x-internal:=true,
  org.eclipse.e4.core.javax.tests
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/DisabledServiceA.xml,
+ OSGI-INF/DisabledServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.AddContextFunction.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceController.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.ComponentEnabler.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceB.xml
 Eclipse-BundleShape: dir
 Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))",
diff --git a/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
index d7b22dec326..50ace117ed1 100644
--- a/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
@@ -40,7 +40,17 @@ Export-Package: org.eclipse.e4.core.internal.tests;x-internal:=true,
  org.eclipse.e4.core.internal.tests.manual;x-internal:=true,
  org.eclipse.e4.core.internal.tests.nls;x-internal:=true,
  org.eclipse.e4.core.tests
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/DisabledServiceA.xml,
+ OSGI-INF/DisabledServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.AddContextFunction.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceController.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.ComponentEnabler.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceB.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceA.xml,
+ OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceB.xml
 Eclipse-BundleShape: dir
 Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))",
diff --git a/ua/org.eclipse.tips.ide/.gitignore b/ua/org.eclipse.tips.ide/.gitignore
index 09e3bc9b241..7bec98dd976 100644
--- a/ua/org.eclipse.tips.ide/.gitignore
+++ b/ua/org.eclipse.tips.ide/.gitignore
@@ -1,2 +1 @@
-/bin/
-/target/
+/OSGI-INF/org.eclipse.*.xml
diff --git a/ua/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml b/ua/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml
deleted file mode 100644
index c2c44d0941d..00000000000
--- a/ua/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.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" name="org.eclipse.tips.ide.internal.TipsStartupService">
-   <property name="event.topics" value="org/eclipse/e4/ui/LifeCycle/appStartupComplete"/>
-   <service>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <implementation class="org.eclipse.tips.ide.internal.TipsStartupService"/>
-</scr:component>
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/.gitignore b/update/org.eclipse.update.configurator/.gitignore
new file mode 100644
index 00000000000..14435d8efa9
--- /dev/null
+++ b/update/org.eclipse.update.configurator/.gitignore
@@ -0,0 +1 @@
+OSGI-INF/org.eclipse.*.xml
diff --git a/update/org.eclipse.update.configurator/.settings/org.eclipse.pde.ds.annotations.prefs b/update/org.eclipse.update.configurator/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 00000000000..5faf08b7d5c
--- /dev/null
+++ b/update/org.eclipse.update.configurator/.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/update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml b/update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
deleted file mode 100644
index ef4b7b22e05..00000000000
--- a/update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.update.internal.configurator.BundleGroupComponent">
-   <service>
-      <provide interface="org.eclipse.core.runtime.IBundleGroupProvider"/>
-   </service>
-   <implementation class="org.eclipse.update.internal.configurator.BundleGroupComponent"/>
-</scr:component>
\ No newline at end of file