diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 55c4045c664..578202a4959 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl.c (ggc_p): Set it to 1.
+	(mark_saved_scope): Add prototype.
+
 1999-09-07  Richard Henderson  <rth@cygnus.com>
 
 	* cp-tree.h (C_PROMOTING_INTEGER_TYPE_P): Delete.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b5c5806444c..92781748b1c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -59,9 +59,9 @@ extern tree global_namespace;
 
 extern int (*valid_lang_attribute) PROTO ((tree, tree, tree, tree));
 
-/* Don't use garbage collection.  */
+/* Use garbage collection.  */
 
-int ggc_p = 0;
+int ggc_p = 1;
 
 /* Obstack used for remembering local class declarations (like
    enums and static (const) members.  */
@@ -204,6 +204,7 @@ static void push_cp_function_context PROTO((struct function *));
 static void pop_cp_function_context PROTO((struct function *));
 static void mark_binding_level PROTO((void *));
 static void mark_cp_function_context PROTO((struct function *));
+static void mark_saved_scope PROTO((void *));
 
 #if defined (DEBUG_CP_BINDING_LEVELS)
 static void indent PROTO((void));