--- a/src/hotspot/share/runtime/jniHandles.hpp	Wed Aug 21 16:19:17 2019 -0400
+++ b/src/hotspot/share/runtime/jniHandles.hpp	Wed Aug 21 18:42:30 2019 -0400
@@ -37,8 +37,10 @@
 class JNIHandles : AllStatic {
   friend class VMStructs;
  private:
+  // These are used by the serviceability agent.
   static OopStorage* _global_handles;
   static OopStorage* _weak_global_handles;
+  friend void jni_handles_init();
 
   inline static bool is_jweak(jobject handle);
   inline static oop* jobject_ptr(jobject handle); // NOT jweak!
@@ -122,9 +124,6 @@
   static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f);
   // Traversal of weak global handles.
   static void weak_oops_do(OopClosure* f);
-
-  static OopStorage* global_handles();
-  static OopStorage* weak_global_handles();
 };