--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed May 13 15:16:06 2015 +0200
@@ -23,18 +23,18 @@
  */
 
 #include "precompiled.hpp"
+#include "ci/ciField.hpp"
+#include "ci/ciInstance.hpp"
+#include "ci/ciMethodData.hpp"
+#include "ci/ciObjArrayKlass.hpp"
+#include "ci/ciSymbol.hpp"
+#include "classfile/compactHashtable.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/loaderConstraints.hpp"
 #include "classfile/placeholders.hpp"
-#include "classfile/compactHashtable.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "ci/ciField.hpp"
-#include "ci/ciInstance.hpp"
-#include "ci/ciObjArrayKlass.hpp"
-#include "ci/ciMethodData.hpp"
-#include "ci/ciSymbol.hpp"
 #include "code/codeBlob.hpp"
 #include "code/codeCache.hpp"
 #include "code/compressedStream.hpp"
@@ -43,30 +43,30 @@
 #include "code/pcDesc.hpp"
 #include "code/stubs.hpp"
 #include "code/vmreg.hpp"
+#include "compiler/compileBroker.hpp"
 #include "compiler/oopMap.hpp"
-#include "compiler/compileBroker.hpp"
-#include "gc_implementation/shared/immutableSpace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/immutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/watermark.hpp"
 #include "interpreter/bytecodeInterpreter.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/defNewGeneration.hpp"
 #include "memory/freeBlockDictionary.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generation.hpp"
-#include "memory/generationSpec.hpp"
 #include "memory/heap.hpp"
 #include "memory/metachunk.hpp"
 #include "memory/referenceType.hpp"
-#include "memory/space.hpp"
-#include "memory/tenuredGeneration.hpp"
 #include "memory/universe.hpp"
 #include "memory/virtualspace.hpp"
-#include "memory/watermark.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/compiledICHolder.hpp"
@@ -79,9 +79,9 @@
 #include "oops/instanceOop.hpp"
 #include "oops/klass.hpp"
 #include "oops/markOop.hpp"
-#include "oops/methodData.hpp"
+#include "oops/method.hpp"
 #include "oops/methodCounters.hpp"
-#include "oops/method.hpp"
+#include "oops/methodData.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
@@ -91,7 +91,6 @@
 #include "prims/jvmtiAgentThread.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/deoptimization.hpp"
-#include "runtime/vframeArray.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
@@ -101,6 +100,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
+#include "runtime/vframeArray.hpp"
 #include "runtime/vmStructs.hpp"
 #include "utilities/array.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -162,20 +162,20 @@
 # include "vmStructs_bsd_zero.hpp"
 #endif
 #if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/parNew/vmStructs_parNew.hpp"
-#include "gc_implementation/parallelScavenge/asPSOldGen.hpp"
-#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
-#include "gc_implementation/g1/vmStructs_g1.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/cms/vmStructs_cms.hpp"
+#include "gc/cms/vmStructs_parNew.hpp"
+#include "gc/g1/vmStructs_g1.hpp"
+#include "gc/parallel/asPSOldGen.hpp"
+#include "gc/parallel/asPSYoungGen.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/parallel/vmStructs_parallelgc.hpp"
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -197,13 +197,13 @@
 #include "opto/machnode.hpp"
 #include "opto/matcher.hpp"
 #include "opto/mathexactnode.hpp"
+#include "opto/movenode.hpp"
 #include "opto/mulnode.hpp"
-#include "opto/movenode.hpp"
 #include "opto/narrowptrnode.hpp"
 #include "opto/opaquenode.hpp"
 #include "opto/optoreg.hpp"
+#include "opto/parse.hpp"
 #include "opto/phaseX.hpp"
-#include "opto/parse.hpp"
 #include "opto/regalloc.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/subnode.hpp"