diff -r e45861098f5a -r fec48bf5a827 hotspot/src/share/vm/c1/c1_Runtime1.cpp
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Wed May 13 15:16:06 2015 +0200
@@ -38,11 +38,11 @@
 #include "code/scopeDesc.hpp"
 #include "code/vtableStubs.hpp"
 #include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "interpreter/bytecode.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/barrierSet.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/objArrayKlass.hpp"