--- a/src/hotspot/share/runtime/jniHandles.cpp	Tue Mar 06 13:08:59 2018 +0100
+++ b/src/hotspot/share/runtime/jniHandles.cpp	Tue Mar 06 08:36:44 2018 +0100
@@ -34,7 +34,7 @@
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
 #endif
 
 OopStorage* JNIHandles::_global_handles = NULL;
@@ -153,7 +153,7 @@
   oop result = jweak_ref(handle);
 #if INCLUDE_ALL_GCS
   if (result != NULL && UseG1GC) {
-    G1SATBCardTableModRefBS::enqueue(result);
+    G1BarrierSet::enqueue(result);
   }
 #endif // INCLUDE_ALL_GCS
   return result;