diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java
index 0670a028c56..e8fcac80852 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2009 IBM Corporation and others.
+ *  Copyright (c) 2004, 2010 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -881,7 +881,7 @@ public class ScannerConfigInfoFactory2 {
 				ScannerConfigProfile configuredProfile = ScannerConfigProfileManager.getInstance().
 						getSCProfileConfiguration(selectedProfile);
 				// get the one and only provider id
-				String providerId = (String) configuredProfile.getSIProviderIds().get(0);
+				String providerId = configuredProfile.getSIProviderIds().get(0);
                 po.providerOptionsMap = new LinkedHashMap<String, ProfileOptions.ProviderOptions>(1);
 				po.providerOptionsMap.put(providerId, ppo);
                 
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
index f2beefd005c..b02ac09562f 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2009 IBM Corporation and others.
+ *  Copyright (c) 2004, 2010 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -122,6 +122,7 @@ public class ScannerConfigProfile {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider()
 		 */
+		@Override
 		public Object createExternalScannerInfoProvider() {
 			Object provider = super.createExternalScannerInfoProvider();
 			if (provider == null) {
@@ -146,6 +147,7 @@ public class ScannerConfigProfile {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager.IAction#getNewExternalScannerInfoProvider()
 		 */
+		@Override
 		public Object createExternalScannerInfoProvider() {
 			Object provider = super.createExternalScannerInfoProvider();
 			if (provider == null) {
@@ -233,7 +235,7 @@ public class ScannerConfigProfile {
 	
 	private ScannerInfoCollector scannerInfoCollector;
 	private BuildOutputProvider buildOutputProvider;
-	private Map scannerInfoProviders = new LinkedHashMap();
+	private Map<String, ScannerInfoProvider> scannerInfoProviders = new LinkedHashMap<String, ScannerInfoProvider>();
 	
 	private Boolean supportsContext;
 
@@ -289,8 +291,8 @@ public class ScannerConfigProfile {
 	/**
 	 * @return Returns the list of providerIds
 	 */
-	public List getSIProviderIds() {
-		return new ArrayList(scannerInfoProviders.keySet());
+	public List<String> getSIProviderIds() {
+		return new ArrayList<String>(scannerInfoProviders.keySet());
 	}
 	/**
 	 * @return Returns the buildOutputProvider.
@@ -322,7 +324,7 @@ public class ScannerConfigProfile {
 	 * @return Returns the scannerInfoProviders.
 	 */
 	public ScannerInfoProvider getScannerInfoProviderElement(String providerId) {
-		return (ScannerInfoProvider) scannerInfoProviders.get(providerId);
+		return scannerInfoProviders.get(providerId);
 	}
 	
 	public boolean supportsContext(){