--- a/src/hotspot/share/runtime/arguments.cpp	Mon Mar 12 16:53:47 2018 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp	Mon Mar 26 09:56:36 2018 +0200
@@ -38,7 +38,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
@@ -1857,11 +1857,6 @@
   return JNI_OK;
 }
 
-void Arguments::set_gc_specific_flags() {
-  // Set GC flags
-  GCArguments::arguments()->initialize_flags();
-}
-
 julong Arguments::limit_by_allocatable_memory(julong limit) {
   julong max_allocatable;
   julong result = limit;
@@ -4288,7 +4283,7 @@
   // Set heap size based on available physical memory
   set_heap_size();
 
-  ArgumentsExt::set_gc_specific_flags();
+  GCArguments::arguments()->initialize_flags();
 
   // Initialize Metaspace flags and alignments
   Metaspace::ergo_initialize();