--- old/src/share/vm/runtime/java.cpp	2015-05-13 13:53:33.144914110 +0200
+++ new/src/share/vm/runtime/java.cpp	2015-05-13 13:53:32.974907056 +0200
@@ -29,8 +29,8 @@
 #include "code/codeCache.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
-#include "memory/genCollectedHeap.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
@@ -65,8 +65,8 @@
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/parallel/psScavenge.hpp"
 #endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"