diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ExpansionExplorerTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ExpansionExplorerTests.java
index c2aa283b43d..900160c610b 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ExpansionExplorerTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ExpansionExplorerTests.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.tests.scanner;
 
-import junit.framework.TestSuite;
-
 import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
 import org.eclipse.cdt.core.parser.FileContent;
-import org.eclipse.cdt.core.parser.IncludeFileContentProvider;
 import org.eclipse.cdt.core.parser.IToken;
+import org.eclipse.cdt.core.parser.IncludeFileContentProvider;
 import org.eclipse.cdt.core.parser.NullLogService;
 import org.eclipse.cdt.core.parser.OffsetLimitReachedException;
 import org.eclipse.cdt.core.parser.ParserLanguage;
@@ -28,6 +26,8 @@ import org.eclipse.cdt.internal.core.parser.scanner.MacroExpander;
 import org.eclipse.cdt.internal.core.parser.scanner.MacroExpansionTracker;
 import org.eclipse.text.edits.ReplaceEdit;
 
+import junit.framework.TestSuite;
+
 
 public class ExpansionExplorerTests extends BaseTestCase {
 	
@@ -90,7 +90,7 @@ public class ExpansionExplorerTests extends BaseTestCase {
 		do {
 			type= cpp.nextTokenRaw().getType();
 		} while (type != IToken.tEND_OF_INPUT);
-		return (MacroExpander) cpp.getAdapter(MacroExpander.class);
+		return cpp.getAdapter(MacroExpander.class);
 	}
 	
 	// #define A
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
index 4723d198c35..6466810c77c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
@@ -1954,10 +1954,10 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
 	}
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Object getAdapter(Class adapter) {
+	@SuppressWarnings("unchecked")
+	public <T> T getAdapter(Class<T> adapter) {
 		if (adapter.isAssignableFrom(fMacroExpander.getClass())) {
-			return fMacroExpander;
+			return (T) fMacroExpander;
 		}
 		return null;
 	}