diff -r e45861098f5a -r fec48bf5a827 hotspot/src/share/vm/memory/heapInspection.cpp
--- a/hotspot/src/share/vm/memory/heapInspection.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp	Wed May 13 15:16:06 2015 +0200
@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
@@ -35,7 +35,7 @@
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
 #endif // INCLUDE_ALL_GCS
 
 // HeapInspection