--- old/src/share/vm/classfile/placeholders.hpp	2017-07-18 22:54:47.548207720 -0400
+++ new/src/share/vm/classfile/placeholders.hpp	2017-07-18 22:54:47.300403917 -0400
@@ -34,8 +34,7 @@
 // being loaded, as well as arrays of primitives.
 //
 
-class PlaceholderTable : public TwoOopHashtable<Symbol*, mtClass> {
-  friend class VMStructs;
+class PlaceholderTable : public Hashtable<Symbol*, mtClass> {
 
 public:
   PlaceholderTable(int table_size);
@@ -149,8 +148,6 @@
 // The system dictionary is the only user of this class.
 
 class PlaceholderEntry : public HashtableEntry<Symbol*, mtClass> {
-  friend class VMStructs;
-
 
  private:
   ClassLoaderData*  _loader_data;   // initiating loader