diff -r 2cd9b35e0eda -r 539c597ee0fa hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp
--- a/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp	Mon Apr 18 22:40:47 2016 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp	Fri Mar 18 15:20:43 2016 +0100
@@ -30,9 +30,9 @@
 #include "gc/g1/bufferingOopClosure.hpp"
 #include "gc/g1/g1CodeBlobClosure.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
 #include "gc/g1/heapRegion.inline.hpp"