diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java
index c0b6a07f269..82576e5f21b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java
@@ -45,7 +45,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 	
 	@Override
 	public IScannerInfo getBuildConfiguration(int linkageID, Object tu) {
-		return fIndexer.getScannerInfo((String)tu);
+		return fIndexer.getScannerInfo(tu.toString());
 	}
 
 	@Override
@@ -65,7 +65,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 
 	@Override
 	public boolean isSourceUnit(Object tu) {
-		return isValidSourceUnitName((String) tu);
+		return isValidSourceUnitName(tu.toString());
 	}
 	
 	@Override
@@ -85,7 +85,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 
 	@Override
 	public IIndexFileLocation resolveFile(Object tu) {
-		return resolveASTPath((String) tu);
+		return resolveASTPath(tu.toString());
 	}
 
 	@Override
@@ -137,7 +137,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 
 	@Override
 	public boolean isFileBuildConfigured(Object tu) {
-		return isValidSourceUnitName((String) tu);
+		return isValidSourceUnitName(tu.toString());
 	}
 
 	@Override
@@ -147,7 +147,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 
 	@Override
 	public FileContent getCodeReader(Object tu) {
-		String stu = (String) tu;
+		String stu = tu.toString();
 		String fileEncoding = getFileEncoding(stu);
 
 		return FileContent.createForExternalFileLocation(stu, fileEncoding);
@@ -173,7 +173,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter {
 
 	@Override
 	public AbstractLanguage[] getLanguages(Object tu, boolean bothForHeaders) {
-		ILanguage language = fIndexer.getLanguageMapper().getLanguage((String) tu);
+		ILanguage language = fIndexer.getLanguageMapper().getLanguage(tu.toString());
 		if (language instanceof AbstractLanguage) {
 			return new AbstractLanguage[] {(AbstractLanguage) language};
 		}