diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java
index e9fd6c27ce5..961c57a3aa9 100644
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java
+++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java
@@ -810,7 +810,7 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch
         IFile h = importFile( "FunctionDefinition.h", header ); //$NON-NLS-1$
         
         writer = new StringWriter();
-        writer.write("#include \"FunctionDeclaration.h\"\n" ); //$NON-NLS-1$
+        writer.write("#include \"FunctionDefinition.h\"\n" ); //$NON-NLS-1$
         writer.write("int f2/*def*/(){return 2;}		\n" ); //$NON-NLS-1$
         writer.write("void f5/*def*/(){					\n" ); //$NON-NLS-1$
         writer.write("	int i = N::f1();				\n" ); //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
index 2d5c8838adf..c9cdda44007 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
@@ -2885,7 +2885,7 @@ abstract class BaseScanner implements IScanner {
         // if not found by this point, and the inclusion is local, try just the 
         // path as is (bug 91086)
         
-        if( local )
+        if( local && !include_next )
         {
             reader = createReader( EMPTY_STRING, filename );
             if (reader != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerUtility.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerUtility.java
index 60eb4babe83..0e89348d56a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerUtility.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerUtility.java
@@ -80,8 +80,12 @@ public class ScannerUtility {
 	 */
 	public static String createReconciledPath(String path, String fileName) {
 		//TODO assert pathFile.isDirectory();	
-		StringBuffer newPathBuffer = new StringBuffer( new File(path).getPath() );
-		newPathBuffer.append( File.separatorChar );
+		StringBuffer newPathBuffer = new StringBuffer();
+        if( ! path.equals( "" )) //$NON-NLS-1$
+        {
+            newPathBuffer.append( new File(path).getPath() );
+            newPathBuffer.append( File.separatorChar );
+        }
 		newPathBuffer.append( fileName );
 		//remove ".." and "." segments
 		return reconcilePath( newPathBuffer.toString() );