--- a/src/hotspot/share/memory/universe.cpp	Mon May 07 20:42:36 2018 +0200
+++ b/src/hotspot/share/memory/universe.cpp	Thu Apr 26 13:40:58 2018 -0700
@@ -81,9 +81,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;
@@ -1094,7 +1091,7 @@
 
   MemoryService::set_universe_heap(Universe::heap());
 #if INCLUDE_CDS
-  SharedClassUtil::initialize(CHECK_false);
+  MetaspaceShared::post_initialize(CHECK_false);
 #endif
   return true;
 }