diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk
index 82df4d8fda0..5f594a8388a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk	
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk	
@@ -4,4 +4,5 @@
 
 LIBS := -llib1
 
-USER_OBJS := uo1
\ No newline at end of file
+USER_OBJS := uo1
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk
index 856c1491748..913b396275f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk	
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk	
@@ -2,22 +2,22 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
+O_SRCS := 
+CPP_SRCS := 
 C_UPPER_SRCS := 
 C_SRCS := 
-CPP_SRCS := 
-O_SRCS := 
-ASM_SRCS := 
-S_SRCS := 
-C++_SRCS := 
-CXX_SRCS := 
-CC_SRCS := 
+S_UPPER_SRCS := 
 OBJ_SRCS := 
+ASM_SRCS := 
+CXX_SRCS := 
+C++_SRCS := 
+CC_SRCS := 
 OBJS := 
 C++_DEPS := 
-EXECUTABLES := 
-CC_DEPS := 
 C_DEPS := 
+CC_DEPS := 
 CPP_DEPS := 
+EXECUTABLES := 
 CXX_DEPS := 
 C_UPPER_DEPS := 
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java
index d25951bb94f..c897890b1bf 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java
@@ -61,7 +61,15 @@ public class BuildSystem40Tests  extends TestCase {
 				 "makefile", 
 				 "objects.mk", 
 				 "sources.mk", 
-				 "subdir.mk"};
+				 "d1/subdir.mk",
+				 "d1/d2/subdir.mk",
+				 "d1/d2/d3/subdir.mk",
+				 "d1_1/subdir.mk",
+				 "d1_1/d2_1/subdir.mk",
+				 "dir1/dd/excluded_c/subdir.mk",
+				 "dir1/dd/excluded_c/asd/subdir.mk",
+				 "dir1/dd/ff/subdir.mk",
+			};
 //		doTest("test_40", "dbg 2");
 		IProject[] projects = createProjects("test_40", null, null, true);
 		ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
@@ -87,7 +95,7 @@ public class BuildSystem40Tests  extends TestCase {
 		ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp");
 		IFolderInfo foInfo = cfg.getRootFolderInfo();
 		Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp");
-		IOption option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0];
+		IOption option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
 		OptionStringValue[] value = option.getBasicStringListValueElements();
 		ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
 		ICLanguageSettingEntry[] expectedEntries = new ICLanguageSettingEntry[] {
@@ -311,7 +319,7 @@ public class BuildSystem40Tests  extends TestCase {
 		ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp");
 		IFolderInfo foInfo = cfg.getRootFolderInfo();
 		Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp");
-		IOption option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0];
+		IOption option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
 		OptionStringValue[] value = option.getBasicStringListValueElements();
 		ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
 		
@@ -329,7 +337,7 @@ public class BuildSystem40Tests  extends TestCase {
 		BuildSystemTestHelper.checkDiff(expectedEntries, entries);
 		
 		ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries);
-		assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]);
+		assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
 		value = option.getBasicStringListValueElements();
 		entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
 		
@@ -349,7 +357,7 @@ public class BuildSystem40Tests  extends TestCase {
 		
 		ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list);
 		
-		assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]);
+		assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
 		
 		value = option.getBasicStringListValueElements();
 		entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@@ -361,7 +369,7 @@ public class BuildSystem40Tests  extends TestCase {
 		//testing one-way converter
 		ls = foDes.getLanguageSettingForFile("foo.c");
 		tool = (Tool)foInfo.getToolFromInputExtension("c");
-		option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0];
+		option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
 		value = option.getBasicStringListValueElements();
 		entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
 		
@@ -379,7 +387,7 @@ public class BuildSystem40Tests  extends TestCase {
 		BuildSystemTestHelper.checkDiff(expectedEntries, entries);
 		
 		ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries);
-		assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]);
+		assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
 		value = option.getBasicStringListValueElements();
 		entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
 		
@@ -404,7 +412,7 @@ public class BuildSystem40Tests  extends TestCase {
 		
 		ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list);
 		
-		assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]);
+		assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
 		
 		value = option.getBasicStringListValueElements();
 		entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);