diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 4187b050ea0..d1983bb9ea4 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-25 Chris Wiebe
+
+	support for matching enclosed type names
+	* browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyAction.java
+	* src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+
+2004-08-25 Chris Wiebe
+
+	Got rid of little 'C' icons on the editor preference pages
+	* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
+
 2004-08-25 Alain Magloire
 
 	Fix for 65761: Show all the include paths in the includes container.
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyAction.java
index 5fcff0f6149..20a0a2fa76b 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyAction.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyAction.java
@@ -181,7 +181,7 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction {
         ITypeSearchScope projectScope = new TypeSearchScope();
         projectScope.add(unit.getCProject());
         int[] kinds = {ICElement.C_CLASS, ICElement.C_STRUCT};
-        ITypeInfo[] types = AllTypesCache.getTypes(projectScope, new QualifiedTypeName(name), kinds);
+        ITypeInfo[] types = AllTypesCache.getTypes(projectScope, new QualifiedTypeName(name), kinds, true);
         if (types != null) {
             List elements = new ArrayList(types.length);
             for (int i = 0; i < types.length; ++i) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
index c10feb88ebc..7b862713b65 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
@@ -273,7 +273,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
 				}
 				ITypeInfo[] results = null;
 			    if (!monitor.isCanceled()) {
-					results = AllTypesCache.getTypes(scope, new QualifiedTypeName(name), types);
+					results = AllTypesCache.getTypes(scope, new QualifiedTypeName(name), types, true);
 				    if (!monitor.isCanceled()) {
 						for (int i = 0; i < results.length; ++i) {
 						    ITypeInfo info = results[i];