--- old/src/share/vm/memory/strongRootsScope.hpp	2015-04-02 13:02:48.424246888 +0200
+++ new/src/share/vm/memory/strongRootsScope.hpp	2015-04-02 13:02:48.308246893 +0200
@@ -25,11 +25,19 @@
 #ifndef SHARE_VM_MEMORY_STRONGROOTSSCOPE_HPP
 #define SHARE_VM_MEMORY_STRONGROOTSSCOPE_HPP
 
-#include "memory/iterator.hpp"
+#include "memory/allocation.hpp"
+
+class MarkScope : public StackObj {
+ protected:
+  bool _active;
+ public:
+  MarkScope(bool activate = true);
+  ~MarkScope();
+};
 
 // Sets up and tears down the required state for parallel root processing.
 
-class StrongRootsScope : public MarkingCodeBlobClosure::MarkScope {
+class StrongRootsScope : public MarkScope {
  public:
   StrongRootsScope(bool activate = true);
   ~StrongRootsScope();