--- old/src/hotspot/share/memory/universe.cpp	2018-05-01 22:01:19.675977637 -0700
+++ new/src/hotspot/share/memory/universe.cpp	2018-05-01 22:01:19.407967315 -0700
@@ -85,9 +85,6 @@
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/preserveException.hpp"
-#if INCLUDE_CDS
-#include "classfile/sharedClassUtil.hpp"
-#endif
 
 // Known objects
 Klass* Universe::_boolArrayKlassObj                 = NULL;
@@ -1098,7 +1095,7 @@
 
   MemoryService::set_universe_heap(Universe::heap());
 #if INCLUDE_CDS
-  SharedClassUtil::initialize(CHECK_false);
+  MetaspaceShared::post_initialize(CHECK_false);
 #endif
   return true;
 }