--- old/src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp	2018-02-20 23:17:56.337151796 +0100
+++ new/src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp	2018-02-20 23:17:56.117144275 +0100
@@ -23,8 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcArguments.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "runtime/arguments.hpp"
@@ -642,7 +643,7 @@
   } else
 #endif
   {
-    heap_alignment = CollectorPolicy::compute_heap_alignment();
+    heap_alignment = compute_heap_alignment();
   }
 
   return MaxSizeForAlignment(name, value, heap_alignment, verbose);
@@ -753,12 +754,12 @@
 
 Flag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
   if (FLAG_IS_CMDLINE(SurvivorRatio) &&
-      (value > (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()))) {
+      (value > (MaxHeapSize / Universe::heap()->space_alignment()))) {
     CommandLineError::print(verbose,
                             "SurvivorRatio (" UINTX_FORMAT ") must be "
                             "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
                             value,
-                            (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()));
+                            (MaxHeapSize / Universe::heap()->space_alignment()));
     return Flag::VIOLATES_CONSTRAINT;
   } else {
     return Flag::SUCCESS;