diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
index e75f96ecd13..67ed0041618 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
@@ -47,7 +47,7 @@ abstract public class AbstractDsfService
     private DsfServicesTracker fTracker;
     
     /** Properties that this service was registered with */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     private Dictionary fProperties;
 
     /** Properties that this service was registered with */
@@ -74,7 +74,7 @@ abstract public class AbstractDsfService
 	 * 
 	 * @see org.eclipse.cdt.dsf.service.IDsfService#getProperties()
 	 */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public Dictionary getProperties() { return fProperties; }
     
     public String getServiceFilter() { return fFilter; }
@@ -135,7 +135,7 @@ abstract public class AbstractDsfService
 	 *            (we modify the caller's object), to record the id of the dsf
 	 *            session associated with the service.
 	 */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     protected void register(String[] classes, Dictionary properties) {
     	
     	/*
@@ -212,7 +212,7 @@ abstract public class AbstractDsfService
     /**
      * Generates an LDAP filter to uniquely identify this service.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes" })
     private String generateFilter(Dictionary properties) {
         StringBuffer filter = new StringBuffer();
         filter.append("(&"); //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
index 8ba4ba45e40..c796409ba44 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
@@ -163,7 +163,7 @@ public class DsfServicesTracker {
      * session-ID 
      * @return OSGI service reference object to the desired service, null if not found
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public ServiceReference getServiceReference(Class serviceClass, String filter) {
         if (fDisposed) {
             return null;
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/IDsfService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/IDsfService.java
index 40004c13790..e6270eda77b 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/IDsfService.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/IDsfService.java
@@ -60,7 +60,7 @@ public interface IDsfService {
     /**
      * Returns the map of properties that this service was registered with.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public Dictionary getProperties();
     
     /**