changeset 56139:ebf733a324d4

8223624: Cleanup includes of universe.hpp Reviewed-by: coleenp, lkorinth
author stefank
date Thu, 09 May 2019 14:28:30 +0200
parents 83b3671d9e30
children 7748aa47b4e2 33fe50b6d707
files src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp src/hotspot/cpu/aarch64/frame_aarch64.cpp src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp src/hotspot/cpu/arm/c1_Runtime1_arm.cpp src/hotspot/cpu/arm/frame_arm.cpp src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp src/hotspot/cpu/arm/interpreterRT_arm.cpp src/hotspot/cpu/arm/stubGenerator_arm.cpp src/hotspot/cpu/ppc/frame_ppc.cpp src/hotspot/cpu/ppc/interpreterRT_ppc.cpp src/hotspot/cpu/s390/c1_Runtime1_s390.cpp src/hotspot/cpu/s390/frame_s390.cpp src/hotspot/cpu/s390/interpreterRT_s390.cpp src/hotspot/cpu/s390/stubGenerator_s390.cpp src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp src/hotspot/cpu/sparc/frame_sparc.cpp src/hotspot/cpu/sparc/interpreterRT_sparc.cpp src/hotspot/cpu/x86/c1_Runtime1_x86.cpp src/hotspot/cpu/x86/frame_x86.cpp src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp src/hotspot/cpu/x86/interpreterRT_x86_32.cpp src/hotspot/cpu/x86/interpreterRT_x86_64.cpp src/hotspot/cpu/x86/relocInfo_x86.cpp src/hotspot/cpu/x86/stubGenerator_x86_32.cpp src/hotspot/cpu/x86/stubGenerator_x86_64.cpp src/hotspot/cpu/zero/frame_zero.cpp src/hotspot/cpu/zero/interpreterRT_zero.cpp src/hotspot/share/aot/aotCodeHeap.cpp src/hotspot/share/asm/assembler.cpp src/hotspot/share/c1/c1_Runtime1.cpp src/hotspot/share/ci/ciEnv.cpp src/hotspot/share/ci/ciField.cpp src/hotspot/share/ci/ciObjectFactory.cpp src/hotspot/share/ci/ciReplay.cpp src/hotspot/share/ci/ciSymbol.cpp src/hotspot/share/ci/ciType.cpp src/hotspot/share/ci/ciTypeArrayKlass.cpp src/hotspot/share/ci/ciUtilities.cpp src/hotspot/share/classfile/classLoader.cpp src/hotspot/share/classfile/defaultMethods.cpp src/hotspot/share/classfile/javaClasses.cpp src/hotspot/share/classfile/moduleEntry.cpp src/hotspot/share/classfile/systemDictionary.cpp src/hotspot/share/classfile/systemDictionaryShared.cpp src/hotspot/share/classfile/verifier.cpp src/hotspot/share/classfile/vmSymbols.cpp src/hotspot/share/code/codeCache.cpp src/hotspot/share/code/compiledIC.cpp src/hotspot/share/code/debugInfo.cpp src/hotspot/share/code/icBuffer.cpp src/hotspot/share/code/nmethod.cpp src/hotspot/share/code/oopRecorder.hpp src/hotspot/share/code/relocInfo.cpp src/hotspot/share/compiler/compileBroker.cpp src/hotspot/share/compiler/compilerOracle.cpp src/hotspot/share/compiler/disassembler.cpp src/hotspot/share/compiler/methodMatcher.cpp src/hotspot/share/compiler/oopMap.cpp src/hotspot/share/gc/cms/cmsHeap.cpp src/hotspot/share/gc/cms/cmsLockVerifier.cpp src/hotspot/share/gc/cms/cmsVMOperations.cpp src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp src/hotspot/share/gc/epsilon/epsilonHeap.cpp src/hotspot/share/gc/epsilon/epsilonHeap.hpp src/hotspot/share/gc/g1/g1Allocator.inline.hpp src/hotspot/share/gc/g1/g1CollectedHeap.cpp src/hotspot/share/gc/g1/g1ConcurrentMark.cpp src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp src/hotspot/share/gc/g1/g1HeapVerifier.cpp src/hotspot/share/gc/g1/g1HeapVerifier.hpp src/hotspot/share/gc/g1/g1RootProcessor.cpp src/hotspot/share/gc/g1/g1VMOperations.cpp src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp src/hotspot/share/gc/parallel/mutableSpace.cpp src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp src/hotspot/share/gc/parallel/psMarkSweep.cpp src/hotspot/share/gc/parallel/psParallelCompact.cpp src/hotspot/share/gc/parallel/psPromotionLAB.cpp src/hotspot/share/gc/parallel/psScavenge.cpp src/hotspot/share/gc/serial/genMarkSweep.cpp src/hotspot/share/gc/serial/markSweep.cpp src/hotspot/share/gc/serial/serialHeap.cpp src/hotspot/share/gc/shared/collectedHeap.cpp src/hotspot/share/gc/shared/gcConfiguration.hpp src/hotspot/share/gc/shared/gcLocker.cpp src/hotspot/share/gc/shared/gcVMOperations.cpp src/hotspot/share/gc/shared/genCollectedHeap.cpp src/hotspot/share/gc/shared/generation.hpp src/hotspot/share/gc/shared/isGCActiveMark.hpp src/hotspot/share/gc/shared/markBitMap.cpp src/hotspot/share/gc/shared/markBitMap.inline.hpp src/hotspot/share/gc/shared/plab.cpp src/hotspot/share/gc/shared/referenceProcessor.cpp src/hotspot/share/gc/shared/scavengableNMethods.cpp src/hotspot/share/gc/shared/space.inline.hpp src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp src/hotspot/share/gc/z/zCollectedHeap.cpp src/hotspot/share/gc/z/zNMethod.cpp src/hotspot/share/interpreter/bytecodeInterpreter.cpp src/hotspot/share/interpreter/interpreterRuntime.cpp src/hotspot/share/interpreter/interpreterRuntime.hpp src/hotspot/share/interpreter/linkResolver.cpp src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp src/hotspot/share/jvmci/jvmci.cpp src/hotspot/share/jvmci/jvmciCodeInstaller.cpp src/hotspot/share/jvmci/jvmciCompilerToVM.cpp src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp src/hotspot/share/jvmci/jvmciEnv.cpp src/hotspot/share/jvmci/jvmciRuntime.cpp src/hotspot/share/memory/allocation.cpp src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/filemap.hpp src/hotspot/share/memory/heapInspection.cpp src/hotspot/share/memory/heapShared.cpp src/hotspot/share/memory/heapShared.hpp src/hotspot/share/memory/iterator.cpp src/hotspot/share/memory/iterator.inline.hpp src/hotspot/share/memory/metaspaceShared.cpp src/hotspot/share/memory/oopFactory.hpp src/hotspot/share/memory/universe.cpp src/hotspot/share/oops/arrayKlass.hpp src/hotspot/share/oops/arrayOop.hpp src/hotspot/share/oops/constantPool.cpp src/hotspot/share/oops/cpCache.cpp src/hotspot/share/oops/cpCache.hpp src/hotspot/share/oops/generateOopMap.hpp src/hotspot/share/oops/instanceKlass.cpp src/hotspot/share/oops/instanceMirrorKlass.cpp src/hotspot/share/oops/klass.cpp src/hotspot/share/oops/klass.inline.hpp src/hotspot/share/oops/method.cpp src/hotspot/share/oops/methodData.hpp src/hotspot/share/oops/oop.cpp src/hotspot/share/oops/oop.inline.hpp src/hotspot/share/oops/oopsHierarchy.cpp src/hotspot/share/oops/oopsHierarchy.hpp src/hotspot/share/oops/symbol.cpp src/hotspot/share/oops/typeArrayKlass.cpp src/hotspot/share/opto/machnode.cpp src/hotspot/share/opto/macro.cpp src/hotspot/share/prims/jvm.cpp src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp src/hotspot/share/prims/jvmtiExport.cpp src/hotspot/share/prims/jvmtiImpl.cpp src/hotspot/share/prims/jvmtiRedefineClasses.cpp src/hotspot/share/prims/jvmtiTagMap.cpp src/hotspot/share/prims/jvmtiTagMap.hpp src/hotspot/share/prims/methodHandles.cpp src/hotspot/share/prims/nativeLookup.cpp src/hotspot/share/prims/resolvedMethodTable.cpp src/hotspot/share/prims/stackwalk.cpp src/hotspot/share/prims/whitebox.cpp src/hotspot/share/runtime/arguments.cpp src/hotspot/share/runtime/deoptimization.cpp src/hotspot/share/runtime/fieldDescriptor.cpp src/hotspot/share/runtime/fieldType.cpp src/hotspot/share/runtime/interfaceSupport.cpp src/hotspot/share/runtime/java.cpp src/hotspot/share/runtime/jniHandles.cpp src/hotspot/share/runtime/memprofiler.cpp src/hotspot/share/runtime/mutexLocker.cpp src/hotspot/share/runtime/os.cpp src/hotspot/share/runtime/relocator.cpp src/hotspot/share/runtime/serviceThread.cpp src/hotspot/share/runtime/signature.cpp src/hotspot/share/runtime/synchronizer.cpp src/hotspot/share/runtime/unhandledOops.cpp src/hotspot/share/runtime/vframeArray.cpp src/hotspot/share/runtime/vmOperations.cpp src/hotspot/share/runtime/vmThread.cpp src/hotspot/share/runtime/vm_version.cpp src/hotspot/share/services/attachListener.cpp src/hotspot/share/services/classLoadingService.cpp src/hotspot/share/services/diagnosticCommand.cpp src/hotspot/share/services/management.cpp src/hotspot/share/services/threadService.cpp src/hotspot/share/utilities/exceptions.cpp src/hotspot/share/utilities/vmError.cpp test/hotspot/gtest/gc/shared/test_collectedHeap.cpp
diffstat 194 files changed, 168 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -33,6 +33,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/thread.hpp"
 
@@ -228,4 +229,3 @@
   }
   __ str(t1, Address(rthread, in_bytes(JavaThread::allocated_bytes_offset())));
 }
-
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -36,6 +36,7 @@
 #include "interpreter/interpreter.hpp"
 #include "compiler/disassembler.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
 #include "oops/accessDecorators.hpp"
 #include "oops/compressedOops.inline.hpp"
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_arm.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/arm/frame_arm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/arm/frame_arm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "runtime/thread.hpp"
 
 #define __ masm->
--- a/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,7 +28,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_arm.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
--- a/src/hotspot/cpu/ppc/frame_ppc.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/ppc/frame_ppc.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_s390.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/s390/frame_s390.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/s390/frame_s390.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/frame.inline.hpp"
--- a/src/hotspot/cpu/s390/interpreterRT_s390.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/s390/interpreterRT_s390.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/icache.hpp"
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_s390.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/objArrayKlass.hpp"
--- a/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_sparc.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/sparc/frame_sparc.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/sparc/frame_sparc.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "code/codeCache.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,7 +28,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/x86/frame_x86.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/frame_x86.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "memory/universe.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/thread.hpp"
 
--- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/cpu/x86/relocInfo_x86.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/relocInfo_x86.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "code/relocInfo.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/method.hpp"
--- a/src/hotspot/cpu/zero/frame_zero.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/zero/frame_zero.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/zero/interpreterRT_zero.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/cpu/zero/interpreterRT_zero.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/aot/aotCodeHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,6 +35,7 @@
 #include "jvmci/compilerRuntime.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "memory/allocation.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/method.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/asm/assembler.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/asm/assembler.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/icache.hpp"
--- a/src/hotspot/share/c1/c1_Runtime1.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp	Thu May 09 14:28:30 2019 +0200
@@ -48,6 +48,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/objArrayKlass.hpp"
--- a/src/hotspot/share/ci/ciEnv.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciEnv.cpp	Thu May 09 14:28:30 2019 +0200
@@ -33,6 +33,7 @@
 #include "ci/ciNullObject.hpp"
 #include "ci/ciReplay.hpp"
 #include "ci/ciUtilities.inline.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
--- a/src/hotspot/share/ci/ciField.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciField.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/ci/ciObjectFactory.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp	Thu May 09 14:28:30 2019 +0200
@@ -44,6 +44,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/allocation.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/fieldType.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/ci/ciReplay.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciReplay.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "ci/ciSymbol.hpp"
 #include "ci/ciKlass.hpp"
 #include "ci/ciUtilities.inline.hpp"
+#include "classfile/symbolTable.hpp"
 #include "compiler/compileBroker.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
--- a/src/hotspot/share/ci/ciSymbol.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciSymbol.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "ci/ciSymbol.hpp"
 #include "ci/ciUtilities.inline.hpp"
+#include "classfile/symbolTable.hpp"
 #include "memory/oopFactory.hpp"
 
 // ------------------------------------------------------------------
--- a/src/hotspot/share/ci/ciType.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciType.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "ci/ciUtilities.inline.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 
 ciType* ciType::_basic_types[T_CONFLICT+1];
--- a/src/hotspot/share/ci/ciTypeArrayKlass.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciTypeArrayKlass.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "ci/ciTypeArrayKlass.hpp"
 #include "ci/ciUtilities.inline.hpp"
+#include "memory/universe.hpp"
 
 // ciTypeArrayKlass
 //
--- a/src/hotspot/share/ci/ciUtilities.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/ci/ciUtilities.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/universe.hpp"
 
 // ciUtilities
 //
--- a/src/hotspot/share/classfile/classLoader.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/classLoader.cpp	Thu May 09 14:28:30 2019 +0200
@@ -34,6 +34,7 @@
 #include "classfile/modules.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/klassFactory.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compileBroker.hpp"
--- a/src/hotspot/share/classfile/defaultMethods.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/defaultMethods.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "memory/allocation.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/classfile/javaClasses.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/debugInfo.hpp"
 #include "code/dependencyContext.hpp"
--- a/src/hotspot/share/classfile/moduleEntry.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/moduleEntry.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "classfile/moduleEntry.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oopHandle.inline.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/classfile/systemDictionary.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/systemDictionary.cpp	Thu May 09 14:28:30 2019 +0200
@@ -40,6 +40,7 @@
 #include "classfile/protectionDomainCache.hpp"
 #include "classfile/resolutionErrors.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
@@ -56,6 +57,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceRefKlass.hpp"
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp	Thu May 09 14:28:30 2019 +0200
@@ -43,6 +43,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
--- a/src/hotspot/share/classfile/verifier.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/verifier.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "classfile/stackMapTable.hpp"
 #include "classfile/stackMapFrame.hpp"
 #include "classfile/stackMapTableFormat.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/verifier.hpp"
 #include "classfile/vmSymbols.hpp"
@@ -39,6 +40,7 @@
 #include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/classfile/vmSymbols.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/classfile/vmSymbols.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "classfile/symbolTable.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compilerDirectives.hpp"
 #include "memory/allocation.inline.hpp"
--- a/src/hotspot/share/code/codeCache.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/codeCache.cpp	Thu May 09 14:28:30 2019 +0200
@@ -40,6 +40,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/code/compiledIC.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/compiledIC.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,6 +35,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
--- a/src/hotspot/share/code/debugInfo.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/debugInfo.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
 #include "code/nmethod.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
--- a/src/hotspot/share/code/icBuffer.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/icBuffer.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,7 +32,6 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/code/nmethod.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/nmethod.cpp	Thu May 09 14:28:30 2019 +0200
@@ -42,6 +42,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/methodData.hpp"
--- a/src/hotspot/share/code/oopRecorder.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/oopRecorder.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #ifndef SHARE_CODE_OOPRECORDER_HPP
 #define SHARE_CODE_OOPRECORDER_HPP
 
-#include "memory/universe.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/growableArray.hpp"
 
--- a/src/hotspot/share/code/relocInfo.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/code/relocInfo.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "code/nmethod.hpp"
 #include "code/relocInfo.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/stubCodeGenerator.hpp"
--- a/src/hotspot/share/compiler/compileBroker.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/compiler/compileBroker.cpp	Thu May 09 14:28:30 2019 +0200
@@ -40,6 +40,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/compiler/compilerOracle.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/compiler/compilerOracle.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "classfile/symbolTable.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "compiler/methodMatcher.hpp"
 #include "memory/allocation.inline.hpp"
--- a/src/hotspot/share/compiler/disassembler.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/compiler/disassembler.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/os.inline.hpp"
--- a/src/hotspot/share/compiler/methodMatcher.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/compiler/methodMatcher.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/symbolTable.hpp"
 #include "compiler/methodMatcher.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
--- a/src/hotspot/share/compiler/oopMap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/compiler/oopMap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/gc/cms/cmsHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/cms/cmsHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,6 +35,7 @@
 #include "gc/shared/genOopClosures.inline.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/workgroup.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/vmThread.hpp"
 #include "services/memoryManager.hpp"
--- a/src/hotspot/share/gc/cms/cmsLockVerifier.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/cms/cmsLockVerifier.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/cms/cmsLockVerifier.hpp"
 #include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "memory/universe.hpp"
 #include "runtime/vmThread.hpp"
 
 ///////////// Locking verification specific to CMS //////////////
--- a/src/hotspot/share/gc/cms/cmsVMOperations.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/cms/cmsVMOperations.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.hpp"
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	Thu May 09 14:28:30 2019 +0200
@@ -65,6 +65,7 @@
 #include "memory/iterator.inline.hpp"
 #include "memory/padded.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
 #include "gc/cms/concurrentMarkSweepThread.hpp"
 #include "gc/shared/gcId.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/globals.hpp"
 
 jint EpsilonHeap::initialize() {
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,10 +27,10 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/softRefPolicy.hpp"
 #include "gc/shared/space.hpp"
-#include "services/memoryManager.hpp"
 #include "gc/epsilon/epsilonMonitoringSupport.hpp"
 #include "gc/epsilon/epsilonBarrierSet.hpp"
 #include "gc/epsilon/epsilon_globals.hpp"
+#include "services/memoryManager.hpp"
 
 class EpsilonHeap : public CollectedHeap {
   friend class VMStructs;
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/g1/g1Allocator.hpp"
 #include "gc/g1/g1AllocRegion.inline.hpp"
 #include "gc/shared/plab.inline.hpp"
+#include "memory/universe.hpp"
 
 inline MutatorAllocRegion* G1Allocator::mutator_alloc_region() {
   return &_mutator_alloc_region;
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -83,6 +83,7 @@
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	Thu May 09 14:28:30 2019 +0200
@@ -56,6 +56,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 
 #include "gc/shared/verifyOption.hpp"
 #include "memory/iterator.hpp"
-#include "memory/universe.hpp"
 
 class G1CollectedHeap;
 class G1FullCollector;
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/g1/g1FullGCOopClosures.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "memory/iterator.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	Thu May 09 14:28:30 2019 +0200
@@ -38,6 +38,7 @@
 #include "logging/logStream.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu May 09 14:28:30 2019 +0200
@@ -28,7 +28,6 @@
 #include "gc/g1/heapRegionSet.hpp"
 #include "gc/shared/verifyOption.hpp"
 #include "memory/allocation.hpp"
-#include "memory/universe.hpp"
 #include "utilities/macros.hpp"
 
 class G1CollectedHeap;
--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp	Thu May 09 14:28:30 2019 +0200
@@ -40,6 +40,7 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "memory/allocation.inline.hpp"
+#include "memory/universe.hpp"
 #include "runtime/mutex.hpp"
 #include "services/management.hpp"
 #include "utilities/macros.hpp"
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
+#include "memory/universe.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 
 void VM_G1CollectFull::doit() {
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
+#include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 
 G1YoungRemSetSamplingThread::G1YoungRemSetSamplingThread() :
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "memory/iterator.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/safepoint.hpp"
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -45,6 +45,7 @@
 #include "gc/shared/scavengableNMethods.hpp"
 #include "logging/log.hpp"
 #include "memory/metaspaceCounters.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp	Thu May 09 14:28:30 2019 +0200
@@ -50,6 +50,7 @@
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/weakProcessor.hpp"
+#include "memory/universe.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/biasedLocking.hpp"
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Thu May 09 14:28:30 2019 +0200
@@ -58,6 +58,7 @@
 #include "logging/log.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/instanceClassLoaderKlass.inline.hpp"
 #include "oops/instanceKlass.inline.hpp"
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/psPromotionLAB.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 
 size_t PSPromotionLAB::filler_header_size;
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp	Thu May 09 14:28:30 2019 +0200
@@ -48,6 +48,7 @@
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "logging/log.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp	Thu May 09 14:28:30 2019 +0200
@@ -46,6 +46,7 @@
 #include "gc/shared/space.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceRefKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
--- a/src/hotspot/share/gc/serial/markSweep.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/serial/markSweep.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "memory/iterator.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/instanceClassLoaderKlass.inline.hpp"
--- a/src/hotspot/share/gc/serial/serialHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "gc/serial/serialHeap.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
 #include "gc/shared/genMemoryPools.hpp"
+#include "memory/universe.hpp"
 #include "services/memoryManager.hpp"
 
 SerialHeap* SerialHeap::heap() {
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -38,6 +38,7 @@
 #include "logging/log.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/gc/shared/gcConfiguration.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/gcConfiguration.hpp	Thu May 09 14:28:30 2019 +0200
@@ -26,7 +26,6 @@
 #define SHARE_GC_SHARED_GCCONFIGURATION_HPP
 
 #include "gc/shared/gcName.hpp"
-#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "utilities/globalDefinitions.hpp"
 
--- a/src/hotspot/share/gc/shared/gcLocker.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/gcLocker.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/safepoint.hpp"
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp	Thu May 09 14:28:30 2019 +0200
@@ -33,6 +33,7 @@
 #include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
 #include "utilities/dtrace.hpp"
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -56,6 +56,7 @@
 #include "memory/filemap.hpp"
 #include "memory/metaspaceCounters.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/flags/flagSetting.hpp"
--- a/src/hotspot/share/gc/shared/generation.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/generation.hpp	Thu May 09 14:28:30 2019 +0200
@@ -30,7 +30,6 @@
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
-#include "memory/universe.hpp"
 #include "memory/virtualspace.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/perfData.hpp"
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,10 +25,7 @@
 #ifndef SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
 #define SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
 
-#include "gc/shared/collectedHeap.hpp"
 #include "memory/allocation.hpp"
-#include "memory/universe.hpp"
-#include "utilities/debug.hpp"
 
 // This class provides a method for block structured setting of the
 // _is_gc_active state without requiring accessors in CollectedHeap
--- a/src/hotspot/share/gc/shared/markBitMap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/markBitMap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/markBitMap.inline.hpp"
+#include "memory/universe.hpp"
 #include "memory/virtualspace.hpp"
 
 void MarkBitMap::print_on_error(outputStream* st, const char* prefix) const {
--- a/src/hotspot/share/gc/shared/markBitMap.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/markBitMap.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -28,7 +28,6 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/markBitMap.hpp"
 #include "memory/memRegion.hpp"
-#include "memory/universe.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
--- a/src/hotspot/share/gc/shared/plab.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/plab.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "gc/shared/plab.inline.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "logging/log.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 
 size_t PLAB::min_size() {
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,6 +35,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
--- a/src/hotspot/share/gc/shared/scavengableNMethods.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "code/nmethod.hpp"
 #include "gc/shared/scavengableNMethods.hpp"
 #include "gc/shared/scavengableNMethodsData.hpp"
-#include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"
 
--- a/src/hotspot/share/gc/shared/space.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/space.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -30,7 +30,6 @@
 #include "gc/shared/generation.hpp"
 #include "gc/shared/space.hpp"
 #include "gc/shared/spaceDecorator.hpp"
-#include "memory/universe.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "logging/log.hpp"
 #include "memory/padded.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
+#include "memory/universe.hpp"
 #include "logging/log.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/copy.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahCodeRoots.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 
 ShenandoahParallelCodeCacheIterator::ShenandoahParallelCodeCacheIterator(const GrowableArray<CodeHeap*>* heaps) {
   _length = heaps->length();
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "memory/universe.hpp"
 
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcTimer.hpp"
@@ -65,7 +66,6 @@
 #include "gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp"
-
 #include "memory/metaspace.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "runtime/globals.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahPacer.hpp"
-#include "memory/universe.hpp"
 #include "utilities/sizes.hpp"
 
 class VMStructs;
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Thu May 09 14:28:30 2019 +0200
@@ -43,6 +43,7 @@
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
 #include "memory/metaspace.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp	Thu May 09 14:28:30 2019 +0200
@@ -53,6 +53,7 @@
 #include "memory/iterator.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 
 /**
  * NOTE: We are using the SATB buffer in thread.hpp and satbMarkQueue.hpp, however, it is not an SATB algorithm.
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
+#include "memory/universe.hpp"
 
 bool VM_ShenandoahReferenceOperation::doit_prologue() {
   Heap_lock->lock();
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,10 +31,10 @@
 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
-#include "oops/compressedOops.inline.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/compressedOops.inline.hpp"
 
 // Avoid name collision on verify_oop (defined in macroAssembler_arm.hpp)
 #ifdef verify_oop
@@ -947,4 +947,3 @@
   ShenandoahVerifyNoForwared cl;
   rp.process_all_roots_slow(&cl);
 }
-
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/z/zServiceability.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zUtils.inline.hpp"
+#include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 
 ZCollectedHeap* ZCollectedHeap::heap() {
--- a/src/hotspot/share/gc/z/zNMethod.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/gc/z/zNMethod.cpp	Thu May 09 14:28:30 2019 +0200
@@ -39,6 +39,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.cpp	Thu May 09 14:28:30 2019 +0200
@@ -34,6 +34,7 @@
 #include "interpreter/interpreterRuntime.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/method.inline.hpp"
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.inline.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 
 #include "interpreter/bytecode.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "runtime/frame.hpp"
 #include "runtime/signature.hpp"
--- a/src/hotspot/share/interpreter/linkResolver.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/interpreter/linkResolver.cpp	Thu May 09 14:28:30 2019 +0200
@@ -39,7 +39,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/instanceKlass.hpp"
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "classfile/moduleEntry.hpp"
 #include "classfile/modules.hpp"
 #include "classfile/stackMapTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/verificationType.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "jfr/instrumentation/jfrEventClassTransformer.hpp"
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "jfr/leakprofiler/utilities/unifiedOop.hpp"
 #include "jfr/leakprofiler/checkpoint/rootResolver.hpp"
 #include "memory/iterator.hpp"
+#include "memory/universe.hpp"
 #include "oops/klass.hpp"
 #include "oops/markOop.hpp"
 #include "oops/oop.hpp"
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/service/jfrRecorderThread.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/thread.inline.hpp"
--- a/src/hotspot/share/jvmci/jvmci.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmci.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "jvmci/jvmciJavaClasses.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "jvmci/metadataHandleBlock.hpp"
+#include "memory/universe.hpp"
 
 OopStorage* JVMCI::_object_handles = NULL;
 MetadataHandleBlock* JVMCI::_metadata_handles = NULL;
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "jvmci/jvmciCodeInstaller.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciRuntime.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Thu May 09 14:28:30 2019 +0200
@@ -34,6 +34,7 @@
 #include "jvmci/jvmciCodeInstaller.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,11 +25,12 @@
 #include "ci/ciUtilities.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "oops/compressedOops.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "jvmci/jvmciEnv.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/vmStructs_jvmci.hpp"
+#include "memory/universe.hpp"
+#include "oops/compressedOops.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/resourceHash.hpp"
 
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,9 +24,12 @@
 
 #include "precompiled.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "code/codeCache.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/javaCalls.hpp"
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp	Thu May 09 14:28:30 2019 +0200
@@ -22,14 +22,17 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/symbolTable.hpp"
 #include "compiler/compileBroker.hpp"
 #include "jvmci/jniAccessMark.inline.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/method.inline.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/deoptimization.hpp"
--- a/src/hotspot/share/memory/allocation.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/allocation.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,7 +28,6 @@
 #include "memory/arena.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
--- a/src/hotspot/share/memory/arena.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/arena.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
--- a/src/hotspot/share/memory/filemap.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/filemap.hpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "include/cds.h"
 #include "memory/metaspaceShared.hpp"
 #include "memory/metaspace.hpp"
-#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "utilities/align.hpp"
 
--- a/src/hotspot/share/memory/heapInspection.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/heapInspection.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/reflectionAccessorImplKlassHelper.hpp"
 #include "runtime/os.hpp"
--- a/src/hotspot/share/memory/heapShared.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/heapShared.cpp	Thu May 09 14:28:30 2019 +0200
@@ -36,6 +36,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/memory/heapShared.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/heapShared.hpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metaspaceShared.hpp"
-#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.hpp"
--- a/src/hotspot/share/memory/iterator.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/iterator.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "code/nmethod.hpp"
 #include "memory/iterator.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/memory/iterator.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/iterator.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 
 #include "classfile/classLoaderData.hpp"
 #include "memory/iterator.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.hpp"
--- a/src/hotspot/share/memory/metaspaceShared.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/metaspaceShared.cpp	Thu May 09 14:28:30 2019 +0200
@@ -47,6 +47,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
--- a/src/hotspot/share/memory/oopFactory.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/oopFactory.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,19 +25,13 @@
 #ifndef SHARE_MEMORY_OOPFACTORY_HPP
 #define SHARE_MEMORY_OOPFACTORY_HPP
 
-#include "classfile/symbolTable.hpp"
-#include "classfile/systemDictionary.hpp"
 #include "memory/referenceType.hpp"
-#include "memory/universe.hpp"
-#include "oops/objArrayKlass.hpp"
-#include "oops/oop.hpp"
-#include "oops/typeArrayKlass.hpp"
-#include "utilities/growableArray.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "runtime/handles.hpp"
+#include "utilities/exceptions.hpp"
 
 // oopFactory is a class used for creating new objects.
 
-class vframeArray;
-
 class oopFactory: AllStatic {
  public:
   // Basic type leaf array allocation
--- a/src/hotspot/share/memory/universe.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/memory/universe.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/codeBehaviours.hpp"
@@ -49,7 +50,6 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
--- a/src/hotspot/share/oops/arrayKlass.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/arrayKlass.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #ifndef SHARE_OOPS_ARRAYKLASS_HPP
 #define SHARE_OOPS_ARRAYKLASS_HPP
 
-#include "memory/universe.hpp"
 #include "oops/klass.hpp"
 
 class fieldDescriptor;
--- a/src/hotspot/share/oops/arrayOop.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/arrayOop.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #ifndef SHARE_OOPS_ARRAYOOP_HPP
 #define SHARE_OOPS_ARRAYOOP_HPP
 
-#include "memory/universe.hpp"
 #include "oops/oop.hpp"
 #include "utilities/align.hpp"
 
--- a/src/hotspot/share/oops/constantPool.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/constantPool.cpp	Thu May 09 14:28:30 2019 +0200
@@ -40,6 +40,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/array.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/cpCache.inline.hpp"
--- a/src/hotspot/share/oops/cpCache.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/cpCache.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,7 +35,6 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/constantPool.inline.hpp"
--- a/src/hotspot/share/oops/cpCache.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/cpCache.hpp	Thu May 09 14:28:30 2019 +0200
@@ -29,8 +29,10 @@
 #include "memory/allocation.hpp"
 #include "oops/array.hpp"
 #include "oops/oopHandle.hpp"
+#include "runtime/handles.hpp"
 #include "utilities/align.hpp"
 #include "utilities/constantTag.hpp"
+#include "utilities/growableArray.hpp"
 
 class PSPromotionManager;
 
--- a/src/hotspot/share/oops/generateOopMap.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/generateOopMap.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 
 #include "interpreter/bytecodeStream.hpp"
 #include "memory/allocation.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/signature.hpp"
--- a/src/hotspot/share/oops/instanceKlass.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/instanceKlass.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/verifier.hpp"
@@ -52,6 +53,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
--- a/src/hotspot/share/oops/instanceMirrorKlass.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/instanceMirrorKlass.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/instanceOop.hpp"
--- a/src/hotspot/share/oops/klass.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/klass.cpp	Thu May 09 14:28:30 2019 +0200
@@ -39,6 +39,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
--- a/src/hotspot/share/oops/klass.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/klass.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #ifndef SHARE_OOPS_KLASS_INLINE_HPP
 #define SHARE_OOPS_KLASS_INLINE_HPP
 
-#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/klass.hpp"
 #include "oops/markOop.hpp"
--- a/src/hotspot/share/oops/method.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/method.cpp	Thu May 09 14:28:30 2019 +0200
@@ -41,10 +41,12 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/constMethod.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/methodData.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
--- a/src/hotspot/share/oops/methodData.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/methodData.hpp	Thu May 09 14:28:30 2019 +0200
@@ -26,7 +26,6 @@
 #define SHARE_OOPS_METHODDATA_HPP
 
 #include "interpreter/bytecodes.hpp"
-#include "memory/universe.hpp"
 #include "oops/metadata.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.hpp"
--- a/src/hotspot/share/oops/oop.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/oop.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "memory/heapShared.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/oops/oop.inline.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/oop.inline.hpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #define SHARE_OOPS_OOP_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
--- a/src/hotspot/share/oops/oopsHierarchy.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/oopsHierarchy.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/oops/oopsHierarchy.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/oopsHierarchy.hpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
-#include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // OBJECT hierarchy
@@ -75,6 +74,8 @@
 class PromotedObject;
 class oopDesc;
 
+extern bool CheckUnhandledOops;
+
 class oop {
   oopDesc* _o;
 
--- a/src/hotspot/share/oops/symbol.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/symbol.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
--- a/src/hotspot/share/oops/typeArrayKlass.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp	Thu May 09 14:28:30 2019 +0200
@@ -33,7 +33,6 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "memory/universe.hpp"
 #include "oops/arrayKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
--- a/src/hotspot/share/opto/machnode.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/opto/machnode.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "opto/machnode.hpp"
 #include "opto/regalloc.hpp"
--- a/src/hotspot/share/opto/macro.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/opto/macro.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "compiler/compileLog.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "libadt/vectset.hpp"
+#include "memory/universe.hpp"
 #include "opto/addnode.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/callnode.hpp"
--- a/src/hotspot/share/prims/jvm.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvm.cpp	Thu May 09 14:28:30 2019 +0200
@@ -33,6 +33,7 @@
 #include "classfile/modules.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/symbolTable.hpp"
 #include "interpreter/bytecodeStream.hpp"
+#include "memory/universe.hpp"
 #include "oops/fieldStreams.hpp"
 #include "prims/jvmtiClassFileReconstituter.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/prims/jvmtiExport.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiExport.cpp	Thu May 09 14:28:30 2019 +0200
@@ -35,6 +35,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/prims/jvmtiImpl.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiImpl.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/oopMapCache.hpp"
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "classfile/classFileStream.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/metadataOnStackMark.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/verifier.hpp"
 #include "code/codeCache.hpp"
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -32,6 +32,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
 #include "oops/constantPool.inline.hpp"
--- a/src/hotspot/share/prims/jvmtiTagMap.hpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiTagMap.hpp	Thu May 09 14:28:30 2019 +0200
@@ -31,7 +31,6 @@
 #include "jvmtifiles/jvmti.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "memory/allocation.hpp"
-#include "memory/universe.hpp"
 
 // forward references
 class JvmtiTagHashmap;
--- a/src/hotspot/share/prims/methodHandles.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/methodHandles.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "code/codeCache.hpp"
 #include "code/dependencyContext.hpp"
 #include "compiler/compileBroker.hpp"
@@ -34,6 +35,8 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
--- a/src/hotspot/share/prims/nativeLookup.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/nativeLookup.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/prims/resolvedMethodTable.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/method.hpp"
--- a/src/hotspot/share/prims/stackwalk.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/stackwalk.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "prims/stackwalk.hpp"
--- a/src/hotspot/share/prims/whitebox.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/prims/whitebox.cpp	Thu May 09 14:28:30 2019 +0200
@@ -30,6 +30,7 @@
 #include "classfile/modules.hpp"
 #include "classfile/protectionDomainCache.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/methodMatcher.hpp"
 #include "compiler/directivesParser.hpp"
--- a/src/hotspot/share/runtime/arguments.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp	Thu May 09 14:28:30 2019 +0200
@@ -36,7 +36,6 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
--- a/src/hotspot/share/runtime/deoptimization.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "code/debugInfoRec.hpp"
@@ -38,6 +39,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/method.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/fieldStreams.hpp"
--- a/src/hotspot/share/runtime/fieldDescriptor.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/fieldDescriptor.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,7 +26,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/annotations.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/instanceKlass.hpp"
--- a/src/hotspot/share/runtime/fieldType.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/fieldType.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
--- a/src/hotspot/share/runtime/interfaceSupport.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/interfaceSupport.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/runtime/java.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/java.cpp	Thu May 09 14:28:30 2019 +0200
@@ -28,6 +28,7 @@
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/compileBroker.hpp"
--- a/src/hotspot/share/runtime/jniHandles.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/jniHandles.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,6 +26,7 @@
 #include "gc/shared/oopStorage.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/runtime/memprofiler.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/memprofiler.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/memprofiler.hpp"
--- a/src/hotspot/share/runtime/mutexLocker.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/mutexLocker.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
--- a/src/hotspot/share/runtime/os.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/os.cpp	Thu May 09 14:28:30 2019 +0200
@@ -38,10 +38,9 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#ifdef ASSERT
 #include "memory/guardedMemory.hpp"
-#endif
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvm_misc.hpp"
--- a/src/hotspot/share/runtime/relocator.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/relocator.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,7 +27,6 @@
 #include "interpreter/bytecodes.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/oopFactory.hpp"
-#include "memory/universe.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/runtime/serviceThread.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/serviceThread.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
+#include "memory/universe.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
--- a/src/hotspot/share/runtime/signature.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/signature.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
--- a/src/hotspot/share/runtime/synchronizer.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/synchronizer.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/padded.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
--- a/src/hotspot/share/runtime/unhandledOops.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/unhandledOops.cpp	Thu May 09 14:28:30 2019 +0200
@@ -24,7 +24,6 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/unhandledOops.hpp"
--- a/src/hotspot/share/runtime/vframeArray.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/vframeArray.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,7 +29,6 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiThreadState.hpp"
--- a/src/hotspot/share/runtime/vmOperations.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/vmOperations.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,12 +27,14 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/compileBroker.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "logging/logConfiguration.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/deoptimization.hpp"
--- a/src/hotspot/share/runtime/vmThread.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/vmThread.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logConfiguration.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/verifyOopClosure.hpp"
--- a/src/hotspot/share/runtime/vm_version.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/runtime/vm_version.cpp	Thu May 09 14:28:30 2019 +0200
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/vm_version.hpp"
--- a/src/hotspot/share/services/attachListener.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/services/attachListener.cpp	Thu May 09 14:28:30 2019 +0200
@@ -27,6 +27,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
--- a/src/hotspot/share/services/classLoadingService.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/services/classLoadingService.cpp	Thu May 09 14:28:30 2019 +0200
@@ -26,7 +26,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "services/classLoadingService.hpp"
--- a/src/hotspot/share/services/diagnosticCommand.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/services/diagnosticCommand.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/gcVMOperations.hpp"
 #include "memory/metaspace/metaspaceDCmd.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
--- a/src/hotspot/share/services/management.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/services/management.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "memory/iterator.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/klass.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
--- a/src/hotspot/share/services/threadService.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/services/threadService.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
--- a/src/hotspot/share/utilities/exceptions.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/utilities/exceptions.cpp	Thu May 09 14:28:30 2019 +0200
@@ -29,6 +29,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
--- a/src/hotspot/share/utilities/vmError.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/src/hotspot/share/utilities/vmError.cpp	Thu May 09 14:28:30 2019 +0200
@@ -31,6 +31,7 @@
 #include "logging/logConfiguration.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "prims/whitebox.hpp"
 #include "runtime/arguments.hpp"
--- a/test/hotspot/gtest/gc/shared/test_collectedHeap.cpp	Thu May 09 14:26:52 2019 +0200
+++ b/test/hotspot/gtest/gc/shared/test_collectedHeap.cpp	Thu May 09 14:28:30 2019 +0200
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "unittest.hpp"
 
 TEST_VM(CollectedHeap, is_in) {