diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index c6aa1935052..1ac7d089e73 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12 Alain Magloire
+	For the per file container, make sure we clean the project info.
+	* model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+	* model/org/eclipse/cdt/core/model/IPathEntryContaienrExtension.java
+
 2005-05-10 Vladimir Hirsl
 	Fix for PR 94500: [Path Entry] Problem marker: Invalid project path: DISCOVERED_SCANNER_INFO
 	
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
index dcf4a3353b0..b230e647b76 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
@@ -18,26 +18,14 @@ import org.eclipse.core.runtime.IPath;
  */
 public interface IPathEntryContainerExtension extends IPathEntryContainer {
 
+	/**
+	 * Returns the set of entries associated with the resource
+	 * and empty array if none.
+	 * 
+	 * @param path Workspace relative path.
+	 * @return IPathEntry[] - the entries or empty set if none
+	 * @see IPathEntry
+	 */
 	IPathEntry[] getPathEntries(IPath path, int typesMask);
 
-//	/**
-//	 * Returns the set of include entries associated with the resource
-//	 * and empty array if none.
-//	 *
-//	 * @param path Workspace relative path.
-//	 * @return IIncludeEntry[] - the entries or empty set if none
-//	 * @see IPathEntry
-//	 */
-//	IIncludeEntry[] getIncludeEntries(IPath path);
-//
-//	/**
-//	 * Returns the set of macro entries associated with the resource
-//	 * and empty array if none.
-//	 * 
-//	 * @param path Workspace relative path.
-//	 * @return IMacroEntry[] - the entries or empty set if none
-//	 * @see IPathEntry
-//	 */
-//	IMacroEntry[] getMacroEntries(IPath path);
-//
 }
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
index b5de521f740..4757eb5ae09 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
@@ -841,6 +841,10 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
 				if (celement instanceof IOpenable) {
 					try {
 						((IOpenable)celement).close();
+						// Make sure we clear the cache on the project too
+						if (!(celement instanceof ICProject)) {
+							celement.getCProject().close();
+						}
 					} catch (CModelException e) {
 						// ignore.
 					}