diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1361abe40a0468ceed58a7a7d808de319a2b48df..ded5d9b318fcca06a11d4022144a60b999250fd6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* gcj/cni.h: Include <string.h>.
+	* defineclass.cc: Include <alloca.h>.
+	* interpret.cc: Ditto.
+	* gij.cc: Include <stdlib.h>.
+
 2000-05-30  Tom Tromey  <tromey@cygnus.com>
 
 	* include/name-finder.h: Include <sys/wait.h>.
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 33269ab0aab4eb530be49edb8ccec0aafcaac965..e38ffeca20be0dd887002afcf5ee70d24f9c5f1c 100644
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -24,6 +24,7 @@ details.  */
 
 #ifdef INTERPRETER
 
+#include <alloca.h>
 #include <java-cpool.h>
 #include <gcj/cni.h>
 
diff --git a/libjava/gcj/cni.h b/libjava/gcj/cni.h
index ff45fb058caf6a56444d9836b8eb5557ebc1ea8d..1dacbd0810da46c58619fe12164cdd1401ff40f3 100644
--- a/libjava/gcj/cni.h
+++ b/libjava/gcj/cni.h
@@ -18,6 +18,8 @@ details.  */
 
 #include <gcj/array.h>
 
+#include <string.h>
+
 extern inline jobject
 JvAllocObject (jclass cls)
 {
diff --git a/libjava/gij.cc b/libjava/gij.cc
index d97a56e7f4552a47dbd7e09000f169ab7958266e..948ea03c3a9c3de452d62bffff6c7a3494240d2b 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -16,6 +16,7 @@ details.  */
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <java/lang/System.h>
 #include <java/util/Properties.h>
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 6fd1fa6e43ceae2260ed6f0a980760d2e989c63e..f9fbd3df9fd557a95dd7747cd3710466138e8886 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -35,6 +35,8 @@ details.  */
 
 #ifdef INTERPRETER
 
+#include <alloca.h>
+
 #define ClassError _CL_Q34java4lang5Error
 extern java::lang::Class ClassError;