diff --git a/core/org.eclipse.cdt.core/browser/ChangeLog-browser b/core/org.eclipse.cdt.core/browser/ChangeLog-browser
new file mode 100644
index 00000000000..cc15e311dfc
--- /dev/null
+++ b/core/org.eclipse.cdt.core/browser/ChangeLog-browser
@@ -0,0 +1,14 @@
+2004-05-12 Chris Wiebe
+	Heavy refactoring of type cache to address scalability
+	concerns.
+
+2004-05-06 Chris Wiebe
+	Creating a new Job to handle the changes, instead
+	of reusing the same job.
+
+2004-04-20 Chris Wiebe
+	refactored TypeCacheDeltaListener into standalone class
+	added option in Work In Progress prefs page to disable background cache
+
+2004-04-06 Chris Wiebe
+	initial placement of non-ui code into org.eclipse.cdt.core.browser
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java
index 760792427bf..d46d8a025e3 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java
@@ -181,7 +181,7 @@ public class AllTypesCache {
 		IProject[] projects = scope.getEnclosingProjects();
 		ITypeInfoVisitor visitor = new ITypeInfoVisitor() {
 			public void visit(ITypeInfo info) {
-				if (fQualifiedName.equals(info.getQualifiedTypeName())
+				if ((fScope != null && info.isEnclosed(fScope)) && fQualifiedName.equals(info.getQualifiedTypeName())
 						&& ArrayUtil.contains(fKinds, info.getCElementType())) {
 					fTypesFound.add(info);
 				}
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java
index d2ab7c0048a..a2e50588490 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java
@@ -219,7 +219,6 @@ public class TypeParser implements ISourceElementRequestor {
 			//TODO what about working copies outside the workspace?
 		}
 		
-		boolean foundType = false;
 		monitor.beginTask("", searchPaths.length + workingCopyPaths.size()); //$NON-NLS-1$
 		try {
 			fTypeToFind = info;