--- old/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp	2018-04-12 10:20:15.227719880 +0200
+++ new/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp	2018-04-12 10:20:15.027711241 +0200
@@ -30,7 +30,6 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interp_masm.hpp"
 
 #define __ masm->
@@ -204,7 +203,7 @@
   Label runtime, filtered;
   assert_different_registers(store_addr, new_val, tmp1, tmp2);
 
-  CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+  CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
   assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
 
   // Does store cross heap regions?