diff -r 8bea4144b21c -r 9807daeb47c4 src/hotspot/cpu/s390/c1_globals_s390.hpp
--- a/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_GLOBALS_S390_HPP
-#define CPU_S390_VM_C1_GLOBALS_S390_HPP
+#ifndef CPU_S390_C1_GLOBALS_S390_HPP
+#define CPU_S390_C1_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 define_pd_global(bool,     CSEArrayLength,               true);
 define_pd_global(bool,     TwoOperandLIRForm,            true);
 
-#endif // CPU_S390_VM_C1_GLOBALS_S390_HPP
+#endif // CPU_S390_C1_GLOBALS_S390_HPP