The issue of multiple copies of jni.h and which file gets actually placed in the final JDK product continue to be a problem.

The first step for the hotspot workspace (file hotspot/make/Makefile) would be to export the version of jni.h that the VM team wishes to export. Currently the j2se workspace contains a copy of jni.h (not the same file) at j2se/src/share/javavm/export/jni.h.

Once this jni.h file is exported as part of the hotspot build, then the control and j2se workspaces have a chance at using that version instead of the private copy in the j2se workspace.

The files jvmpi.h and jvmdi.h are not of concern anymore, being removed. The file jvmti.h is already being placed in the export directory.

There may be other files in this category, jmm.h?