--- old/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp	2019-02-25 16:56:56.650978778 -0500
+++ new/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp	2019-02-25 16:56:56.266958531 -0500
@@ -29,7 +29,7 @@
 
 class G1CollectedHeap;
 class Monitor;
-class JavaThread;
+class Thread;
 
 class G1SATBMarkQueueSet : public SATBMarkQueueSet {
   G1CollectedHeap* _g1h;
@@ -41,11 +41,10 @@
                   Monitor* cbl_mon,
                   BufferNode::Allocator* allocator,
                   size_t process_completed_buffers_threshold,
-                  uint buffer_enqueue_threshold_percentage,
-                  Mutex* lock);
+                  uint buffer_enqueue_threshold_percentage);
 
-  static void handle_zero_index_for_thread(JavaThread* t);
-  virtual SATBMarkQueue& satb_queue_for_thread(JavaThread* const t) const;
+  static void handle_zero_index_for_thread(Thread* t);
+  virtual SATBMarkQueue& satb_queue_for_thread(Thread* const t) const;
   virtual void filter(SATBMarkQueue* queue);
 };