diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 578f726e161b82b1343edd8f6633b0c3bd1a95dd..2ce3f448605bea835dbd8179a8deb1d343f6923d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* cp-tree.h (resolve_scope_to_name): Remove unused prototype.
+	(lookup_nested_tag): Likewise.
+	
+	* decl2.c (grokfield): Fix comment to reflect many types of _DECLs
+	can be produced.
+
 2000-08-11  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* parse.y (named_complex_class_head_sans_basetype): Remove
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index ce58e7051338afff012d43a4ebe4ce76db748ada..e4b4feba719c0a122319d327d2d8c7afbd0c579f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3777,7 +3777,6 @@ extern int check_dtor_name			PARAMS ((tree, tree));
 extern int get_arglist_len_in_bytes		PARAMS ((tree));
 
 extern tree build_vfield_ref			PARAMS ((tree, tree));
-extern tree resolve_scope_to_name		PARAMS ((tree, tree));
 extern tree build_scoped_method_call		PARAMS ((tree, tree, tree, tree));
 extern tree build_addr_func			PARAMS ((tree));
 extern tree build_call				PARAMS ((tree, tree));
@@ -4313,7 +4312,6 @@ extern tree lookup_field			PARAMS ((tree, tree, int, int));
 extern int lookup_fnfields_1                    PARAMS ((tree, tree));
 extern tree lookup_fnfields			PARAMS ((tree, tree, int));
 extern tree lookup_member			PARAMS ((tree, tree, int, int));
-extern tree lookup_nested_tag			PARAMS ((tree, tree));
 extern tree get_matching_virtual		PARAMS ((tree, tree, int));
 extern void get_pure_virtuals		        PARAMS ((tree));
 extern tree init_vbase_pointers			PARAMS ((tree, tree));
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index c968bcb2b04d14df532eccd6831f5bb8d16b2b0d..7422be17761039ea4fa8328c331cfca3ca257141 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1615,16 +1615,14 @@ finish_static_data_member_decl (decl, init, asmspec_tree, flags)
 }
 
 /* Process the specs, declarator (NULL if omitted) and width (NULL if omitted)
-   of a structure component, returning a FIELD_DECL node.
+   of a structure component, returning a _DECL node.
    QUALS is a list of type qualifiers for this decl (such as for declaring
    const member functions).
 
    This is done during the parsing of the struct declaration.
-   The FIELD_DECL nodes are chained together and the lot of them
+   The _DECL nodes are chained together and the lot of them
    are ultimately passed to `build_struct' to make the RECORD_TYPE node.
 
-   C++:
-
    If class A defines that certain functions in class B are friends, then
    the way I have set things up, it is B who is interested in permission
    granted by A.  However, it is in A's context that these declarations