diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1884c4b11dd..d5b0c5b119e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-02  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* java/lang/natMath.cc: Declare fabsf() function.
+	* java/lang/mprec.h: Don't include math.h.
+	* java/lang/dtoa.c: Include string.h.
+	* java/lang/natString.cc (toLowerCase): Initialize `ch' to prevent
+	compiler warning.
+
 2000-12-01  Warren Levy  <warrenl@cygnus.com>
 
 	* Makefile.am: Added entries for new java.sql modules.
diff --git a/libjava/java/lang/dtoa.c b/libjava/java/lang/dtoa.c
index e0d4aaaa8ee..9a398b43d98 100644
--- a/libjava/java/lang/dtoa.c
+++ b/libjava/java/lang/dtoa.c
@@ -27,6 +27,7 @@
  */
 
 #include "mprec.h"
+#include <string.h>
 
 static int
 _DEFUN (quorem,
diff --git a/libjava/java/lang/mprec.h b/libjava/java/lang/mprec.h
index 4baac323ad3..e4c273d79ff 100644
--- a/libjava/java/lang/mprec.h
+++ b/libjava/java/lang/mprec.h
@@ -29,7 +29,7 @@
 #include <config.h>
 #include "ieeefp.h"
 
-#include <math.h>
+// #include <math.h>
 // #include <float.h>
 // #include <errno.h>
 
diff --git a/libjava/java/lang/natMath.cc b/libjava/java/lang/natMath.cc
index 8e2f644e7c9..a802a94ea4b 100644
--- a/libjava/java/lang/natMath.cc
+++ b/libjava/java/lang/natMath.cc
@@ -27,6 +27,8 @@ details.  */
 
 #include "fdlibm.h"
 
+extern "C" float fabsf (float);
+
 jdouble java::lang::Math::cos(jdouble x)
 {
   return (jdouble)::cos((double)x);
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index c05aeb95a39..bb903fbde6f 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -768,7 +768,7 @@ java::lang::String::toLowerCase (java::util::Locale *locale)
 {
   jint i;
   jchar* chrs = JvGetStringChars(this);
-  jchar ch;
+  jchar ch = 0;
 
   bool handle_tr = false;
   if (locale != NULL)