--- old/src/hotspot/share/runtime/globals_ext.hpp	2018-04-05 12:03:30.000000000 -0500
+++ new/src/hotspot/share/runtime/globals_ext.hpp	2018-04-05 12:03:30.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -25,13 +25,15 @@
 #ifndef SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
 #define SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
 
+#include "runtime/flags/jvmFlag.hpp"
+
 // globals_extension.hpp extension
 
-// Additional CommandLineFlags enum values
-#define COMMANDLINEFLAG_EXT
+// Additional JVMFlag enum values
+#define JVMFLAGS_EXT
 
-// Additional CommandLineFlagsWithType enum values
-#define COMMANDLINEFLAGWITHTYPE_EXT
+// Additional JVMFlagWithType enum values
+#define JVMFLAGSWITHTYPE_EXT
 
 
 // globals.cpp extension
@@ -45,26 +47,26 @@
 
 // Default method implementations
 
-inline bool Flag::is_unlocker_ext() const {
+inline bool JVMFlag::is_unlocker_ext() const {
   return false;
 }
 
-inline bool Flag::is_unlocked_ext() const {
+inline bool JVMFlag::is_unlocked_ext() const {
   return true;
 }
 
-inline bool Flag::is_writeable_ext() const {
+inline bool JVMFlag::is_writeable_ext() const {
   return false;
 }
 
-inline bool Flag::is_external_ext() const {
+inline bool JVMFlag::is_external_ext() const {
   return false;
 }
 
-inline Flag::MsgType Flag::get_locked_message_ext(char* buf, int buflen) const {
+inline JVMFlag::MsgType JVMFlag::get_locked_message_ext(char* buf, int buflen) const {
   assert(buf != NULL, "Buffer cannot be NULL");
   buf[0] = '\0';
-  return Flag::NONE;
+  return JVMFlag::NONE;
 }
 
 #endif // SHARE_VM_RUNTIME_GLOBALS_EXT_HPP