--- old/src/hotspot/share/gc/cms/cmsArguments.cpp	2017-11-14 12:30:34.554557654 +0100
+++ new/src/hotspot/share/gc/cms/cmsArguments.cpp	2017-11-14 12:30:34.202561605 +0100
@@ -24,7 +24,10 @@
 
 #include "precompiled.hpp"
 #include "gc/cms/cmsArguments.hpp"
+#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/cms/cmsHeap.hpp"
 #include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/shared/gcArguments.inline.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
@@ -192,3 +195,7 @@
     FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
   }
 }
+
+CollectedHeap* CMSArguments::create_heap() {
+  return create_heap_with_policy<CMSHeap, ConcurrentMarkSweepPolicy>();
+}