--- a/src/hotspot/share/runtime/globals.cpp	Fri Apr 06 13:54:54 2018 +0200
+++ b/src/hotspot/share/runtime/globals.cpp	Fri Apr 06 13:55:25 2018 +0200
@@ -39,9 +39,6 @@
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/stringUtils.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1_globals.hpp"
-#endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_globals.hpp"
 #endif
@@ -52,20 +49,20 @@
 #include "opto/c2_globals.hpp"
 #endif
 
-RUNTIME_FLAGS(MATERIALIZE_DEVELOPER_FLAG, \
-              MATERIALIZE_PD_DEVELOPER_FLAG, \
-              MATERIALIZE_PRODUCT_FLAG, \
-              MATERIALIZE_PD_PRODUCT_FLAG, \
-              MATERIALIZE_DIAGNOSTIC_FLAG, \
-              MATERIALIZE_PD_DIAGNOSTIC_FLAG, \
-              MATERIALIZE_EXPERIMENTAL_FLAG, \
-              MATERIALIZE_NOTPRODUCT_FLAG, \
-              MATERIALIZE_MANAGEABLE_FLAG, \
-              MATERIALIZE_PRODUCT_RW_FLAG, \
-              MATERIALIZE_LP64_PRODUCT_FLAG, \
-              IGNORE_RANGE, \
-              IGNORE_CONSTRAINT, \
-              IGNORE_WRITEABLE)
+VM_FLAGS(MATERIALIZE_DEVELOPER_FLAG, \
+         MATERIALIZE_PD_DEVELOPER_FLAG, \
+         MATERIALIZE_PRODUCT_FLAG, \
+         MATERIALIZE_PD_PRODUCT_FLAG, \
+         MATERIALIZE_DIAGNOSTIC_FLAG, \
+         MATERIALIZE_PD_DIAGNOSTIC_FLAG, \
+         MATERIALIZE_EXPERIMENTAL_FLAG, \
+         MATERIALIZE_NOTPRODUCT_FLAG, \
+         MATERIALIZE_MANAGEABLE_FLAG, \
+         MATERIALIZE_PRODUCT_RW_FLAG, \
+         MATERIALIZE_LP64_PRODUCT_FLAG, \
+         IGNORE_RANGE, \
+         IGNORE_CONSTRAINT, \
+         IGNORE_WRITEABLE)
 
 RUNTIME_OS_FLAGS(MATERIALIZE_DEVELOPER_FLAG, \
                  MATERIALIZE_PD_DEVELOPER_FLAG, \
@@ -870,20 +867,21 @@
 #define ARCH_NOTPRODUCT_FLAG_STRUCT(     type, name, value, doc) { #type, XSTR(name), (void*) &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_NOT_PRODUCT) },
 
 static Flag flagTable[] = {
- RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, \
-               RUNTIME_PD_DEVELOP_FLAG_STRUCT, \
-               RUNTIME_PRODUCT_FLAG_STRUCT, \
-               RUNTIME_PD_PRODUCT_FLAG_STRUCT, \
-               RUNTIME_DIAGNOSTIC_FLAG_STRUCT, \
-               RUNTIME_PD_DIAGNOSTIC_FLAG_STRUCT, \
-               RUNTIME_EXPERIMENTAL_FLAG_STRUCT, \
-               RUNTIME_NOTPRODUCT_FLAG_STRUCT, \
-               RUNTIME_MANAGEABLE_FLAG_STRUCT, \
-               RUNTIME_PRODUCT_RW_FLAG_STRUCT, \
-               RUNTIME_LP64_PRODUCT_FLAG_STRUCT, \
-               IGNORE_RANGE, \
-               IGNORE_CONSTRAINT, \
-               IGNORE_WRITEABLE)
+  VM_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, \
+           RUNTIME_PD_DEVELOP_FLAG_STRUCT, \
+           RUNTIME_PRODUCT_FLAG_STRUCT, \
+           RUNTIME_PD_PRODUCT_FLAG_STRUCT, \
+           RUNTIME_DIAGNOSTIC_FLAG_STRUCT, \
+           RUNTIME_PD_DIAGNOSTIC_FLAG_STRUCT, \
+           RUNTIME_EXPERIMENTAL_FLAG_STRUCT, \
+           RUNTIME_NOTPRODUCT_FLAG_STRUCT, \
+           RUNTIME_MANAGEABLE_FLAG_STRUCT, \
+           RUNTIME_PRODUCT_RW_FLAG_STRUCT, \
+           RUNTIME_LP64_PRODUCT_FLAG_STRUCT, \
+           IGNORE_RANGE, \
+           IGNORE_CONSTRAINT, \
+           IGNORE_WRITEABLE)
+
  RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, \
                   RUNTIME_PD_DEVELOP_FLAG_STRUCT, \
                   RUNTIME_PRODUCT_FLAG_STRUCT, \
@@ -894,21 +892,6 @@
                   IGNORE_RANGE, \
                   IGNORE_CONSTRAINT, \
                   IGNORE_WRITEABLE)
-#if INCLUDE_ALL_GCS
- G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, \
-          RUNTIME_PD_DEVELOP_FLAG_STRUCT, \
-          RUNTIME_PRODUCT_FLAG_STRUCT, \
-          RUNTIME_PD_PRODUCT_FLAG_STRUCT, \
-          RUNTIME_DIAGNOSTIC_FLAG_STRUCT, \
-          RUNTIME_PD_DIAGNOSTIC_FLAG_STRUCT, \
-          RUNTIME_EXPERIMENTAL_FLAG_STRUCT, \
-          RUNTIME_NOTPRODUCT_FLAG_STRUCT, \
-          RUNTIME_MANAGEABLE_FLAG_STRUCT, \
-          RUNTIME_PRODUCT_RW_FLAG_STRUCT, \
-          IGNORE_RANGE, \
-          IGNORE_CONSTRAINT, \
-          IGNORE_WRITEABLE)
-#endif // INCLUDE_ALL_GCS
 #if INCLUDE_JVMCI
  JVMCI_FLAGS(JVMCI_DEVELOP_FLAG_STRUCT, \
              JVMCI_PD_DEVELOP_FLAG_STRUCT, \