--- a/hotspot/src/share/vm/memory/universe.hpp	Sat Jul 22 15:54:27 2017 -0400
+++ b/hotspot/src/share/vm/memory/universe.hpp	Wed Aug 02 18:06:38 2017 -0700
@@ -67,6 +67,7 @@
   void serialize(SerializeClosure* f) {
     f->do_ptr((void**)&_klass);
   }
+  void metaspace_pointers_do(MetaspaceClosure* it);
 };
 
 
@@ -102,6 +103,7 @@
   friend class VMStructs;
   friend class VM_PopulateDumpSharedSpace;
   friend class Metaspace;
+  friend class MetaspaceShared;
 
   friend jint  universe_init();
   friend void  universe2_init();
@@ -474,6 +476,7 @@
   // Apply "f" to all klasses for basic types (classes not present in
   // SystemDictionary).
   static void basic_type_classes_do(void f(Klass*));
+  static void metaspace_pointers_do(MetaspaceClosure* it);
 
   // Debugging
   enum VERIFY_FLAGS {