--- old/src/hotspot/share/gc/shared/gc.hpp	2017-10-17 23:16:56.118801272 +0200
+++ new/src/hotspot/share/gc/shared/gc.hpp	2017-10-17 23:16:55.644800119 +0200
@@ -22,28 +22,17 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GC_HPP
-#define SHARE_VM_GC_SHARED_GC_HPP
+#ifndef SHARE_GC_SHARED_GC_HPP
+#define SHARE_GC_SHARED_GC_HPP
 
 #include "memory/allocation.hpp"
 
 class GC : public CHeapObj<mtGC> {
-private:
-  static GC* _gc;
-
-  static void select_gc();
-  static void select_gc_ergonomically();
-  static bool gc_selected();
-
 public:
-  static jint initialize();
-  static bool is_initialized();
-  static GC* gc();
-
-  static void initialize_flags_global();
-
-  virtual void initialize_flags();
+  virtual void initialize_flags() {
+    // Default does nothing.
+  }
   virtual size_t conservative_max_heap_alignment() = 0;
 };
 
-#endif // SHARE_VM_GC_SHARED_GC_HPP
+#endif // SHARE_GC_SHARED_GC_HPP