--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp	Wed May 13 15:16:06 2015 +0200
@@ -40,9 +40,9 @@
 #include "prims/jvmtiImpl.hpp"
 #include "prims/jvmtiManageCapabilities.hpp"
 #include "prims/jvmtiRawMonitor.hpp"
+#include "prims/jvmtiRedefineClasses.hpp"
 #include "prims/jvmtiTagMap.hpp"
 #include "prims/jvmtiThreadState.inline.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/interfaceSupport.hpp"
@@ -55,7 +55,7 @@
 #include "services/serviceUtil.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
 #endif // INCLUDE_ALL_GCS
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC