--- old/src/hotspot/cpu/s390/vm_version_s390.hpp 2020-04-05 21:34:48.581843708 -0700 +++ new/src/hotspot/cpu/s390/vm_version_s390.hpp 2020-04-05 21:34:48.237830759 -0700 @@ -28,7 +28,7 @@ #include "runtime/abstract_vm_version.hpp" -#include "runtime/globals_extension.hpp" +#include "runtime/globals.hpp" class VM_Version: public Abstract_VM_Version {