--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Mon Apr 23 11:37:46 2018 -0700
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Mon Apr 23 14:51:16 2018 -0500
@@ -29,7 +29,6 @@
 #include "jvmci/jvmciRuntime.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/vmStructs_jvmci.hpp"
-#include "runtime/flags/jvmFlag.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/resourceHash.hpp"
@@ -379,9 +378,9 @@
 #define COUNT_FLAG(ignore) +1
 #ifdef ASSERT
 #define CHECK_FLAG(type, name) { \
-  JVMFlag* flag = JVMFlag::find_flag(#name, strlen(#name), /*allow_locked*/ true, /* return_flag */ true); \
+  Flag* flag = Flag::find_flag(#name, strlen(#name), /*allow_locked*/ true, /* return_flag */ true); \
   assert(flag != NULL, "No such flag named " #name); \
-  assert(flag->is_##type(), "JVMFlag " #name " is not of type " #type); \
+  assert(flag->is_##type(), "Flag " #name " is not of type " #type); \
 }
 #else
 #define CHECK_FLAG(type, name)