diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0596c8ac8be..6c0fd9ecc37 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-24  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR libgcj/31084
+	* java/lang/natVMProcess.cc: Include platform.h before jvm.h.
+
 2007-04-24  Kyle Galloway  <kgallowa@redhat.com>
 
 	* gnu/classpath/jdwp/natVMVirtualMachine.java
diff --git a/libjava/java/lang/natVMProcess.cc b/libjava/java/lang/natVMProcess.cc
index 0a14465c4bb..dfc6f60232c 100644
--- a/libjava/java/lang/natVMProcess.cc
+++ b/libjava/java/lang/natVMProcess.cc
@@ -10,11 +10,10 @@ details.  */
 
 #include <config.h>
 
-#include <gcj/cni.h>
-#include <jvm.h>
-
 #include <platform.h>
 
+#include <jvm.h>
+
 #include <java/lang/VMProcess.h>
 #include <java/lang/Process.h>
 #include <java/io/File.h>