diff --git a/core/org.eclipse.cdt.core/search/ChangeLog b/core/org.eclipse.cdt.core/search/ChangeLog
index 149b71a011f..9938dbd6603 100644
--- a/core/org.eclipse.cdt.core/search/ChangeLog
+++ b/core/org.eclipse.cdt.core/search/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-24 Bogdan Gheorghe
+	Fix for 66695: [Indexer] Manually add an include path to a file/folder 
+	is ignored by indexer
+	
+	* search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
+	
 2004-06-22 Alain Magloire
 	Part of PR 68246.
 	Close the inputstream to release resource handle
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
index d7b4bd9fe0b..4977027db5f 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
@@ -449,7 +449,7 @@ public class MatchLocator implements IMatchLocator{
 			IScannerInfo scanInfo = new ScannerInfo();
 			IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
 			if (provider != null){
-				IScannerInfo buildScanInfo = provider.getScannerInformation(project);
+				IScannerInfo buildScanInfo = provider.getScannerInformation(currentResource != null ? currentResource : project);
 				if( buildScanInfo != null )
 					scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
 			}
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 73efa486428..ad7ea84280e 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-24 Bogdan Gheorghe
+	Fix for 66695: [Indexer] Manually add an include path to a file/folder is ignored
+	Changed CompletionEngine getScannerInfo to get the info from a resource instead of 
+	a project in order to get a complete list of include paths
+	
+	* src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
+	* src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
+	
+	
 2004-06-24 Tanya Wolff
 	Fix for PR 60299: Accessibility: Lost children in Binary Parser properties dialog
 	Switched the binary parsers Options group with its child composite so the
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
index 34e18c22a25..b94eb12b43a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
@@ -68,12 +68,14 @@ public class SelectionParseAction extends Action {
 	}
 
 	protected IParser setupParser(IFile resourceFile) {
+		
+
 		//Get the scanner info
 		IProject currentProject = resourceFile.getProject();
 		IScannerInfo scanInfo = new ScannerInfo();
 		IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(currentProject);
 		if (provider != null){
-		  IScannerInfo buildScanInfo = provider.getScannerInformation(currentProject);
+		  IScannerInfo buildScanInfo = provider.getScannerInformation(resourceFile);
 		  if (buildScanInfo != null){
 			scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
 		  }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
index 76fc7159a33..5baf2cd5e74 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
@@ -156,7 +156,7 @@ public class CompletionEngine implements RelevanceConstants {
 		IScannerInfo scanInfo = new ScannerInfo();
 		IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
 		if (provider != null){
-			IScannerInfo buildScanInfo = provider.getScannerInformation(project);
+			IScannerInfo buildScanInfo = provider.getScannerInformation(currentResource);
 			if( buildScanInfo != null )
 				scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
 		}