--- old/src/share/vm/gc/g1/g1CardCounts.hpp	2017-04-25 16:44:31.299175322 +0200
+++ new/src/share/vm/gc/g1/g1CardCounts.hpp	2017-04-25 16:44:31.123175328 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
 #define SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
 
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "memory/allocation.hpp"
 #include "memory/virtualspace.hpp"
@@ -67,7 +68,7 @@
   const jbyte* _ct_bot;
 
   // Barrier set
-  CardTableModRefBS* _ct_bs;
+  G1CardTable* _ct;
 
   // Returns true if the card counts table has been reserved.
   bool has_reserved_count_table() { return _card_counts != NULL; }