--- old/src/hotspot/share/gc/cms/cmsArguments.hpp	2018-02-20 23:17:37.732515820 +0100
+++ new/src/hotspot/share/gc/cms/cmsArguments.hpp	2018-02-20 23:17:37.508508163 +0100
@@ -25,14 +25,16 @@
 #ifndef SHARE_GC_CMS_CMSARGUMENTS_HPP
 #define SHARE_GC_CMS_CMSARGUMENTS_HPP
 
-#include "gc/shared/gcArguments.hpp"
+#include "gc/cms/cmsSettings.hpp"
+#include "gc/shared/genArguments.hpp"
 
-class CollectedHeap;
-
-class CMSArguments : public GCArguments {
+class CMSArguments : public GenArguments {
 private:
+  CMSSettings initialize_heap_flags();
+
   void disable_adaptive_size_policy(const char* collector_name);
   void set_parnew_gc_flags();
+
 public:
   virtual void initialize_flags();
   virtual size_t conservative_max_heap_alignment();