--- a/src/hotspot/share/services/diagnosticCommand.cpp	Mon Apr 23 11:37:46 2018 -0700
+++ b/src/hotspot/share/services/diagnosticCommand.cpp	Mon Apr 23 14:51:16 2018 -0500
@@ -33,7 +33,7 @@
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
-#include "runtime/flags/jvmFlag.hpp"
+#include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/os.hpp"
@@ -231,9 +231,9 @@
 
 void PrintVMFlagsDCmd::execute(DCmdSource source, TRAPS) {
   if (_all.value()) {
-    JVMFlag::printFlags(output(), true);
+    CommandLineFlags::printFlags(output(), true);
   } else {
-    JVMFlag::printSetFlags(output());
+    CommandLineFlags::printSetFlags(output());
   }
 }
 
@@ -264,9 +264,9 @@
   }
 
   FormatBuffer<80> err_msg("%s", "");
-  int ret = WriteableFlags::set_flag(_flag.value(), val, JVMFlag::MANAGEMENT, err_msg);
+  int ret = WriteableFlags::set_flag(_flag.value(), val, Flag::MANAGEMENT, err_msg);
 
-  if (ret != JVMFlag::SUCCESS) {
+  if (ret != Flag::SUCCESS) {
     output()->print_cr("%s", err_msg.buffer());
   }
 }