diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index acbdf3a5ce8..2589211ea0f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-25  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/gcj/util/natDebug.cc (getField): Don't qualify name.
+	* java/lang/Class.h (_Jv_Linker): Declare.
+	(Class): Fix names of friends.
+	(_Jv_getInterfaceMethod): Declare.
+
 2004-11-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* testsuite/lib/libjava.exp (libjava_arguments): Add new global
diff --git a/libjava/gnu/gcj/util/natDebug.cc b/libjava/gnu/gcj/util/natDebug.cc
index 0fa98d63762..cad70958750 100644
--- a/libjava/gnu/gcj/util/natDebug.cc
+++ b/libjava/gnu/gcj/util/natDebug.cc
@@ -40,8 +40,8 @@ gnu::gcj::util::Debug::getDeclaredFields (::java::lang::Class *c)
 }
 
 static void *
-::getField (::java::lang::Object *obj, 
-	    ::java::lang::reflect::Field *field)
+getField (::java::lang::Object *obj, 
+	  ::java::lang::reflect::Field *field)
 {
   using namespace java::lang::reflect;
   
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index 320b09965d0..f38f16f680e 100644
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -61,6 +61,7 @@ struct _Jv_Field;
 struct _Jv_VTable;
 union _Jv_word;
 struct _Jv_ArrayVTable;
+class _Jv_Linker;
 class _Jv_ExecutionEngine;
 class _Jv_CompiledEngine;
 class _Jv_InterpreterEngine;
@@ -186,6 +187,10 @@ void *_Jv_AllocObj (jint, jclass);
 void *_Jv_AllocPtrFreeObj (jint, jclass);
 void *_Jv_AllocArray (jint, jclass);
 
+bool _Jv_getInterfaceMethod(jclass, jclass&, int&, 
+			    const _Jv_Utf8Const*,
+			    const _Jv_Utf8Const*);
+
 jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID,
 				  jboolean);
 jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID,
@@ -454,9 +459,9 @@ private:
   friend jboolean (::_Jv_CheckAccess) (jclass self_klass, jclass other_klass,
 				   jint flags);
   
-  friend bool _Jv_getInterfaceMethod(jclass, jclass&, int&, 
-				     const _Jv_Utf8Const*,
-				     const _Jv_Utf8Const*);
+  friend bool (::_Jv_getInterfaceMethod) (jclass, jclass&, int&, 
+					  const _Jv_Utf8Const*,
+					  const _Jv_Utf8Const*);
 
   friend jclass (::_Jv_GetArrayClass) (jclass klass,
 				       java::lang::ClassLoader *loader);
@@ -478,10 +483,10 @@ private:
   friend class gnu::gcj::runtime::StackTrace;
   friend class java::io::VMObjectStreamClass;
 
-  friend class _Jv_Linker;
-  friend class _Jv_ExecutionEngine;
-  friend class _Jv_CompiledEngine;
-  friend class _Jv_InterpreterEngine;
+  friend class ::_Jv_Linker;
+  friend class ::_Jv_ExecutionEngine;
+  friend class ::_Jv_CompiledEngine;
+  friend class ::_Jv_InterpreterEngine;
 
   friend void ::_Jv_sharedlib_register_hook (jclass klass);