--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Wed May 13 15:16:06 2015 +0200
@@ -30,11 +30,12 @@
 #include "code/codeCache.hpp"
 #include "code/scopeDesc.hpp"
 #include "compiler/compileBroker.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/workgroup.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
-#include "memory/gcLocker.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.inline.hpp"
@@ -82,18 +83,17 @@
 #include "services/management.hpp"
 #include "services/memTracker.hpp"
 #include "services/threadService.hpp"
+#include "trace/traceMacros.hpp"
 #include "trace/tracing.hpp"
-#include "trace/traceMacros.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/preserveException.hpp"
-#include "utilities/workgroup.hpp"
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/parallelScavenge/pcTasks.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/parallel/pcTasks.hpp"
 #endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"