--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp	Mon Oct 30 16:37:53 2017 +0100
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp	Tue Oct 31 11:55:09 2017 -0400
@@ -26,6 +26,7 @@
 // This file is organized as os_linux_x86.cpp.
 
 // no precompiled headers
+#include "jvm.h"
 #include "asm/assembler.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -35,12 +36,10 @@
 #include "code/vtableStubs.hpp"
 #include "compiler/disassembler.hpp"
 #include "interpreter/interpreter.hpp"
-#include "jvm_linux.h"
 #include "memory/allocation.inline.hpp"
 #include "nativeInst_s390.hpp"
 #include "os_share_linux.hpp"
 #include "prims/jniFastGetField.hpp"
-#include "prims/jvm.h"
 #include "prims/jvm_misc.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/extendedPC.hpp"