--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Fri Jun 11 11:35:13 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Fri Jun 11 12:09:52 2010 -0500
@@ -66,7 +66,7 @@
 	private ISBSv2BuildInfo getBuildInfo() {
 		ISBSv2BuildInfo buildInfo = (ISBSv2BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
 		if (buildInfo == null) {
-			buildInfo = new SBSv2BuildInfo();
+			buildInfo = new SBSv2BuildInfo(getSDK());
 			((SymbianSDK)getSDK()).setBuildInfo(buildInfo, ISymbianBuilderID.SBSV2_BUILDER);
 		}
 		return buildInfo;
@@ -85,7 +85,7 @@
 		String dirName = getDefFileDirectoryNameForPlatform(platform);
 		if (dirName == null) {
 			// check BSF's
-			IBSFCatalog catalog = getBuildInfo().getBSFCatalog(getSDK());
+			IBSFCatalog catalog = getBuildInfo().getBSFCatalog();
 	    	if (catalog != null) {
 	    		for (IBSFPlatform plat : catalog.getPlatforms()) {
 	    			if (plat.getName().compareToIgnoreCase(platform) == 0) {
@@ -136,7 +136,7 @@
 			return getRVCTPrefixFilePath();
 		} else {
 			// check BSF's
-			IBSFCatalog catalog = getBuildInfo().getBSFCatalog(getSDK());
+			IBSFCatalog catalog = getBuildInfo().getBSFCatalog();
 	    	if (catalog != null) {
 	    		for (IBSFPlatform plat : catalog.getPlatforms()) {
 	    			if (plat.getName().compareToIgnoreCase(platform) == 0) {
@@ -164,7 +164,7 @@
 	}
 	
 	private IPath getIncludePath() {
-		return getBuildInfo().getIncludePath(getSDK());
+		return getSDK().getIncludePath();
 	}
 
 	private IPath getGCCEPrefixFilePath() {