I ran a duplicate name check on the source base. Then I discovered that there is a jimage.hpp in both src/hotspot/share/classfile/jimage.hpp and src/java.base/share/native/libjimage/jimage.hpp. They are identical (apart from copyright headers), and once again, we probably shouldn't have both. It is not as clear to me, however, which one to remove. Or if we should replace both of them with one in src/java.base/share/native/include.