For historical reasons, the hotspot and jdk repositories each have their own copies of several header files that we ship with the jdk image. In many cases there are rather big differences between the copies. Today we ship the copies in the jdk repository.

We should merge and keep only one copy of each of these header files.

hotspot/src/share/vm/prims/jni.h
jdk/src/java.base/share/native/include/jni.h

hotspot/src/share/vm/code/jvmticmlr.h
jdk/src/java.base/share/native/include/jvmticmlr.h

hotspot/src/cpu/aarch64/vm/jni_aarch64.h
hotspot/src/cpu/sparc/vm/jni_sparc.h
hotspot/src/cpu/zero/vm/jni_zero.h
hotspot/src/cpu/x86/vm/jni_x86.h
hotspot/src/cpu/ppc/vm/jni_ppc.h
hotspot/src/closed/cpu/arm/vm/jni_arm.h
hotspot/src/share/vm/prims/jni_md.h
jdk/src/java.base/windows/native/include/jni_md.h
jdk/src/java.base/unix/native/include/jni_md.h
jdk/src/java.base/share/native/libjava/jni_util.h
jdk/src/java.base/macosx/native/include/jni_md.h

jdk/src/java.base/share/native/include/jvmti.h
(generated in the hotspot build)

hotspot/src/share/vm/prims/jvm.h
jdk/src/java.base/share/native/include/jvm.h