--- old/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	2015-05-12 11:36:58.332008522 +0200
+++ new/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	2015-05-12 11:36:58.231004315 +0200
@@ -32,9 +32,9 @@
 #include "c1/c1_ValueStack.hpp"
 #include "ci/ciArrayKlass.hpp"
 #include "ci/ciInstance.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/sharedRuntime.hpp"