src/hotspot/share/gc/g1/g1RemSet.cpp

G1BarrierSet_merge

*** 31,41 ****
  #include "gc/g1/g1FromCardCache.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1RemSet.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.inline.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
--- 31,40 ----