--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp	Thu May 09 14:26:03 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
 #include "gc/g1/heapRegionSet.hpp"
 #include "gc/shared/taskqueue.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "memory/allocation.hpp"
 #include "utilities/compilerWarnings.hpp"
 

--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp	Thu May 09 14:26:03 2019 +0200
@@ -39,6 +39,7 @@
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "logging/log.hpp"

--- a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp	Thu May 09 14:26:03 2019 +0200
@@ -26,6 +26,7 @@
 #include "classfile/classLoaderData.hpp"
 #include "gc/g1/g1FullGCMarker.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "memory/iterator.inline.hpp"
 
 G1FullGCMarker::G1FullGCMarker(uint worker_id, PreservedMarks* preserved_stack, G1CMBitMap* bitmap) :

--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp	Thu May 09 14:26:03 2019 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_G1_G1FULLGCOOPCLOSURES_HPP
 #define SHARE_GC_G1_G1FULLGCOOPCLOSURES_HPP
 
+#include "gc/shared/verifyOption.hpp"
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
 

--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu May 09 14:26:03 2019 +0200
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1HEAPVERIFIER_HPP
 
 #include "gc/g1/heapRegionSet.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "memory/allocation.hpp"
 #include "memory/universe.hpp"
 #include "utilities/macros.hpp"

--- a/src/hotspot/share/gc/g1/heapRegion.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/heapRegion.hpp	Thu May 09 14:26:03 2019 +0200
@@ -32,6 +32,7 @@
 #include "gc/g1/survRateGroup.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/cardTable.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "utilities/macros.hpp"
 

--- a/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu May 09 14:26:03 2019 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcWhen.hpp"
+#include "gc/shared/verifyOption.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/perfData.hpp"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/verifyOption.hpp	Thu May 09 14:26:03 2019 +0200
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHARED_VERIFYOPTION_HPP
+#define SHARE_GC_SHARED_VERIFYOPTION_HPP
+
+enum VerifyOption {
+      VerifyOption_Default = 0,
+
+      // G1
+      VerifyOption_G1UsePrevMarking = VerifyOption_Default,
+      VerifyOption_G1UseNextMarking = VerifyOption_G1UsePrevMarking + 1,
+      VerifyOption_G1UseFullMarking = VerifyOption_G1UseNextMarking + 1
+};
+
+#endif // SHARE_GC_SHARED_VERIFYOPTION_HPP

--- a/src/hotspot/share/memory/universe.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/memory/universe.hpp	Thu May 09 14:26:03 2019 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_MEMORY_UNIVERSE_HPP
 #define SHARE_MEMORY_UNIVERSE_HPP
 
+#include "gc/shared/verifyOption.hpp"
 #include "oops/array.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/growableArray.hpp"
@@ -70,16 +71,6 @@
   void metaspace_pointers_do(MetaspaceClosure* it);
 };
 
-
-enum VerifyOption {
-      VerifyOption_Default = 0,
-
-      // G1
-      VerifyOption_G1UsePrevMarking = VerifyOption_Default,
-      VerifyOption_G1UseNextMarking = VerifyOption_G1UsePrevMarking + 1,
-      VerifyOption_G1UseFullMarking = VerifyOption_G1UseNextMarking + 1
-};
-
 class Universe: AllStatic {
   // Ugh.  Universe is much too friendly.
   friend class MarkSweep;