--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	Sat May 11 13:10:24 2019 +0200
@@ -35,7 +35,9 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_ppc.hpp"
+#include "oops/compressedOops.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
@@ -1237,7 +1239,7 @@
   int disp_value = addr->disp();
   bool needs_patching = (patch_code != lir_patch_none);
   bool compress_oop = (type == T_ARRAY || type == T_OBJECT) && UseCompressedOops && !wide &&
-                      Universe::narrow_oop_mode() != Universe::UnscaledNarrowOop;
+                      CompressedOops::mode() != CompressedOops::UnscaledNarrowOop;
   bool load_disp = addr->index()->is_illegal() && !Assembler::is_simm16(disp_value);
   bool use_R29 = compress_oop && load_disp; // Avoid register conflict, also do null check before killing R29.
   // Null check for large offsets in LIRGenerator::do_StoreField.

--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp	Sat May 11 13:10:24 2019 +0200
@@ -32,7 +32,6 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_ppc.hpp"
-#include "oops/compressedOops.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/icache.hpp"

--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Sat May 11 13:10:24 2019 +0200
@@ -33,6 +33,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "oops/accessDecorators.hpp"
+#include "oops/compressedOops.hpp"
 #include "runtime/safepointMechanism.hpp"
 
 inline bool MacroAssembler::is_ld_largeoffset(address a) {

--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Sat May 11 13:10:24 2019 +0200
@@ -35,6 +35,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_s390.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"

--- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp	Sat May 11 13:10:24 2019 +0200
@@ -34,6 +34,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/universe.hpp"
 #include "nativeInst_sparc.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"

--- a/src/hotspot/os/solaris/os_solaris.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/os/solaris/os_solaris.cpp	Sat May 11 13:10:24 2019 +0200
@@ -36,6 +36,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/filemap.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_share_solaris.hpp"
 #include "os_solaris.inline.hpp"

--- a/src/hotspot/share/adlc/main.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/share/adlc/main.cpp	Sat May 11 13:10:24 2019 +0200
@@ -217,6 +217,7 @@
   AD.addInclude(AD._CPP_file, "code/vmreg.inline.hpp");
   AD.addInclude(AD._CPP_file, "gc/shared/collectedHeap.inline.hpp");
   AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp");
+  AD.addInclude(AD._CPP_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._CPP_file, "oops/markOop.hpp");
   AD.addInclude(AD._CPP_file, "oops/method.hpp");
   AD.addInclude(AD._CPP_file, "oops/oop.inline.hpp");
@@ -233,6 +234,7 @@
   AD.addInclude(AD._CPP_file, "runtime/stubRoutines.hpp");
   AD.addInclude(AD._CPP_file, "utilities/growableArray.hpp");
   AD.addInclude(AD._HPP_file, "memory/allocation.hpp");
+  AD.addInclude(AD._HPP_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._HPP_file, "code/nativeInst.hpp");
   AD.addInclude(AD._HPP_file, "opto/machnode.hpp");
   AD.addInclude(AD._HPP_file, "opto/node.hpp");
@@ -243,6 +245,7 @@
   AD.addInclude(AD._CPP_CLONE_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_EXPAND_file, "precompiled.hpp");
   AD.addInclude(AD._CPP_EXPAND_file, "adfiles", get_basename(AD._HPP_file._name));
+  AD.addInclude(AD._CPP_EXPAND_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._CPP_FORMAT_file, "precompiled.hpp");
   AD.addInclude(AD._CPP_FORMAT_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_GEN_file, "precompiled.hpp");
@@ -257,6 +260,7 @@
   AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._DFA_file, "precompiled.hpp");
   AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
+  AD.addInclude(AD._DFA_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp");  // Use PROB_MAX in predicate.
   AD.addInclude(AD._DFA_file, "opto/intrinsicnode.hpp");
   AD.addInclude(AD._DFA_file, "opto/matcher.hpp");

--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp	Sat May 11 13:10:24 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/thread.hpp"
 #include "services/management.hpp"
 

--- a/src/hotspot/share/memory/filemap.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/share/memory/filemap.cpp	Sat May 11 13:10:24 2019 +0200
@@ -41,6 +41,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/oops/compressedOops.hpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/share/oops/compressedOops.hpp	Sat May 11 13:10:24 2019 +0200
@@ -26,6 +26,7 @@
 #define SHARE_OOPS_COMPRESSEDOOPS_HPP
 
 #include "memory/allocation.hpp"
+#include "oops/oopsHierarchy.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class outputStream;

--- a/src/hotspot/share/runtime/deoptimization.cpp	Thu Mar 14 14:04:39 2019 +0100
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Sat May 11 13:10:24 2019 +0200
@@ -37,6 +37,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"