--- old/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:15:59.219822997 +0200
+++ new/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:15:59.115823002 +0200
@@ -26,26 +26,13 @@
 #define SHARE_VM_MEMORY_SHAREDHEAP_HPP
 
 #include "gc_interface/collectedHeap.hpp"
-#include "memory/generation.hpp"
 
 // A "SharedHeap" is an implementation of a java heap for HotSpot.  This
 // is an abstract class: there may be many different kinds of heaps.  This
 // class defines the functions that a heap must implement, and contains
 // infrastructure common to all heaps.
 
-class Generation;
-class BarrierSet;
-class GenRemSet;
-class Space;
-class SpaceClosure;
-class OopClosure;
-class OopsInGenClosure;
-class ObjectClosure;
-class SubTasksDone;
-class WorkGang;
 class FlexibleWorkGang;
-class CollectorPolicy;
-class KlassClosure;
 
 // Note on use of FlexibleWorkGang's for GC.
 // There are three places where task completion is determined.
@@ -101,9 +88,6 @@
 class SharedHeap : public CollectedHeap {
   friend class VMStructs;
 
-  friend class VM_GC_Operation;
-  friend class VM_CGC_Operation;
-
 protected:
   // If we're doing parallel GC, use this gang of threads.
   FlexibleWorkGang* _workers;