--- a/src/hotspot/share/gc/shared/gcConfiguration.cpp	Thu May 09 07:21:32 2019 -0400
+++ b/src/hotspot/share/gc/shared/gcConfiguration.cpp	Thu May 09 14:26:03 2019 +0200
@@ -27,6 +27,7 @@
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcConfiguration.hpp"
 #include "memory/universe.hpp"
+#include "oops/compressedOops.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/debug.hpp"
@@ -143,8 +144,8 @@
   return UseCompressedOops;
 }
 
-Universe::NARROW_OOP_MODE GCHeapConfiguration::narrow_oop_mode() const {
-  return Universe::narrow_oop_mode();
+CompressedOops::Mode GCHeapConfiguration::narrow_oop_mode() const {
+  return CompressedOops::mode();
 }
 
 uint GCHeapConfiguration::object_alignment_in_bytes() const {