diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java
index bdb9050cce8..9172558c62f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java
@@ -125,7 +125,7 @@ public class ManagedOptionValueHandler implements
 					break;
 				case IOption.INCLUDE_PATH:
 				case IOption.UNDEF_INCLUDE_PATH:
-					if (Arrays.equals(option.getIncludePaths(), (String[])defaultValue)) {
+					if (Arrays.equals(option.getBasicStringListValue(), (String[])defaultValue)) {
 						return true;
 					}
 					break;
@@ -136,7 +136,7 @@ public class ManagedOptionValueHandler implements
 					break;
 				case IOption.PREPROCESSOR_SYMBOLS:
 				case IOption.UNDEF_PREPROCESSOR_SYMBOLS:
-					if (Arrays.equals(option.getDefinedSymbols(), (String[])defaultValue)) {
+					if (Arrays.equals(option.getBasicStringListValue(), (String[])defaultValue)) {
 						return true;
 					}
 					break;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index c45d335566e..90d809c22cc 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -2595,7 +2595,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
 								new FileContextData(inputFileLocation, outputFileLocation, option, this));
 						if(info != null){
 							macroSubstitutor.setMacroContextInfo(info);
-							String[] list = CdtVariableResolver.resolveStringListValues(option.getStringListValue(), macroSubstitutor, true);
+							String[] list = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
 							if(list != null){
 								for (int j = 0; j < list.length; j++) {
 									String temp = list[j];
@@ -2614,7 +2614,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
 							new FileContextData(inputFileLocation, outputFileLocation, option, this));
 					if(info != null) {
 						macroSubstitutor.setMacroContextInfo(info);
-						String[] paths = CdtVariableResolver.resolveStringListValues(option.getIncludePaths(), macroSubstitutor, true);
+						String[] paths = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
 						if(paths != null){
 							for (int j = 0; j < paths.length; j++) {
 								String temp = paths[j];
@@ -2633,7 +2633,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
 							new FileContextData(inputFileLocation, outputFileLocation, option, this));
 					if(info != null){
 						macroSubstitutor.setMacroContextInfo(info);
-						String[] symbols = CdtVariableResolver.resolveStringListValues(option.getDefinedSymbols(), macroSubstitutor, true);
+						String[] symbols = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
 						if(symbols != null){
 							for (int j = 0; j < symbols.length; j++) {
 								String temp = symbols[j];