Index: build.xml
===================================================================
--- build.xml	(revision 14167)
+++ build.xml	(working copy)
@@ -1205,8 +1205,12 @@
   <!-- Generate JNI headers for booter -->
   <target name="gen-jni-headers" depends="gen-asm">
     <mkdir dir="${build.native}"/>
-    <javah destdir="${build.native}" classpath="${build.vm.jar}">
+    <javah outputFile="${build.native}/org_jikesrvm_runtime_VM_DynamicLibrary.h" 
+           classpath="${build.vm.jar}">
       <class name="org.jikesrvm.runtime.VM_DynamicLibrary"/>
+    </javah>
+    <javah outputFile="${build.native}/org_jikesrvm_scheduler_greenthreads_VM_Process.h"
+           classpath="${build.vm.jar}">
       <class name="org.jikesrvm.scheduler.greenthreads.VM_Process"/>
     </javah>
   </target>
Index: tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VM_0005fProcess.c
===================================================================
--- tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VM_0005fProcess.c	(revision 14167)
+++ tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VM_0005fProcess.c	(working copy)
@@ -38,7 +38,7 @@
 #include "InterfaceDeclarations.h"
 
 // generated class header
-#include "org_jikesrvm_scheduler_greenthreads_VM_0005fProcess.h"
+#include "org_jikesrvm_scheduler_greenthreads_VM_Process.h"
 
 // local stuff
 
Index: tools/bootImageRunner/org_jikesrvm_runtime_VM_0005fDynamicLibrary.c
===================================================================
--- tools/bootImageRunner/org_jikesrvm_runtime_VM_0005fDynamicLibrary.c	(revision 14167)
+++ tools/bootImageRunner/org_jikesrvm_runtime_VM_0005fDynamicLibrary.c	(working copy)
@@ -19,7 +19,7 @@
 #include <jni.h>
 
 // generated class header
-#include "org_jikesrvm_runtime_VM_0005fDynamicLibrary.h"
+#include "org_jikesrvm_runtime_VM_DynamicLibrary.h"
 
 extern struct JavaVM_ sysJavaVM;