diff -r 8bea4144b21c -r 9807daeb47c4 src/hotspot/share/runtime/flags/flagSetting.hpp
--- a/src/hotspot/share/runtime/flags/flagSetting.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/flagSetting.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
-#define SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
+#ifndef SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP
+#define SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP
 
 #include "memory/allocation.hpp"
 
@@ -68,4 +68,4 @@
 
 #define FLAG_GUARD(f) FlagGuard<sizeof(f)> f ## _guard(&f)
 
-#endif // SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
+#endif // SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP