--- old/src/hotspot/share/gc/cms/cmsHeap.hpp	2018-02-20 23:17:38.364537426 +0100
+++ new/src/hotspot/share/gc/cms/cmsHeap.hpp	2018-02-20 23:17:38.144529904 +0100
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_CMS_CMSHEAP_HPP
 #define SHARE_VM_GC_CMS_CMSHEAP_HPP
 
+#include "gc/cms/cmsSettings.hpp"
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcCause.hpp"
@@ -32,8 +33,9 @@
 #include "utilities/growableArray.hpp"
 
 class CLDClosure;
-class GenCollectorPolicy;
+class CMSSettings;
 class GCMemoryManager;
+class GCPolicyCounters;
 class MemoryPool;
 class OopsInGenClosure;
 class outputStream;
@@ -47,11 +49,13 @@
   virtual void check_gen_kinds();
 
 public:
-  CMSHeap(GenCollectorPolicy *policy);
+  CMSHeap(const CMSSettings& settings);
 
   // Returns JNI_OK on success
   virtual jint initialize();
 
+  virtual void initialize_gc_policy_counters();
+
   // Convenience function to be used in situations where the heap type can be
   // asserted to be this type.
   static CMSHeap* heap();
@@ -97,6 +101,8 @@
   GCMemoryManager* old_manager() const { return _old_manager; }
 
 private:
+  const CMSSettings _settings;
+
   WorkGang* _workers;
   MemoryPool* _eden_pool;
   MemoryPool* _survivor_pool;