--- old/src/share/vm/prims/jni.cpp	2016-04-15 19:16:18.584661861 +0200
+++ new/src/share/vm/prims/jni.cpp	2016-04-15 19:16:18.524663128 +0200
@@ -84,7 +84,7 @@
 #include "utilities/internalVMTests.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #endif // INCLUDE_ALL_GCS
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciCompiler.hpp"
@@ -2062,7 +2062,7 @@
 
     if (needs_barrier) {
       oop referent = JNIHandles::resolve(ret);
-      G1SATBCardTableModRefBS::enqueue(referent);
+      SATBMarkQueue::enqueue(referent);
     }
   }
 #endif // INCLUDE_ALL_GCS