diff -r d18466a7dcee -r 219f8808c3bd hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp
--- a/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp	Mon Feb 22 19:25:32 2016 +0000
+++ b/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp	Tue Feb 23 10:44:05 2016 +0100
@@ -27,25 +27,12 @@
 
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/heapRegionManager.hpp"
+ #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/workgroup.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class G1CollectedHeap;
 
-class OopAndMarkOop {
-  oop _o;
-  markOop _m;
- public:
-  OopAndMarkOop(oop obj, markOop m) : _o(obj), _m(m) {
-  }
-
-  void set_mark() {
-    _o->set_mark(_m);
-  }
-};
-
-typedef Stack<OopAndMarkOop,mtGC> OopAndMarkOopStack;
-
 // Task to fixup self-forwarding pointers
 // installed as a result of an evacuation failure.
 class G1ParRemoveSelfForwardPtrsTask: public AbstractGangTask {