--- old/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp	2019-08-29 14:10:10.194943509 -0400
+++ new/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp	2019-08-29 14:10:09.906928062 -0400
@@ -25,12 +25,12 @@
 #ifndef SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
 #define SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
 
+#include "gc/g1/g1FreeIdSet.hpp"
 #include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
 
 class G1CardTableEntryClosure;
 class G1DirtyCardQueueSet;
-class G1FreeIdSet;
 class G1RedirtyCardsQueueSet;
 class Thread;
 class Monitor;
@@ -118,7 +118,7 @@
   size_t _completed_buffers_padding;
   static const size_t MaxCompletedBuffersUnlimited = SIZE_MAX;
 
-  G1FreeIdSet* _free_ids;
+  G1FreeIdSet _free_ids;
 
   // The number of completed buffers processed by mutator and rs thread,
   // respectively.