diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index 8161dd7b56b..6a97a2ad171 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-01 Andrew Niefer
+	added testBug43450 to ManagedBuildTests.java
+	added a user include to plugin.xml
+
 2003-09-30 Sean Evoy
 	Fix for bug 41826.
 	Updated the plugin file so that tool specifications have the new attribute 
diff --git a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java
index 4a933236193..b9c08a26b41 100644
--- a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java
+++ b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java
@@ -10,6 +10,8 @@
  **********************************************************************/
 package org.eclipse.cdt.core.build.managed.tests;
 
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -20,9 +22,16 @@ import junit.framework.TestSuite;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.parser.IParser;
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
 import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.core.parser.ISourceElementRequestor;
+import org.eclipse.cdt.core.parser.ParserFactory;
+import org.eclipse.cdt.core.parser.ParserLanguage;
+import org.eclipse.cdt.core.parser.ParserMode;
+import org.eclipse.cdt.internal.core.parser.NullSourceElementRequestor;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
@@ -34,6 +43,9 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
 import org.eclipse.cdt.managedbuilder.internal.core.OptionReference;
 import org.eclipse.cdt.managedbuilder.internal.core.ToolReference;
+import org.eclipse.cdt.testplugin.FileManager;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
@@ -71,6 +83,7 @@ public class ManagedBuildTests extends TestCase {
 		suite.addTest(new ManagedBuildTests("testTargetBuildArtifact"));
 		suite.addTest(new ManagedBuildTests("testMakeCommandManipulation"));
 		suite.addTest(new ManagedBuildTests("testScannerInfoInterface"));
+		suite.addTest(new ManagedBuildTests("testBug43450"));
 		suite.addTest(new ManagedBuildTests("cleanup"));
 		
 		return suite;
@@ -154,14 +167,6 @@ public class ManagedBuildTests extends TestCase {
 	 * @throws CoreException
 	 */
 	public void testScannerInfoInterface(){
-		// These are the expected path settings
-		final String[] expectedPaths = new String[4];
-		// This first path is a built-in, so it will not be manipulated by build manager
-	 	expectedPaths[0] = "/usr/gnu/include";
-		expectedPaths[1] = (new Path("/usr/include")).toOSString();
-		expectedPaths[2] = (new Path("/opt/gnome/include")).toOSString();
-		expectedPaths[3] = (new Path("C:\\home\\tester/include")).toOSString();
-		
 		// Open the test project
 		IProject project = null;
 		try {
@@ -170,6 +175,15 @@ public class ManagedBuildTests extends TestCase {
 			fail("Failed to open project in 'testScannerInfoInterface': " + e.getLocalizedMessage());
 		}
 		
+		//These are the expected path settings
+		 final String[] expectedPaths = new String[5];
+		 // This first path is a built-in, so it will not be manipulated by build manager
+		 expectedPaths[0] = "/usr/gnu/include";
+		 expectedPaths[1] = (new Path("/usr/include")).toOSString();
+		 expectedPaths[2] = (new Path("/opt/gnome/include")).toOSString();
+		 expectedPaths[3] = (new Path("C:\\home\\tester/include")).toOSString();
+		 expectedPaths[4] = project.getLocation().append( "Sub Config\\\"..\\includes\"" ).toOSString();
+		 
 		// Create a new target in the project based on the sub target
 		ITarget baseTarget = ManagedBuildManager.getTarget(project, "test.sub");
 		assertNotNull(baseTarget);
@@ -845,7 +859,7 @@ public class ManagedBuildTests extends TestCase {
 		assertEquals("More Includes", subOpts[2].getName());
 		assertEquals(IOption.INCLUDE_PATH, subOpts[2].getValueType());
 		String[] moreIncPath = subOpts[2].getIncludePaths();
-		assertEquals(1, moreIncPath.length);
+		assertEquals(2, moreIncPath.length);
 		assertEquals("C:\\home\\tester/include", moreIncPath[0]);
 		assertEquals("-I", subOpts[2].getCommand());
 		// Check the user object option
@@ -956,4 +970,30 @@ public class ManagedBuildTests extends TestCase {
 		assertTrue(false);
 	}
 	
+	public void testBug43450 () throws Exception{
+		IProject project = createProject( projectName );
+		
+		FileManager fileManager = new FileManager();
+
+		IFolder folder = project.getProject().getFolder( "includes" );
+		if( !folder.exists() ){
+			folder.create( false, true, null );
+		}
+		
+		IFile file = project.getProject().getFile( "includes/header.h" );
+		if( !file.exists()   ){
+			file.create( new ByteArrayInputStream( "class A { public : static int i; };".getBytes() ), false, null );
+		}
+		
+		IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
+		IScannerInfo info = provider.getScannerInformation( project );
+		ISourceElementRequestor callback = new NullSourceElementRequestor();
+		
+		IScanner scanner = ParserFactory.createScanner( new StringReader( "#include <header.h>\n int A::i = 1;" ), 
+														"TEST", info, ParserMode.COMPLETE_PARSE, ParserLanguage.CPP, callback );
+		
+		IParser parser = ParserFactory.createParser( scanner, callback, ParserMode.COMPLETE_PARSE, ParserLanguage.CPP );
+		assertTrue( parser.parse() );
+	}
+	
 }
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index c1343638115..0bd04471848 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -200,6 +200,10 @@
                      value="C:\home\tester/include"
                      builtIn="false">
                </listOptionValue>
+               <listOptionValue
+		             value="&quot;../includes&quot;"
+                     builIn="false">
+               </listOptionValue>
             </option>
             <option
                   name="User Objects"
diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog b/core/org.eclipse.cdt.core/parser/ChangeLog
index a0d7ddd52c2..8e5a9c90ff9 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog
@@ -1,3 +1,6 @@
+2003-10-01 Andrew Niefer
+	bug43450 - Scanner needs to handle include paths that contain quotes
+
 2003-09-30 Bogdan Gheorghe
 	Added CDT log dump  in Parser.fetchToken to catch HandleInclusion failures
 2003-09-30 John Camelon
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
index f78b6e42753..9bb7f1ae2fc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
@@ -303,6 +303,16 @@ public class Scanner implements IScanner {
 			while (iter.hasNext()) {
 	
 				File pathFile = (File)iter.next();
+				String path = pathFile.getPath();
+				if( !pathFile.exists() && path.indexOf('\"') != -1 )
+				{
+					StringTokenizer tokenizer = new StringTokenizer(path, "\"" );	//$NON-NLS-1$
+					StringBuffer buffer = new StringBuffer(path.length() );
+					while( tokenizer.hasMoreTokens() ){
+						buffer.append( tokenizer.nextToken() );
+					}
+					pathFile = new File( buffer.toString() );
+				}
 				if (pathFile.isDirectory()) {
 					newPath = pathFile.getPath() + File.separatorChar + fileName;
 					File includeFile = new File(newPath);